Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
"rollup": "^4.52.3",
"rollup-plugin-dts": "6.4.1",
"rollup-plugin-sourcemaps2": "0.5.6",
"sass": "^1.97.2",
"sass": "^1.99.0",
"selenium-webdriver": "^3.6.0",
"semver": "^7.3.5",
"shelljs": "^0.10.0",
Expand Down
17 changes: 15 additions & 2 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 14 additions & 8 deletions src/material/core/tokens/_system.scss
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
$density-tokens: get-density-tokens($scale);
@each $tokens in $density-tokens {
@each $token-name, $token-value in $tokens {
--mat-#{$token-name}: #{$token-value};
@include _output-token('mat', $token-name, $token-value);
}
}
}
Expand Down Expand Up @@ -204,7 +204,7 @@
@include sass-utils.current-selector-or-root {
@each $name, $value in $overrides {
@if (map.has-key($sys-names, $name)) {
--#{$prefix}-#{$name}: #{map.get($overrides, $name)};
@include _output-token($prefix, $name, map.get($overrides, $name));
}
}
}
Expand All @@ -229,7 +229,7 @@

@include sass-utils.current-selector-or-root {
@each $name, $value in $sys-colors {
--#{$prefix}-#{$name}: #{map.get($overrides, $name) or $value};
@include _output-token($prefix, $name, map.get($overrides, $name) or $value);
}
}
}
Expand Down Expand Up @@ -268,7 +268,7 @@

@include sass-utils.current-selector-or-root {
@each $name, $value in m3.md-sys-typescale-values($font-definition) {
--#{$prefix}-#{$name}: #{map.get($overrides, $name) or $value};
@include _output-token($prefix, $name, map.get($overrides, $name) or $value);
}
}
}
Expand All @@ -281,23 +281,23 @@
@each $name, $value in m3.md-sys-elevation-values() {
$level: map.get($overrides, $name) or $value;
$value: elevation.get-box-shadow($level, $shadow-color);
--#{$prefix}-#{$name}: #{$value};
@include _output-token($prefix, $name, $value);
}
}
}

@mixin system-level-shape($theme: (), $overrides: (), $prefix: definition.$system-level-prefix) {
@include sass-utils.current-selector-or-root {
@each $name, $value in m3.md-sys-shape-values() {
--#{$prefix}-#{$name}: #{map.get($overrides, $name) or $value};
@include _output-token($prefix, $name, map.get($overrides, $name) or $value);
}
}
}

@mixin system-level-state($theme: (), $overrides: (), $prefix: definition.$system-level-prefix) {
@include sass-utils.current-selector-or-root {
@each $name, $value in m3.md-sys-state-values() {
--#{$prefix}-#{$name}: #{map.get($overrides, $name) or $value};
@include _output-token($prefix, $name, map.get($overrides, $name) or $value);
}
}
}
Expand Down Expand Up @@ -389,10 +389,16 @@
}
}

@mixin _output-token($prefix, $name, $value) {
// The strings silence some Sass compiler warnings.
--#{'' + $prefix}-#{'' + $name}: #{$value};
}

@mixin _define-m2-system-vars($vars, $overrides) {
@include sass-utils.current-selector-or-root {
@each $name, $value in $vars {
--#{definition.$system-fallback-prefix}-#{$name}: #{map.get($overrides, $name) or $value};
@include _output-token(
definition.$system-fallback-prefix, $name, map.get($overrides, $name) or $value);
}
}
}
Loading