Skip to content

Commit 1de6a3a

Browse files
authored
fix(material/button): fix color tokens of raised buttons (#27904)
* fix bug where the raised button is accidentally using the flat button color tokens
1 parent c6bc738 commit 1de6a3a

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/material/button/_button-theme.scss

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,13 @@
155155
$surface,
156156
$on-surface
157157
);
158-
$primary-color-tokens: tokens-mdc-button-filled.get-color-tokens($theme, $primary, $on-primary);
159-
$accent-color-tokens: tokens-mdc-button-filled.get-color-tokens($theme, $accent, $on-accent);
160-
$warn-color-tokens: tokens-mdc-button-filled.get-color-tokens($theme, $error, $on-error);
158+
$primary-color-tokens: tokens-mdc-button-protected.get-color-tokens(
159+
$theme,
160+
$primary,
161+
$on-primary
162+
);
163+
$accent-color-tokens: tokens-mdc-button-protected.get-color-tokens($theme, $accent, $on-accent);
164+
$warn-color-tokens: tokens-mdc-button-protected.get-color-tokens($theme, $error, $on-error);
161165

162166
&.mat-unthemed {
163167
@include mdc-button-protected-theme.theme($default-color-tokens);

src/material/core/tokens/m2/mdc/_button-protected.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ $prefix: (mdc, button-protected);
6969
pressed-state-layer-color: $on-primary,
7070
label-text-color: if($on-color, $on-color, inherit),
7171
disabled-container-color: rgba($on-surface, 0.12),
72-
disabled-label-text-color: rgba($on-surface, 0.38)
72+
disabled-label-text-color: rgba($on-surface, if($is-dark, 0.5, 0.38))
7373
);
7474
}
7575

0 commit comments

Comments
 (0)