diff --git a/src/demo-app/button-toggle/button-toggle-demo.html b/src/demo-app/button-toggle/button-toggle-demo.html index eaf7ac01dfc2..0d158c21ecc3 100644 --- a/src/demo-app/button-toggle/button-toggle-demo.html +++ b/src/demo-app/button-toggle/button-toggle-demo.html @@ -2,6 +2,10 @@ Show Button Toggles Vertical

+

+ Disable Button Toggle Items +

+

Exclusive Selection

@@ -9,14 +13,14 @@

Exclusive Selection

format_align_left format_align_center format_align_right - format_align_justify + format_align_justify

Disabled Group

- + format_bold @@ -35,7 +39,7 @@

Multiple Selection

Flour Eggs Sugar - Milk (disabled) + Milk
diff --git a/src/demo-app/button-toggle/button-toggle-demo.ts b/src/demo-app/button-toggle/button-toggle-demo.ts index 67726b664518..d03d18396bf2 100644 --- a/src/demo-app/button-toggle/button-toggle-demo.ts +++ b/src/demo-app/button-toggle/button-toggle-demo.ts @@ -9,6 +9,7 @@ import {UniqueSelectionDispatcher} from '@angular/material'; }) export class ButtonToggleDemo { isVertical = false; + isDisabled = false; favoritePie = 'Apple'; pieOptions = [ 'Apple', diff --git a/src/lib/button-toggle/_button-toggle-theme.scss b/src/lib/button-toggle/_button-toggle-theme.scss index 23ede0f16c3b..79760cca49dc 100644 --- a/src/lib/button-toggle/_button-toggle-theme.scss +++ b/src/lib/button-toggle/_button-toggle-theme.scss @@ -4,11 +4,18 @@ @mixin md-button-toggle-theme($theme) { $foreground: map-get($theme, foreground); + $background: map-get($theme, background); + + .md-button-toggle-label-content { + color: md-color($foreground, hint-text); + } .md-button-toggle-checked .md-button-toggle-label-content { background-color: md-color($md-grey, 300); + color: md-color($foreground, base); } .md-button-toggle-disabled .md-button-toggle-label-content { - background-color: md-color($foreground, disabled); + background-color: map_get($md-grey, 200); + color: md-color($foreground, disabled-button); } }