Skip to content

Commit 408c0b4

Browse files
authored
fix(material/card): Apply tokens at mixin root (#27557)
Applies card tokens at the theme mixin's root selector (or html if the mixin is called with no selector). This makes it easier for users to override tokens without worrying about specificity.
1 parent c0b3aa5 commit 408c0b4

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/material/card/_card-theme.scss

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@use 'sass:map';
2+
@use '../core/style/sass-utils';
23
@use '../core/theming/theming';
34
@use '../core/typography/typography';
45
@use '../core/tokens/token-utils';
@@ -9,7 +10,7 @@
910
@use '@material/card/outlined-card-theme' as mdc-outlined-card-theme;
1011

1112
@mixin base($config-or-theme) {
12-
.mat-mdc-card {
13+
@include sass-utils.current-selector-or-root() {
1314
@include mdc-elevated-card-theme.theme(tokens-mdc-elevated-card.get-unthemable-tokens());
1415
@include mdc-outlined-card-theme.theme(tokens-mdc-outlined-card.get-unthemable-tokens());
1516
@include token-utils.create-token-values(
@@ -32,7 +33,7 @@
3233
$mat-card-color-tokens: tokens-mat-card.get-color-tokens($config);
3334

3435
// Add values for card tokens.
35-
.mat-mdc-card {
36+
@include sass-utils.current-selector-or-root() {
3637
@include mdc-elevated-card-theme.theme($mdc-elevated-card-color-tokens);
3738
@include mdc-outlined-card-theme.theme($mdc-outlined-card-color-tokens);
3839
@include token-utils.create-token-values(tokens-mat-card.$prefix, $mat-card-color-tokens);
@@ -47,7 +48,7 @@
4748
$mat-card-typography-tokens: tokens-mat-card.get-typography-tokens($config);
4849

4950
// Add values for card tokens.
50-
.mat-mdc-card {
51+
@include sass-utils.current-selector-or-root() {
5152
@include mdc-elevated-card-theme.theme($mdc-elevated-card-typography-tokens);
5253
@include mdc-outlined-card-theme.theme($mdc-outlined-card-typography-tokens);
5354
@include token-utils.create-token-values(tokens-mat-card.$prefix, $mat-card-typography-tokens);
@@ -61,7 +62,7 @@
6162
$mat-card-density-tokens: tokens-mat-card.get-density-tokens($density-scale);
6263

6364
// Add values for card tokens.
64-
.mat-mdc-card {
65+
@include sass-utils.current-selector-or-root() {
6566
@include mdc-elevated-card-theme.theme($mdc-elevated-card-density-tokens);
6667
@include mdc-outlined-card-theme.theme($mdc-outlined-card-density-tokens);
6768
@include token-utils.create-token-values(tokens-mat-card.$prefix, $mat-card-density-tokens);

0 commit comments

Comments
 (0)