From 965375e59ea602c33bc15324b22d08b9e3f835bb Mon Sep 17 00:00:00 2001 From: crisbeto Date: Sun, 27 Mar 2016 10:27:37 +0200 Subject: [PATCH] feat(select): add hover styles and fix disabled * Adds hover styles to the select component. * Fixes the disabled styles that were being applied to the wrong element. Closes #7518. --- src/components/select/select-theme.scss | 12 ++++++++---- src/components/select/select.scss | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/components/select/select-theme.scss b/src/components/select/select-theme.scss index bc9c49e7603..49cbef4df36 100644 --- a/src/components/select/select-theme.scss +++ b/src/components/select/select-theme.scss @@ -53,11 +53,16 @@ md-select-menu.md-THEME_NAME-theme { color: '{{background-900-0.87}}'; &[disabled] { - color: '{{background-400-0.87}}'; + ._md-text { + color: '{{background-400-0.87}}'; + } } - &:focus:not([disabled]) { - background: '{{background-200}}'; + &:not([disabled]) { + &:focus, + &:hover { + background: '{{background-200}}' + } } &[selected] { @@ -76,7 +81,6 @@ md-select-menu.md-THEME_NAME-theme { } } - [md-checkbox-enabled].md-THEME_NAME-theme { @include checkbox-primary('[selected]'); diff --git a/src/components/select/select.scss b/src/components/select/select.scss index ef58a3524d6..509da64473a 100755 --- a/src/components/select/select.scss +++ b/src/components/select/select.scss @@ -189,6 +189,7 @@ md-option { display: flex; align-items: center; width: auto; + transition: background 0.15s linear; &[disabled] { cursor: default;