|
28 | 28 | $is-dark: inspection.get-theme-type($theme) == dark;
|
29 | 29 | $surface: map.get($system, surface);
|
30 | 30 | $color-tokens: private-get-color-palette-color-tokens($theme, primary);
|
31 |
| - $on-surface: if($is-dark, #fff, #000); |
32 | 31 | $disabled: m3-utils.color-with-opacity(map.get($system, on-surface), 38%);
|
33 | 32 |
|
34 | 33 | @return map.merge($color-tokens, (
|
35 | 34 | // MDC has a token for the enabled placeholder, but not for the disabled one.
|
36 |
| - form-field-disabled-input-text-placeholder-color: |
37 |
| - inspection.get-theme-color($theme, foreground, base, 0.38), |
| 35 | + form-field-disabled-input-text-placeholder-color: $disabled, |
38 | 36 | form-field-state-layer-color: inspection.get-theme-color($theme, system, on-surface),
|
39 | 37 | form-field-error-text-color: inspection.get-theme-color($theme, warn),
|
40 | 38 |
|
|
62 | 60 | form-field-error-focus-trailing-icon-color: unset,
|
63 | 61 | form-field-error-hover-trailing-icon-color: unset,
|
64 | 62 | form-field-error-trailing-icon-color: unset,
|
65 |
| - form-field-enabled-select-arrow-color: |
66 |
| - inspection.get-theme-color($theme, foreground, base, 0.54), |
| 63 | + form-field-enabled-select-arrow-color: map.get($system, on-surface-variant), |
67 | 64 | form-field-disabled-select-arrow-color: $disabled,
|
68 | 65 | form-field-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
|
69 | 66 | form-field-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
|
70 |
| - form-field-filled-container-color: _variable-safe-mix($on-surface, $surface, 4%), |
71 |
| - form-field-filled-disabled-container-color: _variable-safe-mix($on-surface, $surface, 2%), |
72 |
| - form-field-filled-label-text-color: inspection.get-theme-color($theme, foreground, base, 0.6), |
73 |
| - form-field-filled-hover-label-text-color: |
74 |
| - inspection.get-theme-color($theme, foreground, base, 0.6), |
| 67 | + form-field-filled-container-color: map.get($system, surface-variant), |
| 68 | + form-field-filled-disabled-container-color: |
| 69 | + m3-utils.color-with-opacity(map.get($system, on-surface), 4%), |
| 70 | + form-field-filled-label-text-color: map.get($system, on-surface-variant), |
| 71 | + form-field-filled-hover-label-text-color: map.get($system, on-surface-variant), |
75 | 72 | form-field-filled-disabled-label-text-color: $disabled,
|
76 |
| - form-field-filled-input-text-color: |
77 |
| - inspection.get-theme-color($theme, system, on-surface), |
| 73 | + form-field-filled-input-text-color: map.get($system, on-surface), |
78 | 74 | form-field-filled-disabled-input-text-color: $disabled,
|
79 |
| - form-field-filled-input-text-placeholder-color: |
80 |
| - inspection.get-theme-color($theme, foreground, base, 0.6), |
| 75 | + form-field-filled-input-text-placeholder-color: map.get($system, on-surface-variant), |
81 | 76 | form-field-filled-error-hover-label-text-color: map.get($system, error),
|
82 | 77 | form-field-filled-error-focus-label-text-color: map.get($system, error),
|
83 | 78 | form-field-filled-error-label-text-color: map.get($system, error),
|
84 | 79 | form-field-filled-error-caret-color: map.get($system, error),
|
85 |
| - form-field-filled-active-indicator-color: |
86 |
| - inspection.get-theme-color($theme, foreground, base, 0.42), |
| 80 | + form-field-filled-active-indicator-color: map.get($system, on-surface-variant), |
87 | 81 | form-field-filled-disabled-active-indicator-color:
|
88 |
| - inspection.get-theme-color($theme, foreground, base, 0.06), |
89 |
| - form-field-filled-hover-active-indicator-color: |
90 |
| - inspection.get-theme-color($theme, system, on-surface), |
| 82 | + m3-utils.color-with-opacity(map.get($system, on-surface), 12%), |
| 83 | + form-field-filled-hover-active-indicator-color: map.get($system, on-surface), |
91 | 84 | form-field-filled-error-active-indicator-color: map.get($system, error),
|
92 | 85 | form-field-filled-error-focus-active-indicator-color: map.get($system, error),
|
93 | 86 | form-field-filled-error-hover-active-indicator-color: map.get($system, error),
|
94 |
| - form-field-outlined-label-text-color: |
95 |
| - inspection.get-theme-color($theme, foreground, base, 0.6), |
96 |
| - form-field-outlined-hover-label-text-color: |
97 |
| - inspection.get-theme-color($theme, foreground, base, 0.6), |
| 87 | + form-field-outlined-label-text-color: map.get($system, on-surface-variant), |
| 88 | + form-field-outlined-hover-label-text-color: map.get($system, on-surface), |
98 | 89 | form-field-outlined-disabled-label-text-color: $disabled,
|
99 |
| - form-field-outlined-input-text-color: |
100 |
| - inspection.get-theme-color($theme, system, on-surface), |
| 90 | + form-field-outlined-input-text-color: map.get($system, on-surface), |
101 | 91 | form-field-outlined-disabled-input-text-color: $disabled,
|
102 |
| - form-field-outlined-input-text-placeholder-color: |
103 |
| - inspection.get-theme-color($theme, foreground, base, 0.6), |
| 92 | + form-field-outlined-input-text-placeholder-color: map.get($system, on-surface-variant), |
104 | 93 | form-field-outlined-error-caret-color: map.get($system, error),
|
105 | 94 | form-field-outlined-error-focus-label-text-color: map.get($system, error),
|
106 | 95 | form-field-outlined-error-label-text-color: map.get($system, error),
|
107 | 96 | form-field-outlined-error-hover-label-text-color: map.get($system, error),
|
108 |
| - form-field-outlined-outline-color: inspection.get-theme-color($theme, foreground, base, 0.38), |
| 97 | + form-field-outlined-outline-color: map.get($system, outline-variant), |
109 | 98 | form-field-outlined-disabled-outline-color:
|
110 |
| - inspection.get-theme-color($theme, foreground, base, 0.06), |
111 |
| - form-field-outlined-hover-outline-color: |
112 |
| - inspection.get-theme-color($theme, system, on-surface), |
| 99 | + m3-utils.color-with-opacity(map.get($system, on-surface), 12%), |
| 100 | + form-field-outlined-hover-outline-color: map.get($system, on-surface), |
113 | 101 | form-field-outlined-error-focus-outline-color: map.get($system, error),
|
114 | 102 | form-field-outlined-error-hover-outline-color: map.get($system, error),
|
115 | 103 | form-field-outlined-error-outline-color: map.get($system, error),
|
|
0 commit comments