Skip to content

Commit fed5d7b

Browse files
devversiontinayuangao
authored andcommitted
fix(button-toggle): make conform with design specs (#2570)
Makes the button-toggle more conform with the Material Design specifications. * The specifications don't describe much but it's obvious that unselected items should not have the default text color. * Reduces the color intensity of disabled button toggles because those should be very similar to normal buttons.
1 parent 0640302 commit fed5d7b

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

src/demo-app/button-toggle/button-toggle-demo.html

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,25 @@
22
<md-checkbox (change)="isVertical = $event.checked">Show Button Toggles Vertical</md-checkbox>
33
</p>
44

5+
<p>
6+
<md-checkbox (change)="isDisabled = $event.checked">Disable Button Toggle Items</md-checkbox>
7+
</p>
8+
59
<h1>Exclusive Selection</h1>
610

711
<section class="demo-section">
812
<md-button-toggle-group name="alignment" [vertical]="isVertical">
913
<md-button-toggle value="left"><md-icon>format_align_left</md-icon></md-button-toggle>
1014
<md-button-toggle value="center"><md-icon>format_align_center</md-icon></md-button-toggle>
1115
<md-button-toggle value="right"><md-icon>format_align_right</md-icon></md-button-toggle>
12-
<md-button-toggle value="justify" disabled><md-icon>format_align_justify</md-icon></md-button-toggle>
16+
<md-button-toggle value="justify" [disabled]="isDisabled"><md-icon>format_align_justify</md-icon></md-button-toggle>
1317
</md-button-toggle-group>
1418
</section>
1519

1620
<h1>Disabled Group</h1>
1721

1822
<section class="demo-section">
19-
<md-button-toggle-group name="checkbox" [vertical]="isVertical" disabled>
23+
<md-button-toggle-group name="checkbox" [vertical]="isVertical" [disabled]="isDisabled">
2024
<md-button-toggle value="bold">
2125
<md-icon class="md-24">format_bold</md-icon>
2226
</md-button-toggle>
@@ -35,7 +39,7 @@ <h1>Multiple Selection</h1>
3539
<md-button-toggle>Flour</md-button-toggle>
3640
<md-button-toggle>Eggs</md-button-toggle>
3741
<md-button-toggle>Sugar</md-button-toggle>
38-
<md-button-toggle disabled>Milk (disabled)</md-button-toggle>
42+
<md-button-toggle [disabled]="isDisabled">Milk</md-button-toggle>
3943
</md-button-toggle-group>
4044
</section>
4145

src/demo-app/button-toggle/button-toggle-demo.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {UniqueSelectionDispatcher} from '@angular/material';
99
})
1010
export class ButtonToggleDemo {
1111
isVertical = false;
12+
isDisabled = false;
1213
favoritePie = 'Apple';
1314
pieOptions = [
1415
'Apple',

src/lib/button-toggle/_button-toggle-theme.scss

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,18 @@
44

55
@mixin md-button-toggle-theme($theme) {
66
$foreground: map-get($theme, foreground);
7+
$background: map-get($theme, background);
8+
9+
.md-button-toggle-label-content {
10+
color: md-color($foreground, hint-text);
11+
}
712

813
.md-button-toggle-checked .md-button-toggle-label-content {
914
background-color: md-color($md-grey, 300);
15+
color: md-color($foreground, base);
1016
}
1117
.md-button-toggle-disabled .md-button-toggle-label-content {
12-
background-color: md-color($foreground, disabled);
18+
background-color: map_get($md-grey, 200);
19+
color: md-color($foreground, disabled-button);
1320
}
1421
}

0 commit comments

Comments
 (0)