Skip to content

Commit 21df04e

Browse files
authored
fix(material/core): output tokens from theme under same selector (#31295)
Fixes that the tokens generated by the `theme` mixins were being separated out into different selectors, rather than being combined.
1 parent 9d12aaa commit 21df04e

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

src/material/core/tokens/_m3-system.scss

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
@use '../theming/config-validation';
2020
@use '../theming/definition';
2121
@use '../theming/palettes';
22+
@use '../style/sass-utils';
2223
@use './m3';
2324
@use 'sass:map';
2425
@use 'sass:meta';
@@ -196,7 +197,7 @@
196197
m3.md-sys-shape-values(),
197198
m3.md-sys-state-values());
198199

199-
& {
200+
@include sass-utils.current-selector-or-root {
200201
@each $name, $value in $overrides {
201202
@if (map.has-key($sys-names, $name)) {
202203
--#{$prefix}-#{$name}: #{map.get($overrides, $name)};
@@ -222,7 +223,7 @@
222223
$sys-colors: map.set($sys-colors, neutral-variant20, map.get($palettes, neutral-variant, 20));
223224
$sys-colors: map.set($sys-colors, neutral10, map.get($palettes, neutral, 10));
224225

225-
& {
226+
@include sass-utils.current-selector-or-root {
226227
@each $name, $value in $sys-colors {
227228
--#{$prefix}-#{$name}: #{map.get($overrides, $name) or $value};
228229
}
@@ -261,7 +262,7 @@
261262
typography-system-variables-prefix) or definition.$system-level-prefix;
262263
}
263264

264-
& {
265+
@include sass-utils.current-selector-or-root {
265266
@each $name, $value in m3.md-sys-typescale-values($font-definition) {
266267
--#{$prefix}-#{$name}: #{map.get($overrides, $name) or $value};
267268
}
@@ -272,25 +273,26 @@
272273
$shadow-color: map.get(
273274
$theme, definition.$internals, palettes, neutral, 0);
274275

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);
279281
--#{$prefix}-#{$name}: #{$value};
280282
}
281283
}
282284
}
283285

284286
@mixin system-level-shape($theme: (), $overrides: (), $prefix: definition.$system-level-prefix) {
285-
& {
287+
@include sass-utils.current-selector-or-root {
286288
@each $name, $value in m3.md-sys-shape-values() {
287289
--#{$prefix}-#{$name}: #{map.get($overrides, $name) or $value};
288290
}
289291
}
290292
}
291293

292294
@mixin system-level-state($theme: (), $overrides: (), $prefix: definition.$system-level-prefix) {
293-
& {
295+
@include sass-utils.current-selector-or-root {
294296
@each $name, $value in m3.md-sys-state-values() {
295297
--#{$prefix}-#{$name}: #{map.get($overrides, $name) or $value};
296298
}

0 commit comments

Comments
 (0)