From 6e8cd18a5f49e7b21814ae84aa69c693addea502 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 27 Oct 2021 15:32:52 +0100 Subject: [PATCH 1/5] agenda --- src/app/pages/agenda/agenda.page.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 10698bcf7..31224cbb7 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -435,7 +435,7 @@ td.monthview-primary-with-event { font-weight: normal; } li.active{ - background-color: rgba(66, 185, 254, 0.1); + background-color: var(--mat-selected); } } } From d9f575d080fc66b41f97ce3d6567176288abc952 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 27 Oct 2021 15:41:04 +0100 Subject: [PATCH 2/5] Fix --- src/app/pages/agenda/agenda.page.scss | 6 ++++-- src/theme/variables.scss | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 31224cbb7..0a183f907 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -393,6 +393,7 @@ td.monthview-primary-with-event { .currente-date-timelien{ + cursor: pointer; padding: 10px 20px; .timeline-date{ font-size: 15px; @@ -436,6 +437,7 @@ td.monthview-primary-with-event { } li.active{ background-color: var(--mat-selected); + color: white; } } } @@ -739,13 +741,13 @@ app-approve-event{ } li.active { - background-color: #42b9fe !important; + background-color: var(--mat-selected) !important; color: white; } li:hover{ cursor: pointer; - background-color: #e6f6ff75 ; + background-color: var(--mat-selected-hover) ; } } diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 2b4f299cb..08561a8b5 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -721,6 +721,7 @@ body { --font-awesome: #ffb81c; --font-awesome-1: #c63527; --mat-selected: #c63527; + --mat-selected-hover: #c634277e; --mat-calendar-body-selected: #c63527; --monthview-selected: rgb(198 53 39 / 49%); @@ -788,6 +789,7 @@ body { --header-tab-top-border: white; --header-tab-text-white: white; --mat-selected: #87cefa; + --mat-selected-hover: #c63527; --mat-calendar-body-selected: #42b9fe ; --monthview-selected: lightskyblue; --header-container-background: linear-gradient( From c0da0399fbad76f9daa7186a2490506f425627ec Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 27 Oct 2021 15:45:08 +0100 Subject: [PATCH 3/5] Fix --- src/app/pages/agenda/agenda.page.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 0a183f907..18128e13d 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -439,6 +439,10 @@ td.monthview-primary-with-event { background-color: var(--mat-selected); color: white; } + li:hover{ + background-color: var(--mat-selected-hover); + + } } } } From 6e721610193186f411d28d15fdf44d86307c5be9 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 27 Oct 2021 15:49:45 +0100 Subject: [PATCH 4/5] Fix --- src/app/pages/agenda/agenda.page.scss | 4 ++-- src/global.scss | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 18128e13d..74a82d83d 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -436,10 +436,10 @@ td.monthview-primary-with-event { font-weight: normal; } li.active{ - background-color: var(--mat-selected); + background-color: var(--mat-selected) !important; color: white; } - li:hover{ + li:hover:not(.active){ background-color: var(--mat-selected-hover); } diff --git a/src/global.scss b/src/global.scss index 9b9ecfed5..983721549 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1012,7 +1012,7 @@ background: rgb(92, 92, 92); // } .mat-calendar-body-cell:not(.mat-calendar-body-disabled):hover > .mat-calendar-body-cell-content:not(.mat-calendar-body-selected):not(.mat-calendar-body-comparison-identical), .cdk-keyboard-focused .mat-calendar-body-active > .mat-calendar-body-cell-content:not(.mat-calendar-body-selected):not(.mat-calendar-body-comparison-identical), .cdk-program-focused .mat-calendar-body-active > .mat-calendar-body-cell-content:not(.mat-calendar-body-selected):not(.mat-calendar-body-comparison-identical) { - background-color: #42b9fe36 !important; + background-color: var(--mat-selected-hover) !important; } .mat-form-field-underline.ng-tns-c193-6.ng-star-inserted, .mat-form-field-underline { @@ -1282,3 +1282,8 @@ ngx-mat-datetime-content{ .modal-background { background: #0000006b; } + + +.mat-option:hover:not(.mat-option-disabled), .mat-option:focus:not(.mat-option-disabled) { + background: var(--mat-selected-hover); +} From 93c6a36a29617916d3ac5b762be93d69b144c354 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 27 Oct 2021 15:53:48 +0100 Subject: [PATCH 5/5] Fix --- src/theme/variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 08561a8b5..b55c558b3 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -789,7 +789,7 @@ body { --header-tab-top-border: white; --header-tab-text-white: white; --mat-selected: #87cefa; - --mat-selected-hover: #c63527; + --mat-selected-hover: rgb(216 240 255); --mat-calendar-body-selected: #42b9fe ; --monthview-selected: lightskyblue; --header-container-background: linear-gradient(