Skip to content
This repository was archived by the owner on Jan 13, 2025. It is now read-only.

Commit 55fbba9

Browse files
authored
feat(button): Use mdc-states mixin for button styles (#1668)
BREAKING CHANGE: The $mdc-*-button-ripple-opacity variables have been removed, as these values are now available via the state opacity maps in mdc-ripple.
1 parent dab612c commit 55fbba9

File tree

6 files changed

+16
-19
lines changed

6 files changed

+16
-19
lines changed

demos/button.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424

2525
.mdc-button.secondary-text-button {
2626
@include mdc-button-ink-color($mdc-theme-secondary);
27-
@include mdc-ripple-color(secondary, $mdc-unfilled-button-ripple-opacity);
27+
@include mdc-states(secondary);
2828

2929
@include mdc-theme-dark(".mdc-button") {
3030
@include mdc-button-ink-color($mdc-theme-secondary);
31-
@include mdc-ripple-color(secondary, $mdc-unfilled-button-ripple-opacity);
31+
@include mdc-states(secondary);
3232
}
3333
}
3434

@@ -43,12 +43,12 @@
4343
.mdc-button.secondary-stroked-button {
4444
@include mdc-button-ink-color($mdc-theme-secondary);
4545
@include mdc-button-stroke-color($mdc-theme-secondary);
46-
@include mdc-ripple-color(secondary, $mdc-unfilled-button-ripple-opacity);
46+
@include mdc-states(secondary);
4747

4848
@include mdc-theme-dark(".mdc-button") {
4949
@include mdc-button-ink-color($mdc-theme-secondary);
5050
@include mdc-button-stroke-color($mdc-theme-secondary);
51-
@include mdc-ripple-color(secondary, $mdc-unfilled-button-ripple-opacity);
51+
@include mdc-states(secondary);
5252
}
5353
}
5454

demos/common.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ $dark-button-color: $material-color-light-green-a200;
5151
.mdc-button {
5252
@include mdc-theme-dark {
5353
@include mdc-button-ink-color($dark-button-color);
54-
@include mdc-ripple-color($dark-button-color, $mdc-unfilled-button-ripple-opacity);
54+
@include mdc-states($dark-button-color);
5555
}
5656
}
5757

demos/theme/index.scss

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,11 @@ figure {
135135

136136
.mdc-button.secondary-text-button {
137137
@include mdc-button-ink-color($mdc-theme-secondary);
138-
@include mdc-ripple-color($mdc-theme-secondary, $mdc-unfilled-button-ripple-opacity);
138+
@include mdc-states($mdc-theme-secondary);
139139

140140
@include mdc-theme-dark(".mdc-button") {
141141
@include mdc-button-ink-color($mdc-theme-secondary);
142-
@include mdc-ripple-color($mdc-theme-secondary, $mdc-unfilled-button-ripple-opacity);
142+
@include mdc-states($mdc-theme-secondary);
143143
}
144144
}
145145

@@ -154,12 +154,12 @@ figure {
154154
.mdc-button.secondary-stroked-button {
155155
@include mdc-button-ink-color($mdc-theme-secondary);
156156
@include mdc-button-stroke-color($mdc-theme-secondary);
157-
@include mdc-ripple-color($mdc-theme-secondary, $mdc-unfilled-button-ripple-opacity);
157+
@include mdc-states($mdc-theme-secondary);
158158

159159
@include mdc-theme-dark(".mdc-button") {
160160
@include mdc-button-ink-color($mdc-theme-secondary);
161161
@include mdc-button-stroke-color($mdc-theme-secondary);
162-
@include mdc-ripple-color($mdc-theme-secondary, $mdc-unfilled-button-ripple-opacity);
162+
@include mdc-states($mdc-theme-secondary);
163163
}
164164
}
165165

@@ -400,15 +400,15 @@ figure {
400400
}
401401

402402
.demo-ripple-surface--primary {
403-
@include mdc-ripple-color(primary, $mdc-ripple-pressed-dark-ink-opacity);
403+
@include mdc-states(primary);
404404
}
405405

406406
.demo-ripple-surface--secondary {
407-
@include mdc-ripple-color(secondary, $mdc-ripple-pressed-dark-ink-opacity);
407+
@include mdc-states(secondary);
408408
}
409409

410410
.demo-ripple-surface--custom {
411-
@include mdc-ripple-color($demo-custom-color, $mdc-ripple-pressed-dark-ink-opacity);
411+
@include mdc-states($demo-custom-color);
412412
}
413413

414414
.mdc-ripple-surface[data-mdc-ripple-is-unbounded] {

packages/mdc-button/_mixins.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828

2929
@if ($fill-tone == "dark") {
3030
@include mdc-button-ink-color(text-primary-on-dark);
31-
@include mdc-ripple-color(text-primary-on-dark, $mdc-filled-button-ripple-opacity);
31+
@include mdc-states(text-primary-on-dark);
3232
} @else {
3333
@include mdc-button-ink-color(text-primary-on-light);
34-
@include mdc-ripple-color(text-primary-on-light, $mdc-filled-button-ripple-opacity);
34+
@include mdc-states(text-primary-on-light);
3535
}
3636
}
3737

packages/mdc-button/_variables.scss

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,3 @@ $mdc-button-height: 36px;
1818
$mdc-button-horizontal-padding: 16px;
1919
$mdc-dense-button-height: 32px;
2020
$mdc-compact-button-horizontal-padding: 8px;
21-
22-
$mdc-unfilled-button-ripple-opacity: .16;
23-
$mdc-filled-button-ripple-opacity: .32;

packages/mdc-button/mdc-button.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
@include mdc-button-corner-radius(2px);
2626
@include mdc-button-container-fill-color(transparent);
2727
@include mdc-button-ink-color(primary);
28-
@include mdc-ripple-color(primary, $mdc-unfilled-button-ripple-opacity);
28+
@include mdc-states(primary);
2929
}
3030

3131
.mdc-button--raised,
3232
.mdc-button--unelevated {
3333
@include mdc-button--filled_;
3434
@include mdc-button-container-fill-color(primary);
3535
@include mdc-button-ink-color(text-primary-on-primary);
36-
@include mdc-ripple-color(text-primary-on-primary, $mdc-filled-button-ripple-opacity);
36+
@include mdc-states(text-primary-on-primary);
3737
}
3838

3939
.mdc-button--raised {

0 commit comments

Comments
 (0)