Skip to content

Commit

Permalink
fix(button): Update colors to match guidance (#2598)
Browse files Browse the repository at this point in the history
  • Loading branch information
williamernest committed Apr 19, 2018
1 parent 099738c commit 1be9d96
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 4 additions & 4 deletions packages/mdc-button/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@

&:disabled {
@include mdc-theme-prop(background-color, transparent);
@include mdc-theme-prop(color, text-disabled-on-light);

color: $mdc-button-disabled-ink-color;
cursor: default;
pointer-events: none;
}
Expand Down Expand Up @@ -157,16 +157,16 @@
border-style: solid;

&:disabled {
@include mdc-theme-prop(border-color, text-disabled-on-light);
border-color: $mdc-button-disabled-ink-color;
}
}

@mixin mdc-button--filled_() {
@include mdc-button-horizontal-padding($mdc-button-contained-horizontal-padding);

&:disabled {
@include mdc-theme-prop(background-color, rgba(black, .12));
@include mdc-theme-prop(color, text-disabled-on-light);
background-color: rgba(mdc-theme-prop-value(on-surface), .12);
color: $mdc-button-disabled-ink-color;
}
}

Expand Down
2 changes: 2 additions & 0 deletions packages/mdc-button/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ $mdc-button-height: 36px;
$mdc-button-horizontal-padding: 8px;
$mdc-button-contained-horizontal-padding: 16px;
$mdc-dense-button-height: 32px;

$mdc-button-disabled-ink-color: rgba(mdc-theme-prop-value(on-surface), .37);

0 comments on commit 1be9d96

Please sign in to comment.