Skip to content

Commit

Permalink
fix(buttons): disabled raised and fab buttons don't hover on focus
Browse files Browse the repository at this point in the history
Closes angular#358.
  • Loading branch information
ajoslin committed Oct 2, 2014
1 parent db1ec93 commit 6d0ca8f
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions src/components/buttons/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,8 @@ material-button {
transition-property: box-shadow, transform, background-color;
@include transform-translate3d(0, 0, 0);

@extend .material-shadow-bottom-z-1;

&:not([disabled]) {
@extend .material-shadow-bottom-z-1;
&:hover,
&.focus {
background-color: $button-raised-hover-background;
Expand Down Expand Up @@ -151,12 +150,14 @@ material-button {

}

&.material-button-raised,
&.material-button-fab {
&.focus,
&:hover:not([disabled]) {
@include transform-translate3d(0, -1px, 0);
@extend .material-shadow-bottom-z-2;
&:not([disabled]) {
&.material-button-raised,
&.material-button-fab {
&.focus,
&:hover {
@include transform-translate3d(0, -1px, 0);
@extend .material-shadow-bottom-z-2;
}
}
}
}
Expand Down

0 comments on commit 6d0ca8f

Please sign in to comment.