|
19 | 19 | @use '../style/sass-utils';
|
20 | 20 | @use '../theming/config-validation';
|
21 | 21 | @use '../theming/definition';
|
| 22 | +@use '../theming/palettes'; |
22 | 23 | @use './m3';
|
23 | 24 | @use './m3-tokens';
|
24 | 25 | @use 'sass:list';
|
|
130 | 131 | /// change the primary color to red, use `mat.theme-overrides((primary: red));`
|
131 | 132 | @mixin theme-overrides($overrides, $prefix: definition.$system-fallback-prefix) {
|
132 | 133 | $sys-names: map-merge-all(
|
133 |
| - m3.md-sys-color-values-light(), |
134 |
| - m3.md-sys-typescale-values(), |
| 134 | + m3.md-sys-color-values-light(palettes.$blue-palette), |
| 135 | + m3.md-sys-typescale-values(( |
| 136 | + brand: (Roboto), |
| 137 | + plain: (Roboto), |
| 138 | + bold: 700, |
| 139 | + medium: 500, |
| 140 | + regular: 400 |
| 141 | + )), |
135 | 142 | m3.md-sys-elevation-values(),
|
136 | 143 | m3.md-sys-shape-values(),
|
137 | 144 | m3.md-sys-state-values());
|
|
147 | 154 |
|
148 | 155 | @mixin system-level-colors($theme, $overrides: (), $prefix: null) {
|
149 | 156 | $palettes: map.get($theme, _mat-theming-internals-do-not-access, palettes);
|
150 |
| - $base-palettes: ( |
151 |
| - neutral: map.get($palettes, neutral), |
152 |
| - neutral-variant: map.get($palettes, neutral-variant), |
153 |
| - secondary: map.get($palettes, secondary), |
154 |
| - error: map.get($palettes, error), |
155 |
| - ); |
156 |
| - |
157 | 157 | $type: map.get($theme, _mat-theming-internals-do-not-access, theme-type);
|
158 |
| - $primary: map.merge(map.get($palettes, primary), $base-palettes); |
159 |
| - $tertiary: map.merge(map.get($palettes, tertiary), $base-palettes); |
160 |
| - $error: map.get($palettes, error); |
161 | 158 |
|
162 | 159 | @if (not $prefix) {
|
163 | 160 | $prefix: map.get($theme, _mat-theming-internals-do-not-access,
|
164 | 161 | color-system-variables-prefix) or definition.$system-level-prefix;
|
165 | 162 | }
|
166 | 163 |
|
167 |
| - $ref: ( |
168 |
| - md-ref-palette: m3-tokens.generate-ref-palette-tokens($primary, $tertiary, $error) |
169 |
| - ); |
170 | 164 |
|
171 |
| - $sys-colors: _generate-sys-colors($ref, $type); |
| 165 | + $sys-colors: _generate-sys-colors($palettes, $type); |
172 | 166 |
|
173 | 167 | // Manually insert a subset of palette values that are used directly by components
|
174 | 168 | // instead of system variables.
|
175 |
| - $sys-colors: map.set($sys-colors, |
176 |
| - 'neutral-variant20', map.get($ref, md-ref-palette, neutral-variant20)); |
177 |
| - $sys-colors: map.set($sys-colors, |
178 |
| - 'neutral10', map.get($ref, md-ref-palette, neutral10)); |
| 169 | + $sys-colors: map.set($sys-colors, neutral-variant20, map.get($palettes, neutral-variant, 20)); |
| 170 | + $sys-colors: map.set($sys-colors, neutral10, map.get($palettes, neutral, 10)); |
179 | 171 |
|
180 | 172 | & {
|
181 | 173 | @each $name, $value in $sys-colors {
|
|
184 | 176 | }
|
185 | 177 | }
|
186 | 178 |
|
187 |
| -@function _generate-sys-colors($ref, $type) { |
188 |
| - $light-sys-colors: m3.md-sys-color-values-light($ref); |
| 179 | +@function _generate-sys-colors($palettes, $type) { |
| 180 | + $light-sys-colors: m3.md-sys-color-values-light($palettes); |
189 | 181 | @if ($type == light) {
|
190 | 182 | @return $light-sys-colors;
|
191 | 183 | }
|
192 | 184 |
|
193 |
| - $dark-sys-colors: m3.md-sys-color-values-dark($ref); |
| 185 | + $dark-sys-colors: m3.md-sys-color-values-dark($palettes); |
194 | 186 | @if ($type == dark) {
|
195 | 187 | @return $dark-sys-colors;
|
196 | 188 | }
|
|
210 | 202 |
|
211 | 203 | @mixin system-level-typography($theme, $overrides: (), $prefix: null) {
|
212 | 204 | $font-definition: map.get($theme, _mat-theming-internals-do-not-access, font-definition);
|
213 |
| - $brand: map.get($font-definition, brand); |
214 |
| - $plain: map.get($font-definition, plain); |
215 |
| - $bold: map.get($font-definition, bold); |
216 |
| - $medium: map.get($font-definition, medium); |
217 |
| - $regular: map.get($font-definition, regular); |
218 |
| - $ref: (md-ref-typeface: |
219 |
| - m3-tokens.generate-ref-typeface-tokens($brand, $plain, $bold, $medium, $regular) |
220 |
| - ); |
221 | 205 |
|
222 | 206 | @if (not $prefix) {
|
223 | 207 | $prefix: map.get($theme, _mat-theming-internals-do-not-access,
|
224 | 208 | typography-system-variables-prefix) or definition.$system-level-prefix;
|
225 | 209 | }
|
226 | 210 |
|
227 | 211 | & {
|
228 |
| - @each $name, $value in m3.md-sys-typescale-values($ref) { |
| 212 | + @each $name, $value in m3.md-sys-typescale-values($font-definition) { |
229 | 213 | --#{$prefix}-#{$name}: #{map.get($overrides, $name) or $value};
|
230 | 214 | }
|
231 | 215 | }
|
|
275 | 259 | // system fallback variables referencing Material's system keys.
|
276 | 260 | // Includes density token fallbacks where density is 0.
|
277 | 261 | @function create-system-fallbacks() {
|
| 262 | + $palettes: m3.md-sys-color-values-light(palettes.$blue-palette); |
| 263 | + $palettes: map.set($palettes, primary, palettes.$blue-palette); |
278 | 264 | $app-vars: (
|
279 | 265 | 'md-sys-color':
|
280 |
| - _create-system-app-vars-map(m3.md-sys-color-values-light()), |
| 266 | + _create-system-app-vars-map(m3.md-sys-color-values-light($palettes)), |
281 | 267 | 'md-sys-typescale':
|
282 |
| - _create-system-app-vars-map(m3.md-sys-typescale-values()), |
| 268 | + _create-system-app-vars-map(m3.md-sys-typescale-values(( |
| 269 | + brand: (Roboto), |
| 270 | + plain: (Roboto), |
| 271 | + bold: 700, |
| 272 | + medium: 500, |
| 273 | + regular: 400 |
| 274 | + ))), |
283 | 275 | 'md-sys-elevation':
|
284 | 276 | _create-system-app-vars-map(m3.md-sys-elevation-values()),
|
285 | 277 | 'md-sys-state':
|
|
0 commit comments