Skip to content

Commit 33a256a

Browse files
Andrew Seguinandrewseguin
Andrew Seguin
authored andcommitted
fix(material/form-field): remove internal-only M2 styles
# Conflicts: # src/material/form-field/_m2-form-field.scss
1 parent eb9abc3 commit 33a256a

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

src/material/form-field/_m2-form-field.scss

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,9 @@
3030
$warn-color: inspection.get-theme-color($theme, warn);
3131
$color-tokens: private-get-color-palette-color-tokens($theme, primary);
3232
$on-surface: if($is-dark, #fff, #000);
33-
34-
// Ideally we would derive all values directly from the theme, but it causes a lot of regressions
35-
// internally. For now we fall back to the old hardcoded behavior only for internal apps.
36-
$on-surface: if($is-dark, #fff, #000);
37-
$text-color-base: if(m2-utils.$private-is-internal-build, $on-surface,
38-
inspection.get-theme-color($theme, foreground, text, 1));
39-
$disabled-text-color-base: if(m2-utils.$private-is-internal-build, $on-surface,
40-
inspection.get-theme-color($theme, foreground, disabled-text, 1));
41-
$divider-base: if(m2-utils.$private-is-internal-build, $on-surface,
42-
inspection.get-theme-color($theme, foreground, base));
33+
$text-color-base: inspection.get-theme-color($theme, system, on-surface);
34+
$disabled-text-color-base: inspection.get-theme-color($theme, foreground, disabled-text, 1);
35+
$divider-base: inspection.get-theme-color($theme, foreground, base);
4336

4437
@return map.merge($color-tokens, (
4538
// MDC has a token for the enabled placeholder, but not for the disabled one.

0 commit comments

Comments
 (0)