diff --git a/src/components/combo/themes/dark/_themes.scss b/src/components/combo/themes/dark/_themes.scss index a1a4000b8..78a38ae27 100644 --- a/src/components/combo/themes/dark/_themes.scss +++ b/src/components/combo/themes/dark/_themes.scss @@ -1,7 +1,25 @@ +@use 'sass:map'; @use 'styles/utilities' as *; @use 'igniteui-theming/sass/themes/schemas/components/dark/combo' as *; +@use 'components/input/themes/dark/themes' as input-theme; -$material: digest-schema($dark-combo); -$bootstrap: digest-schema($dark-bootstrap-combo); -$fluent: digest-schema($dark-fluent-combo); -$indigo: digest-schema($dark-indigo-combo); +$material: map.merge(digest-schema($dark-combo), ( + helper-text-color: map.get(input-theme.$material, 'helper-text-color'), + disabled-text-color: map.get(input-theme.$material, 'disabled-text-color'), + error-secondary-color: map.get(input-theme.$material, 'helper-text-color') +)); +$bootstrap: map.merge(digest-schema($dark-bootstrap-combo), ( + helper-text-color: map.get(input-theme.$bootstrap, 'helper-text-color'), + disabled-text-color: map.get(input-theme.$bootstrap, 'disabled-text-color'), + error-secondary-color: map.get(input-theme.$bootstrap, 'error-secondary-color') +)); +$fluent: map.merge(digest-schema($dark-fluent-combo), ( + helper-text-color: map.get(input-theme.$fluent, 'helper-text-color'), + disabled-text-color: map.get(input-theme.$fluent, 'disabled-text-color'), + error-secondary-color: map.get(input-theme.$fluent, 'error-secondary-color') +)); +$indigo: map.merge(digest-schema($dark-indigo-combo), ( + helper-text-color: map.get(input-theme.$indigo, 'helper-text-color'), + disabled-text-color: map.get(input-theme.$indigo, 'disabled-text-color'), + error-secondary-color: map.get(input-theme.$indigo, 'error-secondary-color') +)); diff --git a/src/components/combo/themes/light/_themes.scss b/src/components/combo/themes/light/_themes.scss index ad2a306be..5da37329c 100644 --- a/src/components/combo/themes/light/_themes.scss +++ b/src/components/combo/themes/light/_themes.scss @@ -1,7 +1,25 @@ +@use 'sass:map'; @use 'styles/utilities' as *; @use 'igniteui-theming/sass/themes/schemas/components/light/combo' as *; +@use 'components/input/themes/light/themes' as input-theme; -$material: digest-schema($light-combo); -$bootstrap: digest-schema($bootstrap-combo); -$fluent: digest-schema($fluent-combo); -$indigo: digest-schema($indigo-combo); +$material: map.merge(digest-schema($light-combo), ( + helper-text-color: map.get(input-theme.$material, 'helper-text-color'), + disabled-text-color: map.get(input-theme.$material, 'disabled-text-color'), + error-secondary-color: map.get(input-theme.$material, 'helper-text-color') +)); +$bootstrap: map.merge(digest-schema($bootstrap-combo), ( + helper-text-color: map.get(input-theme.$bootstrap, 'helper-text-color'), + disabled-text-color: map.get(input-theme.$bootstrap, 'disabled-text-color'), + error-secondary-color: map.get(input-theme.$bootstrap, 'error-secondary-color') +)); +$fluent: map.merge(digest-schema($fluent-combo), ( + helper-text-color: map.get(input-theme.$fluent, 'helper-text-color'), + disabled-text-color: map.get(input-theme.$fluent, 'disabled-text-color'), + error-secondary-color: map.get(input-theme.$fluent, 'error-secondary-color') +)); +$indigo: map.merge(digest-schema($indigo-combo), ( + helper-text-color: map.get(input-theme.$indigo, 'helper-text-color'), + disabled-text-color: map.get(input-theme.$indigo, 'disabled-text-color'), + error-secondary-color: map.get(input-theme.$indigo, 'error-secondary-color') +)); diff --git a/src/components/combo/themes/shared/combo.bootstrap.scss b/src/components/combo/themes/shared/combo.bootstrap.scss index 463441682..ad5131f77 100644 --- a/src/components/combo/themes/shared/combo.bootstrap.scss +++ b/src/components/combo/themes/shared/combo.bootstrap.scss @@ -1,7 +1,7 @@ @use 'styles/utilities' as *; @use '../light/themes' as *; -@use '../../../input/themes/light/themes' as input-theme; -@use '../../../dropdown/themes/light/themes' as dropdown-theme; +@use 'components/input/themes/light/themes' as input-theme; +@use 'components/dropdown/themes/light/themes' as dropdown-theme; $theme: $bootstrap; $input-theme: input-theme.$bootstrap; @@ -14,6 +14,7 @@ $dropdown-theme: dropdown-theme.$bootstrap; [part='helper-text'] { margin-top: rem(4px); + color: var-get($theme, 'helper-text-color'); } [part='list-wrapper'] { @@ -93,7 +94,7 @@ $dropdown-theme: dropdown-theme.$bootstrap; :host([invalid]) { ::slotted([slot='helper-text']) { - color: var-get($input-theme, 'error-secondary-color'); + color: var-get($theme, 'error-secondary-color'); } } @@ -104,13 +105,13 @@ $dropdown-theme: dropdown-theme.$bootstrap; igc-input::part(label), igc-input::part(input)::placeholder, ::slotted([slot='helper-text']) { - color: var-get($input-theme, 'disabled-text-color'); + color: var-get($theme, 'disabled-text-color'); } [part~='clear-icon'] { border-inline-end: rem(1px) solid var-get($input-theme, 'disabled-border-color'); background: inherit; - color: var-get($input-theme, 'disabled-text-color'); + color: var-get($theme, 'disabled-text-color'); igc-icon { color: inherit; diff --git a/src/components/combo/themes/shared/combo.fluent.scss b/src/components/combo/themes/shared/combo.fluent.scss index e990adb1f..4a5c68fd9 100644 --- a/src/components/combo/themes/shared/combo.fluent.scss +++ b/src/components/combo/themes/shared/combo.fluent.scss @@ -1,10 +1,8 @@ @use 'styles/utilities' as *; @use '../light/themes' as *; -@use '../../../input/themes/light/themes' as input-theme; -@use '../../../dropdown/themes/light/themes' as dropdown-theme; +@use 'components/dropdown/themes/light/themes' as dropdown-theme; $theme: $fluent; -$input-theme: input-theme.$fluent; $dropdown-theme: dropdown-theme.$fluent; :host { @@ -17,7 +15,7 @@ $dropdown-theme: dropdown-theme.$fluent; display: block; padding: 0; margin-top: rem(5px); - color: color(gray, 700); + color: var-get($theme, 'helper-text-color'); } } @@ -81,7 +79,7 @@ $dropdown-theme: dropdown-theme.$fluent; :host([invalid]) { ::slotted([slot='helper-text']) { - color: var-get($input-theme, 'error-secondary-color'); + color: var-get($theme, 'error-secondary-color'); } } @@ -109,12 +107,12 @@ $dropdown-theme: dropdown-theme.$fluent; igc-input::part(label), igc-input::part(input)::placeholder, ::slotted([slot='helper-text']) { - color: color(gray, 500); + color: var-get($theme, 'disabled-text-color'); } [part~='clear-icon'] { background: inherit; - color: var-get($input-theme, 'disabled-text-color'); + color: var-get($theme, 'disabled-text-color'); igc-icon { color: inherit; diff --git a/src/components/combo/themes/shared/combo.indigo.scss b/src/components/combo/themes/shared/combo.indigo.scss index a8a22a9e5..576823e13 100644 --- a/src/components/combo/themes/shared/combo.indigo.scss +++ b/src/components/combo/themes/shared/combo.indigo.scss @@ -1,7 +1,7 @@ @use 'styles/utilities' as *; @use '../light/themes' as *; -@use '../../../input/themes/light/themes' as input-theme; -@use '../../../dropdown/themes/light/themes' as dropdown-theme; +@use 'components/input/themes/light/themes' as input-theme; +@use 'components/dropdown/themes/light/themes' as dropdown-theme; $theme: $indigo; $input-theme: input-theme.$indigo; @@ -21,7 +21,7 @@ $dropdown-theme: dropdown-theme.$indigo; } ::slotted([slot='helper-text']) { - color: var-get($input-theme, 'helper-text-color'); + color: var-get($theme, 'helper-text-color'); } } @@ -101,7 +101,7 @@ $dropdown-theme: dropdown-theme.$indigo; :host([invalid]) { ::slotted([slot='helper-text']) { - color: var-get($input-theme, 'error-secondary-color'); + color: var-get($theme, 'error-secondary-color'); } } @@ -110,7 +110,7 @@ $dropdown-theme: dropdown-theme.$indigo; ::slotted([slot='prefix']), ::slotted([slot='suffix']), ::slotted([slot='helper-text']) { - color: var-get($input-theme, 'disabled-text-color'); + color: var-get($theme, 'disabled-text-color'); } igc-input::part(input)::selection { @@ -119,7 +119,7 @@ $dropdown-theme: dropdown-theme.$indigo; [part~='clear-icon'] { background: inherit; - color: var-get($input-theme, 'disabled-text-color'); + color: var-get($theme, 'disabled-text-color'); igc-icon { color: inherit; diff --git a/src/components/combo/themes/shared/combo.material.scss b/src/components/combo/themes/shared/combo.material.scss index 97da633d8..f86da7140 100644 --- a/src/components/combo/themes/shared/combo.material.scss +++ b/src/components/combo/themes/shared/combo.material.scss @@ -1,7 +1,7 @@ @use 'styles/utilities' as *; @use '../light/themes' as *; -@use '../../../input/themes/light/themes' as input-theme; -@use '../../../dropdown/themes/light/themes' as dropdown-theme; +@use 'components/input/themes/light/themes' as input-theme; +@use 'components/dropdown/themes/light/themes' as dropdown-theme; $theme: $material; $input-theme: input-theme.$material; @@ -19,7 +19,7 @@ $dropdown-theme: dropdown-theme.$material; ::slotted([slot='helper-text']) { @include type-style('caption'); - color: var-get($input-theme, 'helper-text-color'); + color: var-get($theme, 'helper-text-color'); line-height: 1; } @@ -122,7 +122,7 @@ $dropdown-theme: dropdown-theme.$material; :host([invalid]) { ::slotted([slot='helper-text']) { - color: var-get($input-theme, 'error-secondary-color'); + color: var-get($theme, 'error-secondary-color'); } } @@ -133,12 +133,12 @@ $dropdown-theme: dropdown-theme.$material; igc-input::part(label), igc-input::part(input)::placeholder, ::slotted([slot='helper-text']) { - color: var-get($input-theme, 'disabled-text-color'); + color: var-get($theme, 'disabled-text-color'); } [part~='clear-icon'] { background: inherit; - color: var-get($input-theme, 'disabled-text-color'); + color: var-get($theme, 'disabled-text-color'); igc-icon { color: inherit; diff --git a/src/components/input/themes/shared/input.material.scss b/src/components/input/themes/shared/input.material.scss index 95133dcfb..86abb6fd6 100644 --- a/src/components/input/themes/shared/input.material.scss +++ b/src/components/input/themes/shared/input.material.scss @@ -1,5 +1,6 @@ @use 'styles/utilities' as *; @use '../light/themes' as *; +@use 'igniteui-theming/sass/animations/easings' as *; $theme: $material; $idle-border-width: rem(1px) !default; @@ -74,7 +75,7 @@ input:placeholder-shown + [part='notch'] [part='label'], transform 150ms cubic-bezier(.4, 0, .2, 1), color 150ms cubic-bezier(.4, 0, .2, 1), font-size 150ms cubic-bezier(.4, 0, .2, 1); - line-height: 1; + line-height: normal; text-overflow: ellipsis; overflow: hidden; will-change: font-size, color, transform; @@ -231,7 +232,7 @@ input:placeholder-shown + [part='notch'] [part='label'], input:placeholder-shown + [part='notch'] [part='label'], [part~='filled'] + [part='notch'] [part='label'] { - transform: translateY(-106%); + transform: translateY(-73%); } } @@ -259,7 +260,7 @@ input:placeholder-shown + [part='notch'] [part='label'], } [part='notch'] [part='label'] { - transform: translateY(-106%); + transform: translateY(-73%); } } diff --git a/src/components/select/themes/dark/_themes.scss b/src/components/select/themes/dark/_themes.scss index 5ad0744ed..9388fc262 100644 --- a/src/components/select/themes/dark/_themes.scss +++ b/src/components/select/themes/dark/_themes.scss @@ -1,8 +1,25 @@ @use 'sass:map'; @use 'styles/utilities' as *; @use 'igniteui-theming/sass/themes/schemas/components/dark/select' as *; +@use 'components/input/themes/dark/themes' as input-theme; -$material: digest-schema($dark-select); -$indigo: digest-schema($dark-indigo-select); -$fluent: digest-schema($dark-fluent-select); -$bootstrap: digest-schema($dark-bootstrap-select); +$material: map.merge(digest-schema($dark-select), ( + helper-text-color: map.get(input-theme.$material, 'helper-text-color'), + disabled-text-color: map.get(input-theme.$material, 'disabled-text-color'), + error-secondary-color: map.get(input-theme.$material, 'helper-text-color') +)); +$bootstrap: map.merge(digest-schema($dark-bootstrap-select), ( + helper-text-color: map.get(input-theme.$bootstrap, 'helper-text-color'), + disabled-text-color: map.get(input-theme.$bootstrap, 'disabled-text-color'), + error-secondary-color: map.get(input-theme.$bootstrap, 'error-secondary-color') +)); +$fluent: map.merge(digest-schema($dark-fluent-select), ( + helper-text-color: map.get(input-theme.$fluent, 'helper-text-color'), + disabled-text-color: map.get(input-theme.$fluent, 'disabled-text-color'), + error-secondary-color: map.get(input-theme.$fluent, 'error-secondary-color') +)); +$indigo: map.merge(digest-schema($dark-indigo-select), ( + helper-text-color: map.get(input-theme.$indigo, 'helper-text-color'), + disabled-text-color: map.get(input-theme.$indigo, 'disabled-text-color'), + error-secondary-color: map.get(input-theme.$indigo, 'error-secondary-color') +)); diff --git a/src/components/select/themes/dark/select.bootstrap.scss b/src/components/select/themes/dark/select.bootstrap.scss index a3447c7a6..e7343c2a0 100644 --- a/src/components/select/themes/dark/select.bootstrap.scss +++ b/src/components/select/themes/dark/select.bootstrap.scss @@ -1,6 +1,6 @@ @use 'styles/utilities' as *; @use 'themes' as *; -@use '../../../dropdown/themes/dark/themes' as dropdown-theme; +@use 'components/dropdown/themes/dark/themes' as dropdown-theme; $dropdown-theme: dropdown-theme.$bootstrap; $theme: $bootstrap; diff --git a/src/components/select/themes/dark/select.fluent.scss b/src/components/select/themes/dark/select.fluent.scss index df97e9ec3..59fac4b7b 100644 --- a/src/components/select/themes/dark/select.fluent.scss +++ b/src/components/select/themes/dark/select.fluent.scss @@ -1,6 +1,6 @@ @use 'styles/utilities' as *; @use 'themes' as *; -@use '../../../dropdown/themes/dark/themes' as dropdown-theme; +@use 'components/dropdown/themes/dark/themes' as dropdown-theme; $dropdown-theme: dropdown-theme.$fluent; $theme: $fluent; diff --git a/src/components/select/themes/dark/select.indigo.scss b/src/components/select/themes/dark/select.indigo.scss index 5fa13aa46..9a10bbdd7 100644 --- a/src/components/select/themes/dark/select.indigo.scss +++ b/src/components/select/themes/dark/select.indigo.scss @@ -1,6 +1,6 @@ @use 'styles/utilities' as *; @use 'themes' as *; -@use '../../../dropdown/themes/dark/themes' as dropdown-theme; +@use 'components/dropdown/themes/dark/themes' as dropdown-theme; $dropdown-theme: dropdown-theme.$indigo; $theme: $indigo; diff --git a/src/components/select/themes/dark/select.material.scss b/src/components/select/themes/dark/select.material.scss index 111c83ebe..08c2ec060 100644 --- a/src/components/select/themes/dark/select.material.scss +++ b/src/components/select/themes/dark/select.material.scss @@ -1,6 +1,6 @@ @use 'styles/utilities' as *; @use 'themes' as *; -@use '../../../dropdown/themes/dark/themes' as dropdown-theme; +@use 'components/dropdown/themes/dark/themes' as dropdown-theme; $dropdown-theme: dropdown-theme.$material; $theme: $material; diff --git a/src/components/select/themes/light/_themes.scss b/src/components/select/themes/light/_themes.scss index 1213f801b..7a89db7e9 100644 --- a/src/components/select/themes/light/_themes.scss +++ b/src/components/select/themes/light/_themes.scss @@ -1,8 +1,25 @@ @use 'sass:map'; @use 'styles/utilities' as *; @use 'igniteui-theming/sass/themes/schemas/components/light/select' as *; +@use 'components/input/themes/light/themes' as input-theme; -$material: digest-schema($light-select); -$bootstrap: digest-schema($bootstrap-select); -$fluent: digest-schema($fluent-select); -$indigo: digest-schema($indigo-select); +$material: map.merge(digest-schema($light-select), ( + helper-text-color: map.get(input-theme.$material, 'helper-text-color'), + disabled-text-color: map.get(input-theme.$material, 'disabled-text-color'), + error-secondary-color: map.get(input-theme.$material, 'helper-text-color') +)); +$bootstrap: map.merge(digest-schema($bootstrap-select), ( + helper-text-color: map.get(input-theme.$bootstrap, 'helper-text-color'), + disabled-text-color: map.get(input-theme.$bootstrap, 'disabled-text-color'), + error-secondary-color: map.get(input-theme.$bootstrap, 'error-secondary-color') +)); +$fluent: map.merge(digest-schema($fluent-select), ( + helper-text-color: map.get(input-theme.$fluent, 'helper-text-color'), + disabled-text-color: map.get(input-theme.$fluent, 'disabled-text-color'), + error-secondary-color: map.get(input-theme.$fluent, 'error-secondary-color') +)); +$indigo: map.merge(digest-schema($indigo-select), ( + helper-text-color: map.get(input-theme.$indigo, 'helper-text-color'), + disabled-text-color: map.get(input-theme.$indigo, 'disabled-text-color'), + error-secondary-color: map.get(input-theme.$indigo, 'error-secondary-color') +)); diff --git a/src/components/select/themes/light/select.bootstrap.scss b/src/components/select/themes/light/select.bootstrap.scss index 450e78983..7c7ed241a 100644 --- a/src/components/select/themes/light/select.bootstrap.scss +++ b/src/components/select/themes/light/select.bootstrap.scss @@ -1,6 +1,6 @@ @use 'styles/utilities' as *; @use 'themes' as *; -@use '../../../dropdown/themes/light/themes' as dropdown-theme; +@use 'components/dropdown/themes/light/themes' as dropdown-theme; $dropdown-theme: dropdown-theme.$bootstrap; $theme: $bootstrap; @@ -13,6 +13,3 @@ $theme: $bootstrap; --dd-border-radius: #{var-get($dropdown-theme, 'border-radius')}; --dd-border-color: #{var-get($dropdown-theme, 'border-color')}; } - - - diff --git a/src/components/select/themes/light/select.fluent.scss b/src/components/select/themes/light/select.fluent.scss index a0f052222..7e71a00c3 100644 --- a/src/components/select/themes/light/select.fluent.scss +++ b/src/components/select/themes/light/select.fluent.scss @@ -1,6 +1,6 @@ @use 'styles/utilities' as *; @use 'themes' as *; -@use '../../../dropdown/themes/light/themes' as dropdown-theme; +@use 'components/dropdown/themes/light/themes' as dropdown-theme; $dropdown-theme: dropdown-theme.$fluent; $theme: $fluent; diff --git a/src/components/select/themes/light/select.indigo.scss b/src/components/select/themes/light/select.indigo.scss index 0af85f64e..0b7798e9a 100644 --- a/src/components/select/themes/light/select.indigo.scss +++ b/src/components/select/themes/light/select.indigo.scss @@ -1,6 +1,6 @@ @use 'styles/utilities' as *; @use 'themes' as *; -@use '../../../dropdown/themes/light/themes' as dropdown-theme; +@use 'components/dropdown/themes/light/themes' as dropdown-theme; $dropdown-theme: dropdown-theme.$indigo; $theme: $indigo; diff --git a/src/components/select/themes/light/select.material.scss b/src/components/select/themes/light/select.material.scss index 034a47bf4..c0feec57c 100644 --- a/src/components/select/themes/light/select.material.scss +++ b/src/components/select/themes/light/select.material.scss @@ -1,6 +1,6 @@ @use 'styles/utilities' as *; @use 'themes' as *; -@use '../../../dropdown/themes/light/themes' as dropdown-theme; +@use 'components/dropdown/themes/light/themes' as dropdown-theme; $dropdown-theme: dropdown-theme.$material; $theme: $material; diff --git a/src/components/select/themes/shared/select.bootstrap.scss b/src/components/select/themes/shared/select.bootstrap.scss index f6b96c969..6e17d1001 100644 --- a/src/components/select/themes/shared/select.bootstrap.scss +++ b/src/components/select/themes/shared/select.bootstrap.scss @@ -1,6 +1,6 @@ @use 'styles/utilities' as *; @use '../light/themes' as *; -@use '../../../input/themes/light/themes' as input-theme; +@use 'components/input/themes/light/themes' as input-theme; $theme: $bootstrap; $input-theme: input-theme.$bootstrap; @@ -17,7 +17,7 @@ $input-theme: input-theme.$bootstrap; ::slotted([slot='helper-text']) { @include type-style('body-2'); - color: var-get($input-theme, 'helper-text-color'); + color: var-get($theme, 'helper-text-color'); } } @@ -63,14 +63,14 @@ $input-theme: input-theme.$bootstrap; :host([invalid]) { ::slotted([slot='helper-text']) { - color: var-get($input-theme, 'error-secondary-color'); + color: var-get($theme, 'error-secondary-color'); } } :host([disabled]), :host(:disabled) { ::slotted([slot='helper-text']) { - color: var-get($input-theme, 'disabled-text-color'); + color: var-get($theme, 'disabled-text-color'); } [part~='toggle-icon'] { diff --git a/src/components/select/themes/shared/select.fluent.scss b/src/components/select/themes/shared/select.fluent.scss index 450b5521c..faf8b7aa7 100644 --- a/src/components/select/themes/shared/select.fluent.scss +++ b/src/components/select/themes/shared/select.fluent.scss @@ -1,7 +1,7 @@ @use 'styles/utilities' as *; @use '../light/themes' as *; -@use '../../../dropdown/themes/light/themes' as dropdown-theme; -@use '../../../input/themes/light/themes' as input-theme; +@use 'components/dropdown/themes/light/themes' as dropdown-theme; +@use 'components/input/themes/light/themes' as input-theme; $theme: $fluent; $dropdown-theme: dropdown-theme.$fluent; @@ -24,7 +24,7 @@ $focused-border-width: rem(2px); margin-top: rem(5px); ::slotted([slot='helper-text']) { - color: var-get($input-theme, 'helper-text-color'); + color: var-get($theme, 'helper-text-color'); } } @@ -67,10 +67,16 @@ $focused-border-width: rem(2px); } } +:host([invalid]) { + ::slotted([slot='helper-text']) { + color: var-get($theme, 'error-secondary-color'); + } +} + :host(:disabled), :host([disabled]) { [part='helper-text'] ::slotted([slot='helper-text']) { - color: var-get($input-theme, 'disabled-text-color'); + color: var-get($fluent, 'disabled-text-color'); } [part~='toggle-icon'] { diff --git a/src/components/select/themes/shared/select.indigo.scss b/src/components/select/themes/shared/select.indigo.scss index 84dc5f969..0468beb31 100644 --- a/src/components/select/themes/shared/select.indigo.scss +++ b/src/components/select/themes/shared/select.indigo.scss @@ -1,7 +1,7 @@ @use 'styles/utilities' as *; @use '../light/themes' as *; -@use '../../../dropdown/themes/light/themes' as dropdown-theme; -@use '../../../input/themes/light/themes' as input-theme; +@use 'components/dropdown/themes/light/themes' as dropdown-theme; +@use 'components/input/themes/light/themes' as input-theme; $theme: $indigo; $dropdown-theme: dropdown-theme.$indigo; @@ -13,7 +13,7 @@ $input-theme: input-theme.$indigo; --dropdown-size: var(--component-size); ::slotted([slot='helper-text']) { - color: var-get($input-theme, 'helper-text-color'); + color: var-get($theme, 'helper-text-color'); } igc-input::part(input) { @@ -70,24 +70,24 @@ $input-theme: input-theme.$indigo; :host([invalid]) { ::slotted([slot='helper-text']) { - color: var-get($input-theme, 'error-secondary-color'); + color: var-get($theme, 'error-secondary-color'); } } :host([invalid]:focus-within) { igc-input::part(label) { - color: var-get($input-theme, 'error-secondary-color'); + color: var-get($theme, 'error-secondary-color'); } } :host(:disabled), :host([disabled]) { igc-input::part(input) { - color: var-get($input-theme, 'disabled-text-color'); + color: var-get($theme, 'disabled-text-color'); } ::slotted([slot='helper-text']) { - color: var-get($input-theme, 'disabled-text-color'); + color: var-get($theme, 'disabled-text-color'); } [part~='toggle-icon'] { diff --git a/src/components/select/themes/shared/select.material.scss b/src/components/select/themes/shared/select.material.scss index 69b7d3090..40c138bd8 100644 --- a/src/components/select/themes/shared/select.material.scss +++ b/src/components/select/themes/shared/select.material.scss @@ -1,7 +1,7 @@ @use 'styles/utilities' as *; @use '../light/themes' as *; -@use '../../../dropdown/themes/light/themes' as dropdown-theme; -@use '../../../input/themes/light/themes' as input-theme; +@use 'components/dropdown/themes/light/themes' as dropdown-theme; +@use 'components/input/themes/light/themes' as input-theme; $theme: $material; $dropdown-theme: dropdown-theme.$material; @@ -156,14 +156,14 @@ $active-border-width: rem(2px) !default; [part='helper-text'] { - color: var-get($input-theme, 'helper-text-color'); + color: var-get($theme, 'helper-text-color'); margin-top: rem(5px); padding-inline: pad-inline(rem(14px), rem(16px), rem(18px)); } :host([invalid]) { [part='helper-text'] { - color: var-get($input-theme, 'error-secondary-color'); + color: var-get($theme, 'error-secondary-color'); } } @@ -183,7 +183,7 @@ $active-border-width: rem(2px) !default; } [part='helper-text'] { - color: var-get($input-theme, 'disabled-text-color'); + color: var-get($theme, 'disabled-text-color'); } }