Skip to content

Commit 807a227

Browse files
committed
fix(checkbox): incorrect color for disabled indeterminate checkbox
When we were implementing the new Material Design spec, [we based our checkbox state off this design](https://camo.githubusercontent.com/293e382a98c90eb68f6e537a714379e843493dd0/68747470733a2f2f73746f726167652e676f6f676c65617069732e636f6d2f737065632d686f73742d6261636b75702f6d696f2d64657369676e25324661737365747325324631374173385659376a4c4b4f53346e443170794e39343539667168386c65724b7525324673656c656374696f6e636f6e74726f6c732d636865636b626f7865732d7374617465732e706e67) which shows selected disabled checkboxes to be greyed out, whereas indeterminate disabled checkboxes having a slight opacity. After checking with the MDC team, the above-mentioned designs are incorrect and all disabled checkboxes are supposed to be grey. Fixes #14415.
1 parent ac97157 commit 807a227

File tree

4 files changed

+4
-12
lines changed

4 files changed

+4
-12
lines changed

src/lib/checkbox/_checkbox-theme.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@
6161
}
6262

6363
.mat-checkbox-disabled {
64-
&.mat-checkbox-checked:not(.mat-checkbox-indeterminate) {
64+
&.mat-checkbox-checked,
65+
&.mat-checkbox-indeterminate {
6566
.mat-checkbox-background {
6667
background-color: $disabled-color;
6768
}

src/lib/checkbox/checkbox.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -360,12 +360,6 @@ $_mat-checkbox-mark-stroke-size: 2 / 15 * $mat-checkbox-size !default;
360360
opacity: 1;
361361
transform: scaleX(1) rotate(0deg);
362362
}
363-
364-
&.mat-checkbox-disabled {
365-
.mat-checkbox-inner-container {
366-
opacity: 0.5;
367-
}
368-
}
369363
}
370364

371365

src/lib/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@
4343
background: mat-color(map-get($theme, warn));
4444
}
4545

46-
.mat-pseudo-checkbox-checked {
46+
.mat-pseudo-checkbox-checked,
47+
.mat-pseudo-checkbox-indeterminate {
4748
&.mat-pseudo-checkbox-disabled {
4849
background: $disabled-color;
4950
}

src/lib/core/selection/pseudo-checkbox/pseudo-checkbox.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ $_mat-pseudo-checkmark-size: $mat-checkbox-size - (2 * $_mat-pseudo-checkbox-pad
4545

4646
.mat-pseudo-checkbox-disabled {
4747
cursor: default;
48-
49-
&.mat-pseudo-checkbox-indeterminate {
50-
opacity: 0.5;
51-
}
5248
}
5349

5450
.mat-pseudo-checkbox-indeterminate::after {

0 commit comments

Comments
 (0)