From b6889334d736a368b9ced60c13f1cf23085a0e27 Mon Sep 17 00:00:00 2001 From: Alexandre Caron Date: Wed, 18 Oct 2023 15:22:43 -0400 Subject: [PATCH] fix(geo): style regression with the material theme --- .../layer-list-tool.theming.scss | 12 +++++++++++ .../search/search-bar/search-bar.theming.scss | 15 +++++++++----- .../search-results-item.theme.scss | 20 +++++++++++++++++++ .../geo/src/lib/search/search.theming.scss | 2 ++ 4 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 packages/geo/src/lib/search/search-results/search-results-item.theme.scss diff --git a/packages/geo/src/lib/layer/layer-list-tool/layer-list-tool.theming.scss b/packages/geo/src/lib/layer/layer-list-tool/layer-list-tool.theming.scss index 3aac1cd294..55ee0fe087 100644 --- a/packages/geo/src/lib/layer/layer-list-tool/layer-list-tool.theming.scss +++ b/packages/geo/src/lib/layer/layer-list-tool/layer-list-tool.theming.scss @@ -2,9 +2,21 @@ @use '@angular/material' as mat; @mixin theme($theme) { + @include color($theme); @include density($theme); } +@mixin color($theme) { + igo-layer-list-tool { + mat-form-field { + .mat-mdc-text-field-wrapper, + .mat-mdc-form-field-focus-overlay { + background-color: white !important; + } + } + } +} + @mixin density($theme) { $density: mat.get-density-config($theme); diff --git a/packages/geo/src/lib/search/search-bar/search-bar.theming.scss b/packages/geo/src/lib/search/search-bar/search-bar.theming.scss index 7f26eab42c..5cc62ae43f 100644 --- a/packages/geo/src/lib/search/search-bar/search-bar.theming.scss +++ b/packages/geo/src/lib/search/search-bar/search-bar.theming.scss @@ -4,18 +4,23 @@ @mixin theme($theme) { @include color($theme); @include density($theme); + + igo-search-bar { + mat-form-field { + .mdc-line-ripple { + display: none; + } + } + } } @mixin color($theme) { igo-search-bar { mat-form-field { - .mat-mdc-text-field-wrapper { + .mat-mdc-text-field-wrapper, + .mat-mdc-form-field-focus-overlay { background-color: white !important; } - - .mdc-line-ripple { - display: none; - } } } } diff --git a/packages/geo/src/lib/search/search-results/search-results-item.theme.scss b/packages/geo/src/lib/search/search-results/search-results-item.theme.scss new file mode 100644 index 0000000000..8f0d0aa476 --- /dev/null +++ b/packages/geo/src/lib/search/search-results/search-results-item.theme.scss @@ -0,0 +1,20 @@ +@use 'sass:map'; +@use '@angular/material' as mat; + +@mixin theme($theme) { + @include color($theme); +} + +@mixin color($theme) { + igo-search-results-item { + .mdc-list-item--with-leading-icon { + &:hover .mdc-list-item__start { + color: black; + } + + .mdc-list-item__start { + color: rgba(0, 0, 0, 0.87); + } + } + } +} diff --git a/packages/geo/src/lib/search/search.theming.scss b/packages/geo/src/lib/search/search.theming.scss index 5b0b96f95f..931b70bd86 100644 --- a/packages/geo/src/lib/search/search.theming.scss +++ b/packages/geo/src/lib/search/search.theming.scss @@ -1,5 +1,7 @@ @use './search-bar/search-bar.theming' as search-bar; +@use './search-results/search-results-item.theme' as search-results-item; @mixin theme($theme) { @include search-bar.theme($theme); + @include search-results-item.theme($theme); }