|
19 | 19 | @use '../theming/config-validation'; |
20 | 20 | @use '../theming/definition'; |
21 | 21 | @use '../theming/palettes'; |
| 22 | +@use '../style/sass-utils'; |
22 | 23 | @use './m3'; |
23 | 24 | @use 'sass:map'; |
24 | 25 | @use 'sass:meta'; |
|
196 | 197 | m3.md-sys-shape-values(), |
197 | 198 | m3.md-sys-state-values()); |
198 | 199 |
|
199 | | - & { |
| 200 | + @include sass-utils.current-selector-or-root { |
200 | 201 | @each $name, $value in $overrides { |
201 | 202 | @if (map.has-key($sys-names, $name)) { |
202 | 203 | --#{$prefix}-#{$name}: #{map.get($overrides, $name)}; |
|
222 | 223 | $sys-colors: map.set($sys-colors, neutral-variant20, map.get($palettes, neutral-variant, 20)); |
223 | 224 | $sys-colors: map.set($sys-colors, neutral10, map.get($palettes, neutral, 10)); |
224 | 225 |
|
225 | | - & { |
| 226 | + @include sass-utils.current-selector-or-root { |
226 | 227 | @each $name, $value in $sys-colors { |
227 | 228 | --#{$prefix}-#{$name}: #{map.get($overrides, $name) or $value}; |
228 | 229 | } |
|
261 | 262 | typography-system-variables-prefix) or definition.$system-level-prefix; |
262 | 263 | } |
263 | 264 |
|
264 | | - & { |
| 265 | + @include sass-utils.current-selector-or-root { |
265 | 266 | @each $name, $value in m3.md-sys-typescale-values($font-definition) { |
266 | 267 | --#{$prefix}-#{$name}: #{map.get($overrides, $name) or $value}; |
267 | 268 | } |
|
272 | 273 | $shadow-color: map.get( |
273 | 274 | $theme, definition.$internals, palettes, neutral, 0); |
274 | 275 |
|
275 | | - @each $name, $value in m3.md-sys-elevation-values() { |
276 | | - $level: map.get($overrides, $name) or $value; |
277 | | - $value: elevation.get-box-shadow($level, $shadow-color); |
278 | | - & { |
| 276 | + |
| 277 | + @include sass-utils.current-selector-or-root { |
| 278 | + @each $name, $value in m3.md-sys-elevation-values() { |
| 279 | + $level: map.get($overrides, $name) or $value; |
| 280 | + $value: elevation.get-box-shadow($level, $shadow-color); |
279 | 281 | --#{$prefix}-#{$name}: #{$value}; |
280 | 282 | } |
281 | 283 | } |
282 | 284 | } |
283 | 285 |
|
284 | 286 | @mixin system-level-shape($theme: (), $overrides: (), $prefix: definition.$system-level-prefix) { |
285 | | - & { |
| 287 | + @include sass-utils.current-selector-or-root { |
286 | 288 | @each $name, $value in m3.md-sys-shape-values() { |
287 | 289 | --#{$prefix}-#{$name}: #{map.get($overrides, $name) or $value}; |
288 | 290 | } |
289 | 291 | } |
290 | 292 | } |
291 | 293 |
|
292 | 294 | @mixin system-level-state($theme: (), $overrides: (), $prefix: definition.$system-level-prefix) { |
293 | | - & { |
| 295 | + @include sass-utils.current-selector-or-root { |
294 | 296 | @each $name, $value in m3.md-sys-state-values() { |
295 | 297 | --#{$prefix}-#{$name}: #{map.get($overrides, $name) or $value}; |
296 | 298 | } |
|
0 commit comments