|
52 | 52 | button-filled-container-color: map.get($system, surface),
|
53 | 53 | button-filled-disabled-container-color: $disabled-container,
|
54 | 54 | button-filled-disabled-label-text-color: $disabled,
|
55 |
| - button-filled-disabled-state-layer-color: inspection.get-theme-color($theme, foreground, base), |
| 55 | + button-filled-disabled-state-layer-color: map.get($system, on-surface-variant), |
56 | 56 | button-filled-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
|
57 | 57 | button-filled-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
|
58 |
| - button-filled-label-text-color: inspection.get-theme-color($theme, foreground, base), |
| 58 | + button-filled-label-text-color: map.get($system, on-surface), |
59 | 59 | button-filled-pressed-state-layer-opacity: map.get($system, pressed-state-layer-opacity),
|
60 |
| - button-filled-ripple-color: inspection.get-theme-color($theme, foreground, base, 0.1), |
61 |
| - button-filled-state-layer-color: inspection.get-theme-color($theme, foreground, base), |
| 60 | + button-filled-ripple-color: m3-utils.color-with-opacity( |
| 61 | + map.get($system, on-surface), map.get($system, pressed-state-layer-opacity)), |
| 62 | + button-filled-state-layer-color: map.get($system, on-surface), |
62 | 63 | button-outlined-disabled-label-text-color: $disabled,
|
63 | 64 | button-outlined-disabled-outline-color: $outline,
|
64 |
| - button-outlined-disabled-state-layer-color: |
65 |
| - inspection.get-theme-color($theme, foreground, base), |
| 65 | + button-outlined-disabled-state-layer-color: map.get($system, on-surface-variant), |
66 | 66 | button-outlined-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
|
67 | 67 | button-outlined-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
|
68 |
| - button-outlined-label-text-color: inspection.get-theme-color($theme, foreground, base), |
| 68 | + button-outlined-label-text-color: map.get($system, on-surface), |
69 | 69 | button-outlined-outline-color: $outline,
|
70 |
| - button-outlined-pressed-state-layer-opacity: |
71 |
| - map.get($system, pressed-state-layer-opacity), |
72 |
| - button-outlined-ripple-color: inspection.get-theme-color($theme, foreground, base, 0.1), |
73 |
| - button-outlined-state-layer-color: inspection.get-theme-color($theme, foreground, base), |
| 70 | + button-outlined-pressed-state-layer-opacity: map.get($system, pressed-state-layer-opacity), |
| 71 | + button-outlined-ripple-color: m3-utils.color-with-opacity( |
| 72 | + map.get($system, on-surface), map.get($system, pressed-state-layer-opacity)), |
| 73 | + button-outlined-state-layer-color: map.get($system, on-surface), |
74 | 74 | button-protected-container-color: map.get($system, surface),
|
75 | 75 | button-protected-disabled-container-color: $disabled-container,
|
76 | 76 | button-protected-disabled-label-text-color: $disabled,
|
77 |
| - button-protected-disabled-state-layer-color: |
78 |
| - inspection.get-theme-color($theme, foreground, base), |
| 77 | + button-protected-disabled-state-layer-color: map.get($system, on-surface-variant), |
79 | 78 | button-protected-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
|
80 | 79 | button-protected-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
|
81 |
| - button-protected-label-text-color: inspection.get-theme-color($theme, foreground, base), |
82 |
| - button-protected-pressed-state-layer-opacity: |
83 |
| - map.get($system, pressed-state-layer-opacity), |
84 |
| - button-protected-ripple-color: inspection.get-theme-color($theme, foreground, base, 0.1), |
85 |
| - button-protected-state-layer-color: inspection.get-theme-color($theme, foreground, base), |
| 80 | + button-protected-label-text-color: map.get($system, on-surface), |
| 81 | + button-protected-pressed-state-layer-opacity: map.get($system, pressed-state-layer-opacity), |
| 82 | + button-protected-ripple-color: m3-utils.color-with-opacity( |
| 83 | + map.get($system, on-surface), map.get($system, pressed-state-layer-opacity)), |
| 84 | + button-protected-state-layer-color: map.get($system, on-surface), |
86 | 85 | button-text-disabled-label-text-color: $disabled,
|
87 |
| - button-text-disabled-state-layer-color: inspection.get-theme-color($theme, foreground, base), |
| 86 | + button-text-disabled-state-layer-color: map.get($system, on-surface-variant), |
88 | 87 | button-text-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
|
89 | 88 | button-text-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
|
90 |
| - button-text-label-text-color: inspection.get-theme-color($theme, foreground, base), |
| 89 | + button-text-label-text-color: map.get($system, on-surface), |
91 | 90 | button-text-pressed-state-layer-opacity: map.get($system, pressed-state-layer-opacity),
|
92 |
| - button-text-ripple-color: inspection.get-theme-color($theme, foreground, base, 0.1), |
93 |
| - button-text-state-layer-color: inspection.get-theme-color($theme, foreground, base), |
| 91 | + button-text-ripple-color: m3-utils.color-with-opacity( |
| 92 | + map.get($system, on-surface), map.get($system, pressed-state-layer-opacity)), |
| 93 | + button-text-state-layer-color: map.get($system, on-surface), |
94 | 94 | button-tonal-container-color: map.get($system, surface),
|
95 | 95 | button-tonal-disabled-container-color: $disabled-container,
|
96 | 96 | button-tonal-disabled-label-text-color: $disabled,
|
97 |
| - button-tonal-disabled-state-layer-color: inspection.get-theme-color($theme, foreground, base), |
| 97 | + button-tonal-disabled-state-layer-color: map.get($system, on-surface-variant), |
98 | 98 | button-tonal-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
|
99 | 99 | button-tonal-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
|
100 |
| - button-tonal-label-text-color: inspection.get-theme-color($theme, foreground, base), |
| 100 | + button-tonal-label-text-color: map.get($system, on-surface), |
101 | 101 | button-tonal-pressed-state-layer-opacity: map.get($system, pressed-state-layer-opacity),
|
102 |
| - button-tonal-ripple-color: inspection.get-theme-color($theme, foreground, base, 0.1), |
103 |
| - button-tonal-state-layer-color: inspection.get-theme-color($theme, foreground, base), |
| 102 | + button-tonal-ripple-color: m3-utils.color-with-opacity( |
| 103 | + map.get($system, on-surface), map.get($system, pressed-state-layer-opacity)), |
| 104 | + button-tonal-state-layer-color: map.get($system, on-surface), |
104 | 105 | );
|
105 | 106 | }
|
106 | 107 |
|
|
116 | 117 | @return (
|
117 | 118 | button-filled-container-color: map.get($system, primary),
|
118 | 119 | button-filled-label-text-color: map.get($system, on-primary),
|
119 |
| - button-filled-ripple-color: m3-utils.color-with-opacity(map.get($system, on-primary), 10%), |
| 120 | + button-filled-ripple-color: m3-utils.color-with-opacity( |
| 121 | + map.get($system, on-primary), map.get($system, pressed-state-layer-opacity)), |
120 | 122 | button-filled-state-layer-color: map.get($system, on-primary),
|
121 | 123 | button-outlined-label-text-color: map.get($system, primary),
|
122 | 124 | button-outlined-outline-color: map.get(get-color-tokens($theme), button-outlined-outline-color),
|
123 |
| - button-outlined-ripple-color: m3-utils.color-with-opacity(map.get($system, primary), 10%), |
| 125 | + button-outlined-ripple-color: m3-utils.color-with-opacity( |
| 126 | + map.get($system, primary), map.get($system, pressed-state-layer-opacity)), |
124 | 127 | button-outlined-state-layer-color: map.get($system, primary),
|
125 | 128 | button-protected-container-color: map.get($system, primary),
|
126 | 129 | button-protected-label-text-color: map.get($system, on-primary),
|
127 |
| - button-protected-ripple-color: m3-utils.color-with-opacity(map.get($system, on-primary), 10%), |
| 130 | + button-protected-ripple-color: m3-utils.color-with-opacity( |
| 131 | + map.get($system, on-primary), map.get($system, pressed-state-layer-opacity)), |
128 | 132 | button-protected-state-layer-color: map.get($system, on-primary),
|
129 | 133 | button-text-label-text-color: map.get($system, primary),
|
130 |
| - button-text-ripple-color: m3-utils.color-with-opacity(map.get($system, primary), 10%), |
| 134 | + button-text-ripple-color: m3-utils.color-with-opacity( |
| 135 | + map.get($system, primary), map.get($system, pressed-state-layer-opacity)), |
131 | 136 | button-text-state-layer-color: map.get($system, primary),
|
132 | 137 | button-tonal-container-color: map.get($system, primary),
|
133 | 138 | button-tonal-label-text-color: map.get($system, on-primary),
|
134 |
| - button-tonal-ripple-color: m3-utils.color-with-opacity(map.get($system, on-primary), 10%), |
| 139 | + button-tonal-ripple-color: m3-utils.color-with-opacity( |
| 140 | + map.get($system, on-primary), map.get($system, pressed-state-layer-opacity)), |
135 | 141 | button-tonal-state-layer-color: map.get($system, on-primary),
|
136 | 142 | );
|
137 | 143 | }
|
|
0 commit comments