diff --git a/src/components/mdButtonToggle/mdButtonToggle.scss b/src/components/mdButtonToggle/mdButtonToggle.scss index ec5f422..8711f1c 100644 --- a/src/components/mdButtonToggle/mdButtonToggle.scss +++ b/src/components/mdButtonToggle/mdButtonToggle.scss @@ -1,13 +1,15 @@ @import '../../core/stylesheets/variables.scss'; .md-button-toggle { - .md-button:not([disabled]) { - color: rgba(#000, .54); + .md-button { + &:not([disabled]) { + color: rgba(#000, .54); - &:hover:not(.md-toggle) { - &:not(.md-raised) { - background-color: rgba(#999, .2); - text-decoration: none; + &:hover:not(.md-toggle) { + &:not(.md-raised) { + background-color: rgba(#999, .2); + text-decoration: none; + } } } } diff --git a/src/components/mdButtonToggle/mdButtonToggle.theme b/src/components/mdButtonToggle/mdButtonToggle.theme index 742632b..9bed785 100644 --- a/src/components/mdButtonToggle/mdButtonToggle.theme +++ b/src/components/mdButtonToggle/mdButtonToggle.theme @@ -16,7 +16,7 @@ color: #{'BACKGROUND-CONTRAST-600'}; background-color: #{'BACKGROUND-COLOR-500'}; - &:hover { + &:hover:not([disabled]) { background-color: #{'BACKGROUND-COLOR-600'}; } @@ -29,7 +29,7 @@ color: #{'PRIMARY-CONTRAST'}; background-color: #{'PRIMARY-COLOR'}; - &:hover { + &:hover:not([disabled]) { background-color: #{'PRIMARY-COLOR-600'}; } @@ -42,7 +42,7 @@ color: #{'ACCENT-CONTRAST'}; background-color: #{'ACCENT-COLOR'}; - &:hover { + &:hover:not([disabled]) { background-color: #{'ACCENT-COLOR-600'}; } @@ -55,7 +55,7 @@ color: #{'WARN-CONTRAST'}; background-color: #{'WARN-COLOR'}; - &:hover { + &:hover:not([disabled]) { background-color: #{'WARN-COLOR-600'}; } @@ -63,5 +63,14 @@ background-color: #{'WARN-COLOR-700'}; } } + + [disabled] { + color: rgba(#000, .26); + + &.md-toggle { + color: #{'BACKGROUND-CONTRAST-0.2'}; + background-color: rgba(#000, .26); + } + } } } diff --git a/src/docs/pages/ButtonToggle.vue b/src/docs/pages/ButtonToggle.vue index 0fb98bf..7f2270b 100644 --- a/src/docs/pages/ButtonToggle.vue +++ b/src/docs/pages/ButtonToggle.vue @@ -7,7 +7,7 @@ format_bold - + format_italic