Skip to content

fix(button): focus state matches spec #467

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

Merged
merged 2 commits into from
Jun 2, 2016
Merged

fix(button): focus state matches spec #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
745ba15
fix(button): focus state matches spec
jelbourn May 19, 2016
8f1d84b
change all buttons to use the same focus styling technique
jelbourn May 31, 2016
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
13 changes: 4 additions & 9 deletions src/components/button/_button-base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ $md-mini-fab-padding: 8px !default;
&[disabled] {
cursor: default;
}

&.md-button-focus {
@include md-button-focus();
}
}

// Applies styles to buttons with backgrounds: raised, fab, and mini-fab
Expand All @@ -85,11 +89,6 @@ $md-mini-fab-padding: 8px !default;
@include md-elevation(8);
}

&.md-button-focus {
background-color: md-color($md-foreground, base, 0.12);
@include md-button-theme('background-color', 600);
}

&[disabled] {
box-shadow: none;
}
Expand All @@ -110,8 +109,4 @@ $md-mini-fab-padding: 8px !default;
i, md-icon {
padding: $padding 0;
}

&.md-button-focus {
background-color: md-color($md-accent, 600);
}
}
35 changes: 32 additions & 3 deletions src/components/button/_button-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

// Applies specified coloring to three supported palettes
@mixin md-button-theme ($property, $color: 'default', $opacity: 1) {
/** Applies a property to an md-button element for each of the supported palettes. */
@mixin md-button-theme($property, $color: 'default', $opacity: 1) {
&.md-primary {
#{$property}: md-color($md-primary, $color, $opacity);
}
Expand All @@ -18,3 +17,33 @@
}
}
}

/** Applies a focus style to an md-button element for each of the supported palettes. */
@mixin md-button-focus {
&::after {
// The button spec calls for focus on raised buttons (and FABs) to be indicated with a
// black, 12% opacity shade over the normal color (for both light and dark themes).
// We do this by placing an :after psuedo-element with the appropriate shade over the button.
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
content: '';
background-color: rgba(black, 0.12);
border-radius: inherit;
pointer-events: none;
}

&.md-primary::after {
background-color: md-color($md-primary, 0.12);
}

&.md-accent::after {
background-color: md-color($md-accent, 0.12);
}

&.md-warn::after {
background-color: md-color($md-warn, 0.12);
}
}
18 changes: 7 additions & 11 deletions src/components/button/button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@
[md-button] {
@extend %md-button-base;

&:hover, &.md-button-focus {
background-color: md-color($md-foreground, base, 0.12);
@include md-button-theme('background-color', 0.12);
}

&[disabled]:hover {
&.md-primary, &.md-accent, &.md-warn, &:hover {
background-color: transparent;
Expand Down Expand Up @@ -43,19 +38,20 @@
line-height: $md-icon-button-line-height;
border-radius: $md-icon-button-border-radius;

&.md-button-focus {
background-color: md-color($md-foreground, base, 0.12);
@include md-button-theme('background-color', 0.12);
}

.md-button-wrapper > * {
vertical-align: middle;
}
}

// Only flat buttons and icon buttons (not raised or fabs) have a hover style.
[md-button]:hover, [md-icon-button]:hover {
// Use the same visual treatment for hover as for focus.
@include md-button-focus();
}

// Applies a clearer border for high-contrast mode (a11y)
@media screen and (-ms-high-contrast: active) {
.md-raised-button, .md-fab, .md-mini-fab {
border: 1px solid #fff;
}
}
}