From 75bd39e9e2bb45b848205a6a96b968521c773eaa Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Wed, 14 Aug 2024 16:40:41 +0100 Subject: [PATCH 1/8] More CSS refactoring --- app/assets/stylesheets/_ukhpi-maps.scss | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/_ukhpi-maps.scss b/app/assets/stylesheets/_ukhpi-maps.scss index 460c5102..9fe145c6 100644 --- a/app/assets/stylesheets/_ukhpi-maps.scss +++ b/app/assets/stylesheets/_ukhpi-maps.scss @@ -18,15 +18,17 @@ display: flex; flex-direction: column; - .el-radio-button__inner { - width: 100%; - border: 0; - border-radius: 0; - color: #000000; - } - - .el-radio-button__orig-radio:checked+.el-radio-button__inner { - background-color: #2c659f; + .el-radio-button { + &__inner { + width: 100%; + border: 0; + border-radius: 0; + color: #000000; + } + + &.is-active { + background-color: #409eff; + } } } From d6e02716334689a932ecb100e2aeb6ab34fa34e6 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Wed, 14 Aug 2024 16:41:20 +0100 Subject: [PATCH 2/8] Fixed a CSS issue with modal buttons --- .../stylesheets/_ukhpi-location-select.scss | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/_ukhpi-location-select.scss b/app/assets/stylesheets/_ukhpi-location-select.scss index ae23fa79..f0e05e85 100644 --- a/app/assets/stylesheets/_ukhpi-location-select.scss +++ b/app/assets/stylesheets/_ukhpi-location-select.scss @@ -1,14 +1,22 @@ .o-select-location { text-align: left; - .el-dialog__body { - padding: 5px 20px; - color: #000000; - } + .el-dialog { + &__body { + padding: 5px 20px; + color: #000000; + } + + &__close { + color: #000000; + padding: 4px; + } - .el-dialog__close { - color: #000000; - padding: 4px; + &__footer { + .el-button--default { + color: #000000; + } + } } .el-input__inner { @@ -19,9 +27,6 @@ color: #a4742b; } - .el-dialog__footer { - .el-button { - color: #000000; } } } From d53f7c45d368fe6a91952cf514a87e7b52c14bc0 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Wed, 14 Aug 2024 16:42:08 +0100 Subject: [PATCH 3/8] Increased contrast for location results names --- app/assets/stylesheets/_ukhpi-location-select.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/assets/stylesheets/_ukhpi-location-select.scss b/app/assets/stylesheets/_ukhpi-location-select.scss index f0e05e85..cd96ebaa 100644 --- a/app/assets/stylesheets/_ukhpi-location-select.scss +++ b/app/assets/stylesheets/_ukhpi-location-select.scss @@ -27,6 +27,9 @@ color: #a4742b; } + .o-search-location__results { + .el-button--text { + color: #0050a2; } } } From faa596a6fb7d3ca542dc0df967c701915cf836a5 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Wed, 14 Aug 2024 16:42:28 +0100 Subject: [PATCH 4/8] Increased contrast on location result hover and focus --- app/assets/stylesheets/_ukhpi-location-select.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/_ukhpi-location-select.scss b/app/assets/stylesheets/_ukhpi-location-select.scss index cd96ebaa..782ec04b 100644 --- a/app/assets/stylesheets/_ukhpi-location-select.scss +++ b/app/assets/stylesheets/_ukhpi-location-select.scss @@ -30,6 +30,10 @@ .o-search-location__results { .el-button--text { color: #0050a2; + + &:focus, &:hover { + color: #007dff; + } } } } From 906ea1c9e5b592f9f66c860709cf765affac5983 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Wed, 14 Aug 2024 16:42:40 +0100 Subject: [PATCH 5/8] Added changelog entries --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d7d0c35..7b94461f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## 1.7.5 - 2024-08 +- (Bogdan) Increased contrast for search location results, as well as when they + are being focused [GH-412](https://github.com/epimorphics/ukhpi/issues/412) +- (Bogdan) CSS Refactoring - (Bogdan) Fixed a bug where CSS was applied to the wrong element, causing search location results to be displayed incorrectly - (Bogdan) Increased focusable area for close button on modal and hide graph button From 0aecf0fde8ec41451893566e734454d94904773a Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Wed, 14 Aug 2024 17:22:30 +0100 Subject: [PATCH 6/8] Increased contrast for compare location dropdowns --- app/assets/stylesheets/_element-rails.scss | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/_element-rails.scss b/app/assets/stylesheets/_element-rails.scss index 7b9e5db5..098c1767 100644 --- a/app/assets/stylesheets/_element-rails.scss +++ b/app/assets/stylesheets/_element-rails.scss @@ -51,7 +51,12 @@ table.el-month-table { } } -.el-select-dropdown__item.selected { - background-color: $dark-blue; - color: white; -} \ No newline at end of file +.el-select-dropdown__item { + &.selected { + background-color: $dark-blue; + color: white; + } + &.hover { + background-color: #e6e6e6; + } +} From a8c4264cb0b025eb8207793c7549acf5c242caa3 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Wed, 14 Aug 2024 17:22:38 +0100 Subject: [PATCH 7/8] Added changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b94461f..12371667 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 1.7.5 - 2024-08 +- (Bogdan) Increased contrast for compare location dropdowns [GH-412](https://github.com/epimorphics/ukhpi/issues/412) - (Bogdan) Increased contrast for search location results, as well as when they are being focused [GH-412](https://github.com/epimorphics/ukhpi/issues/412) - (Bogdan) CSS Refactoring From 6525d5afd87639af5058259d0337057fdda9339e Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Thu, 15 Aug 2024 10:37:15 +0100 Subject: [PATCH 8/8] Added on focus and on hover CSS styles for location search results --- app/assets/stylesheets/_ukhpi-location-select.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/_ukhpi-location-select.scss b/app/assets/stylesheets/_ukhpi-location-select.scss index 782ec04b..c96d9633 100644 --- a/app/assets/stylesheets/_ukhpi-location-select.scss +++ b/app/assets/stylesheets/_ukhpi-location-select.scss @@ -27,7 +27,11 @@ color: #a4742b; } - .o-search-location__results { + .o-search-location__result { + &:focus, &:hover { + background-color: #e6e6e6; + } + .el-button--text { color: #0050a2;