Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(button): Use new mdc-states mixin for button styles #1668

Merged
merged 3 commits into from
Dec 5, 2017
Merged

feat(button): Use new mdc-states mixin for button styles #1668

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4851a8c
feat(button): Use mdc-states mixin for button styles
Dec 1, 2017
c5e52f3
Merge branch 'master' into feat/states-button
kfranqueiro Dec 5, 2017
4b041bb
Merge branch 'master' into feat/states-button
kfranqueiro Dec 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions demos/button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@

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

@include mdc-theme-dark(".mdc-button") {
@include mdc-button-ink-color($mdc-theme-secondary);
@include mdc-ripple-color(secondary, $mdc-unfilled-button-ripple-opacity);
@include mdc-states(secondary);
}
}

Expand All @@ -43,12 +43,12 @@
.mdc-button.secondary-stroked-button {
@include mdc-button-ink-color($mdc-theme-secondary);
@include mdc-button-stroke-color($mdc-theme-secondary);
@include mdc-ripple-color(secondary, $mdc-unfilled-button-ripple-opacity);
@include mdc-states(secondary);

@include mdc-theme-dark(".mdc-button") {
@include mdc-button-ink-color($mdc-theme-secondary);
@include mdc-button-stroke-color($mdc-theme-secondary);
@include mdc-ripple-color(secondary, $mdc-unfilled-button-ripple-opacity);
@include mdc-states(secondary);
}
}

Expand Down
2 changes: 1 addition & 1 deletion demos/common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ $dark-button-color: $material-color-light-green-a200;
.mdc-button {
@include mdc-theme-dark {
@include mdc-button-ink-color($dark-button-color);
@include mdc-ripple-color($dark-button-color, $mdc-unfilled-button-ripple-opacity);
@include mdc-states($dark-button-color);
}
}

Expand Down
14 changes: 7 additions & 7 deletions demos/theme/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,11 @@ figure {

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

@include mdc-theme-dark(".mdc-button") {
@include mdc-button-ink-color($mdc-theme-secondary);
@include mdc-ripple-color($mdc-theme-secondary, $mdc-unfilled-button-ripple-opacity);
@include mdc-states($mdc-theme-secondary);
}
}

Expand All @@ -154,12 +154,12 @@ figure {
.mdc-button.secondary-stroked-button {
@include mdc-button-ink-color($mdc-theme-secondary);
@include mdc-button-stroke-color($mdc-theme-secondary);
@include mdc-ripple-color($mdc-theme-secondary, $mdc-unfilled-button-ripple-opacity);
@include mdc-states($mdc-theme-secondary);

@include mdc-theme-dark(".mdc-button") {
@include mdc-button-ink-color($mdc-theme-secondary);
@include mdc-button-stroke-color($mdc-theme-secondary);
@include mdc-ripple-color($mdc-theme-secondary, $mdc-unfilled-button-ripple-opacity);
@include mdc-states($mdc-theme-secondary);
}
}

Expand Down Expand Up @@ -400,15 +400,15 @@ figure {
}

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

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

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

.mdc-ripple-surface[data-mdc-ripple-is-unbounded] {
Expand Down
4 changes: 2 additions & 2 deletions packages/mdc-button/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@

@if ($fill-tone == "dark") {
@include mdc-button-ink-color(text-primary-on-dark);
@include mdc-ripple-color(text-primary-on-dark, $mdc-filled-button-ripple-opacity);
@include mdc-states(text-primary-on-dark);
} @else {
@include mdc-button-ink-color(text-primary-on-light);
@include mdc-ripple-color(text-primary-on-light, $mdc-filled-button-ripple-opacity);
@include mdc-states(text-primary-on-light);
}
}

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

$mdc-unfilled-button-ripple-opacity: .16;
$mdc-filled-button-ripple-opacity: .32;
4 changes: 2 additions & 2 deletions packages/mdc-button/mdc-button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
@include mdc-button-corner-radius(2px);
@include mdc-button-container-fill-color(transparent);
@include mdc-button-ink-color(primary);
@include mdc-ripple-color(primary, $mdc-unfilled-button-ripple-opacity);
@include mdc-states(primary);
}

.mdc-button--raised,
.mdc-button--unelevated {
@include mdc-button--filled_;
@include mdc-button-container-fill-color(primary);
@include mdc-button-ink-color(text-primary-on-primary);
@include mdc-ripple-color(text-primary-on-primary, $mdc-filled-button-ripple-opacity);
@include mdc-states(text-primary-on-primary);
}

.mdc-button--raised {
Expand Down