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

Jump to bottom

fix(button): Default to primary color #1356

Merged
merged 3 commits into from
Sep 28, 2017
Merged

fix(button): Default to primary color #1356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b32d33
fix(button): Default to primary color
Sep 26, 2017
609882e
Add custom styling for dark mode buttons to fix contrast
Sep 26, 2017
51d1696
Merge branch 'master' into fix/button-inherit-theme
kfranqueiro Sep 28, 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
24 changes: 24 additions & 0 deletions demos/common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
$mdc-theme-primary: $material-color-grey-900 !default;
$mdc-theme-secondary: $material-color-light-green-a700 !default;

// Import button mixins to apply overrides for dark theme
// TODO(kfranqueiro): Pending further design discussion around how to manage dark theme
@import "../packages/mdc-button/mixins";
// All demo pages have a top toolbar, and most of them use theme variables.
// Import these *after* setting theme colors to override defaults in mdc-theme.
@import "../packages/mdc-theme/mdc-theme";
Expand All @@ -46,6 +49,27 @@ fieldset {
}
}

$dark-button-color: $material-color-light-green-a200;
.mdc-button {
@include mdc-theme-dark {
@include mdc-button-ink-color($dark-button-color);
@include mdc-button-ripple((base-color: $dark-button-color, opacity: $mdc-unfilled-button-ripple-opacity));
}
}

.mdc-button--raised,
.mdc-button--unelevated {
@include mdc-theme-dark(".mdc-button", true) {
@include mdc-button-filled-accessible($dark-button-color);
}
}

.mdc-button--stroked {
@include mdc-theme-dark(".mdc-button", true) {
@include mdc-button-stroke-color($dark-button-color);
}
}

.catalog-title {
font-family: "Roboto Mono", monospace;
}
Expand Down
23 changes: 6 additions & 17 deletions packages/mdc-button/mdc-button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,16 @@
@include mdc-button-base_;
@include mdc-button-corner-radius(2px);
@include mdc-button-container-fill-color(transparent);
@include mdc-button-ink-color(text-primary-on-light);
@include mdc-button-ripple((theme-style: text-primary-on-light, opacity: $mdc-unfilled-button-ripple-opacity));

@include mdc-theme-dark(".mdc-button") {
@include mdc-button-ink-color(text-primary-on-dark);
@include mdc-button-ripple((theme-style: text-primary-on-dark, opacity: $mdc-unfilled-button-ripple-opacity));
}
@include mdc-button-ink-color(primary);
@include mdc-button-ripple((theme-style: primary, opacity: $mdc-unfilled-button-ripple-opacity));
}

.mdc-button--raised,
.mdc-button--unelevated {
@include mdc-button--filled_;
@include mdc-button-filled-accessible(black);

@include mdc-theme-dark(".mdc-button") {
@include mdc-button-filled-accessible(white);
}
@include mdc-button-container-fill-color(primary);
@include mdc-button-ink-color(text-primary-on-primary);
@include mdc-button-ripple((theme-style: text-primary-on-primary, opacity: $mdc-filled-button-ripple-opacity));
}

.mdc-button--raised {
Expand All @@ -49,11 +42,7 @@
.mdc-button--stroked {
@include mdc-button--stroked_;
@include mdc-button-stroke-width(2px);
@include mdc-button-stroke-color(text-primary-on-light);

@include mdc-theme-dark(".mdc-button") {
@include mdc-button-stroke-color(text-primary-on-dark);
}
@include mdc-button-stroke-color(primary);
}

.mdc-button--compact {
Expand Down