Skip to content

fix(multiple): avoid repeating selectors in m3 themes #30645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 19, 2025
Merged

fix(multiple): avoid repeating selectors in m3 themes #30645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions src/dev-app/theme-m3.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ html {
color-scheme: light;
body:not(.demo-experimental-theme) {
@include mat.all-component-themes($light-theme);
@include mat.checkbox-overrides((
disabled-label-color: orange,
label-text-color: red,
));
@include mat.system-level-colors($light-theme);
@include mat.system-level-typography($light-theme);
// TODO(mmalerba): Support M3 for experimental components.
Expand Down
8 changes: 4 additions & 4 deletions src/material/autocomplete/_autocomplete-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
@include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
} @else {
@include sass-utils.current-selector-or-root() {
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-autocomplete.$prefix,
tokens-mat-autocomplete.get-unthemable-tokens()
);
Expand All @@ -25,7 +25,7 @@
@include _theme-from-tokens(inspection.get-theme-tokens($theme, color));
} @else {
@include sass-utils.current-selector-or-root() {
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-autocomplete.$prefix,
tokens-mat-autocomplete.get-color-tokens($theme)
);
Expand All @@ -38,7 +38,7 @@
@include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
} @else {
@include sass-utils.current-selector-or-root() {
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-autocomplete.$prefix,
tokens-mat-autocomplete.get-typography-tokens($theme)
);
Expand All @@ -51,7 +51,7 @@
@include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
} @else {
@include sass-utils.current-selector-or-root() {
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-autocomplete.$prefix,
tokens-mat-autocomplete.get-density-tokens($theme)
);
Expand Down
10 changes: 5 additions & 5 deletions src/material/badge/_badge-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
@include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
} @else {
@include sass-utils.current-selector-or-root() {
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-badge.$prefix,
tokens-mat-badge.get-unthemable-tokens()
);
Expand All @@ -33,21 +33,21 @@
@include _theme-from-tokens(inspection.get-theme-tokens($theme, color), $options...);
} @else {
@include sass-utils.current-selector-or-root() {
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-badge.$prefix,
tokens-mat-badge.get-color-tokens($theme)
);
}

.mat-badge-accent {
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-badge.$prefix,
tokens-mat-badge.private-get-color-palette-color-tokens($theme, accent)
);
}

.mat-badge-warn {
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-badge.$prefix,
tokens-mat-badge.private-get-color-palette-color-tokens($theme, warn)
);
Expand All @@ -62,7 +62,7 @@
@include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
} @else {
@include sass-utils.current-selector-or-root() {
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-badge.$prefix,
tokens-mat-badge.get-typography-tokens($theme)
);
Expand Down
6 changes: 3 additions & 3 deletions src/material/bottom-sheet/_bottom-sheet-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
@include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
} @else {
@include sass-utils.current-selector-or-root() {
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-bottom-sheet.$prefix,
tokens-mat-bottom-sheet.get-unthemable-tokens()
);
Expand All @@ -25,7 +25,7 @@
@include _theme-from-tokens(inspection.get-theme-tokens($theme, color));
} @else {
@include sass-utils.current-selector-or-root() {
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-bottom-sheet.$prefix,
tokens-mat-bottom-sheet.get-color-tokens($theme)
);
Expand All @@ -38,7 +38,7 @@
@include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
} @else {
@include sass-utils.current-selector-or-root() {
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-bottom-sheet.$prefix,
tokens-mat-bottom-sheet.get-typography-tokens($theme)
);
Expand Down
16 changes: 8 additions & 8 deletions src/material/button-toggle/_button-toggle-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
@include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
} @else {
@include sass-utils.current-selector-or-root() {
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-legacy-button-toggle.$prefix,
tokens-mat-legacy-button-toggle.get-unthemable-tokens()
);
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-standard-button-toggle.$prefix,
tokens-mat-standard-button-toggle.get-unthemable-tokens()
);
Expand All @@ -37,11 +37,11 @@
@include _theme-from-tokens(inspection.get-theme-tokens($theme, color), $options...);
} @else {
@include sass-utils.current-selector-or-root() {
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-legacy-button-toggle.$prefix,
tokens-mat-legacy-button-toggle.get-color-tokens($theme)
);
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-standard-button-toggle.$prefix,
tokens-mat-standard-button-toggle.get-color-tokens($theme)
);
Expand All @@ -56,11 +56,11 @@
@include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
} @else {
@include sass-utils.current-selector-or-root() {
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-legacy-button-toggle.$prefix,
tokens-mat-legacy-button-toggle.get-typography-tokens($theme)
);
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-standard-button-toggle.$prefix,
tokens-mat-standard-button-toggle.get-typography-tokens($theme)
);
Expand All @@ -75,11 +75,11 @@
@include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
} @else {
@include sass-utils.current-selector-or-root() {
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-legacy-button-toggle.$prefix,
tokens-mat-legacy-button-toggle.get-density-tokens($theme)
);
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-standard-button-toggle.$prefix,
tokens-mat-standard-button-toggle.get-density-tokens($theme)
);
Expand Down
72 changes: 36 additions & 36 deletions src/material/button/_button-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
tokens-mat-text-button.get-color-tokens($theme)
);

@include token-utils.create-token-values(tokens-mdc-text-button.$prefix, $mdc-tokens);
@include token-utils.create-token-values(tokens-mat-text-button.$prefix, $mat-tokens);
@include token-utils.create-token-values-mixed(tokens-mdc-text-button.$prefix, $mdc-tokens);
@include token-utils.create-token-values-mixed(tokens-mat-text-button.$prefix, $mat-tokens);
}

@mixin _filled-button-variant($theme, $palette) {
Expand All @@ -44,8 +44,8 @@
tokens-mat-filled-button.get-color-tokens($theme)
);

@include token-utils.create-token-values(tokens-mdc-filled-button.$prefix, $mdc-tokens);
@include token-utils.create-token-values(tokens-mat-filled-button.$prefix, $mat-tokens);
@include token-utils.create-token-values-mixed(tokens-mdc-filled-button.$prefix, $mdc-tokens);
@include token-utils.create-token-values-mixed(tokens-mat-filled-button.$prefix, $mat-tokens);
}

@mixin _protected-button-variant($theme, $palette) {
Expand All @@ -61,8 +61,8 @@
tokens-mat-protected-button.get-color-tokens($theme)
);

@include token-utils.create-token-values(tokens-mdc-protected-button.$prefix, $mdc-tokens);
@include token-utils.create-token-values(tokens-mat-protected-button.$prefix, $mat-tokens);
@include token-utils.create-token-values-mixed(tokens-mdc-protected-button.$prefix, $mdc-tokens);
@include token-utils.create-token-values-mixed(tokens-mat-protected-button.$prefix, $mat-tokens);
}

@mixin _outlined-button-variant($theme, $palette) {
Expand All @@ -78,12 +78,12 @@
tokens-mat-outlined-button.get-color-tokens($theme)
);

@include token-utils.create-token-values(tokens-mdc-outlined-button.$prefix, $mdc-tokens);
@include token-utils.create-token-values(tokens-mat-outlined-button.$prefix, $mat-tokens);
@include token-utils.create-token-values-mixed(tokens-mdc-outlined-button.$prefix, $mdc-tokens);
@include token-utils.create-token-values-mixed(tokens-mat-outlined-button.$prefix, $mat-tokens);
}

@mixin _tonal-button-variant($theme, $palette) {
@include token-utils.create-token-values(tokens-mat-tonal-button.$prefix, if(
@include token-utils.create-token-values-mixed(tokens-mat-tonal-button.$prefix, if(
$palette,
tokens-mat-tonal-button.private-get-color-palette-color-tokens($theme, $palette),
tokens-mat-tonal-button.get-color-tokens($theme)
Expand Down Expand Up @@ -181,40 +181,40 @@
@include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
} @else {
@include sass-utils.current-selector-or-root() {
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mdc-text-button.$prefix,
tokens-mdc-text-button.get-unthemable-tokens()
);
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mdc-filled-button.$prefix,
tokens-mdc-filled-button.get-unthemable-tokens()
);
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mdc-protected-button.$prefix,
tokens-mdc-protected-button.get-unthemable-tokens()
);
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mdc-outlined-button.$prefix,
tokens-mdc-outlined-button.get-unthemable-tokens()
);

@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-text-button.$prefix,
tokens-mat-text-button.get-unthemable-tokens()
);
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-filled-button.$prefix,
tokens-mat-filled-button.get-unthemable-tokens()
);
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-protected-button.$prefix,
tokens-mat-protected-button.get-unthemable-tokens()
);
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-outlined-button.$prefix,
tokens-mat-outlined-button.get-unthemable-tokens()
);
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-tonal-button.$prefix,
tokens-mat-tonal-button.get-unthemable-tokens()
);
Expand Down Expand Up @@ -318,40 +318,40 @@
@include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
} @else {
@include sass-utils.current-selector-or-root() {
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mdc-text-button.$prefix,
tokens-mdc-text-button.get-typography-tokens($theme)
);
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mdc-filled-button.$prefix,
tokens-mdc-filled-button.get-typography-tokens($theme)
);
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mdc-protected-button.$prefix,
tokens-mdc-protected-button.get-typography-tokens($theme)
);
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mdc-outlined-button.$prefix,
tokens-mdc-outlined-button.get-typography-tokens($theme)
);

@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-text-button.$prefix,
tokens-mat-text-button.get-typography-tokens($theme)
);
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-filled-button.$prefix,
tokens-mat-filled-button.get-typography-tokens($theme)
);
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-protected-button.$prefix,
tokens-mat-protected-button.get-typography-tokens($theme)
);
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-outlined-button.$prefix,
tokens-mat-outlined-button.get-typography-tokens($theme)
);
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-tonal-button.$prefix,
tokens-mat-tonal-button.get-typography-tokens($theme)
);
Expand All @@ -366,40 +366,40 @@
@include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
} @else {
@include sass-utils.current-selector-or-root() {
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mdc-text-button.$prefix,
tokens-mdc-text-button.get-density-tokens($theme)
);
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mdc-filled-button.$prefix,
tokens-mdc-filled-button.get-density-tokens($theme)
);
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mdc-protected-button.$prefix,
tokens-mdc-protected-button.get-density-tokens($theme)
);
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mdc-outlined-button.$prefix,
tokens-mdc-outlined-button.get-density-tokens($theme)
);

@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-text-button.$prefix,
tokens-mat-text-button.get-density-tokens($theme)
);
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-filled-button.$prefix,
tokens-mat-filled-button.get-density-tokens($theme)
);
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-protected-button.$prefix,
tokens-mat-protected-button.get-density-tokens($theme)
);
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-outlined-button.$prefix,
tokens-mat-outlined-button.get-density-tokens($theme)
);
@include token-utils.create-token-values(
@include token-utils.create-token-values-mixed(
tokens-mat-tonal-button.$prefix,
tokens-mat-tonal-button.get-density-tokens($theme)
);
Expand Down
Loading
Loading