From 6d0ca8fb0c9946a8adef2161c95b1439977dd7e1 Mon Sep 17 00:00:00 2001 From: Andrew Date: Thu, 2 Oct 2014 11:35:25 -0600 Subject: [PATCH] fix(buttons): disabled raised and fab buttons don't hover on focus Closes #358. --- src/components/buttons/_buttons.scss | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/components/buttons/_buttons.scss b/src/components/buttons/_buttons.scss index 6b07715a714..7ec04b494f8 100644 --- a/src/components/buttons/_buttons.scss +++ b/src/components/buttons/_buttons.scss @@ -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; @@ -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; + } } } }