Skip to content

Commit 2a96cd5

Browse files
committed
refactor(material/button): move base tokens to the theme
Moves the base tokens of the button to the theme, rather than the structural styles. This is necessary for M3.
1 parent a7f87a8 commit 2a96cd5

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

src/material/button/_button-theme.scss

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,21 @@
8181
}
8282

8383
@mixin base($theme) {
84-
// TODO(mmalerba): Move button base tokens here
84+
@if inspection.get-theme-version($theme) == 1 {
85+
// TODO(crisbeto): emit M3 base tokens here.
86+
}
87+
@else {
88+
@include sass-utils.current-selector-or-root() {
89+
@include mdc-button-text-theme.theme(
90+
tokens-mdc-text-button.get-unthemable-tokens());
91+
@include mdc-button-filled-theme.theme(
92+
tokens-mdc-filled-button.get-unthemable-tokens());
93+
@include mdc-button-protected-theme.theme(
94+
tokens-mdc-protected-button.get-unthemable-tokens());
95+
@include mdc-button-outlined-theme.theme(
96+
tokens-mdc-outlined-button.get-unthemable-tokens());
97+
}
98+
}
8599
}
86100

87101
@mixin color($theme) {

src/material/button/button.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
$mdc-text-button-slots: tokens-mdc-text-button.get-token-slots();
3131

3232
@include mdc-button-text-theme.theme-styles($mdc-text-button-slots);
33-
@include mdc-button-text-theme.theme(tokens-mdc-text-button.get-unthemable-tokens());
3433
@include button-base.mat-private-button-ripple(tokens-mat-text-button.$prefix,
3534
tokens-mat-text-button.get-token-slots());
3635

@@ -47,7 +46,6 @@
4746
$mdc-filled-button-slots: tokens-mdc-filled-button.get-token-slots();
4847

4948
@include mdc-button-filled-theme.theme-styles($mdc-filled-button-slots);
50-
@include mdc-button-filled-theme.theme(tokens-mdc-filled-button.get-unthemable-tokens());
5149
@include button-base.mat-private-button-ripple(tokens-mat-filled-button.$prefix,
5250
tokens-mat-filled-button.get-token-slots());
5351

@@ -65,7 +63,6 @@
6563
$mdc-button-protected-slots: tokens-mdc-protected-button.get-token-slots();
6664

6765
@include mdc-button-protected-theme.theme-styles($mdc-button-protected-slots);
68-
@include mdc-button-protected-theme.theme(tokens-mdc-protected-button.get-unthemable-tokens());
6966
@include button-base.mat-private-button-ripple(tokens-mat-protected-button.$prefix,
7067
tokens-mat-protected-button.get-token-slots());
7168

@@ -90,7 +87,6 @@
9087
$mdc-outlined-button-slots: tokens-mdc-outlined-button.get-token-slots();
9188

9289
@include mdc-button-outlined-theme.theme-styles($mdc-outlined-button-slots);
93-
@include mdc-button-outlined-theme.theme(tokens-mdc-outlined-button.get-unthemable-tokens());
9490
@include button-base.mat-private-button-ripple(tokens-mat-outlined-button.$prefix,
9591
tokens-mat-outlined-button.get-token-slots());
9692

0 commit comments

Comments
 (0)