Skip to content

Commit 87c85a7

Browse files
committed
fix(checkbox): address latest issues
1 parent 52db2fb commit 87c85a7

File tree

2 files changed

+20
-19
lines changed

2 files changed

+20
-19
lines changed

projects/igniteui-angular/src/lib/core/styles/components/checkbox/_checkbox-component.scss

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
@extend %cbx-ripple--hover !optional;
2323
}
2424

25+
@include e(composite) {
26+
@extend %cbx-composite--hover !optional;
27+
}
28+
2529
@include e(composite-mark) {
2630
@extend %cbx-composite-mark--fluent !optional;
2731
}
@@ -64,21 +68,7 @@
6468
@extend %cbx-ripple !optional;
6569
}
6670

67-
@include m(bootstrap) {
68-
@include e(composite) {
69-
&:hover {
70-
@extend %cbx-composite--hover !optional;
71-
}
72-
}
73-
}
74-
7571
@include m(indigo) {
76-
@include e(composite) {
77-
&:hover {
78-
@extend %cbx-composite--hover !optional;
79-
}
80-
}
81-
8272
@include e(composite-mark) {
8373
@extend %cbx-composite-mark-indigo !optional;
8474
}
@@ -247,11 +237,19 @@
247237
@include e(composite) {
248238
@extend %cbx-composite--x--hover !optional;
249239
}
240+
241+
@include e(composite-mark) {
242+
@extend %cbx-composite-mark--in--fluent !optional;
243+
}
250244
}
251245
}
252246

253247
@include mx(material, disabled, indeterminate) {
254-
@extend %igx-checkbox--disabled-indeterminate-material !optional;
248+
@extend %igx-checkbox--disabled-indeterminate !optional;
249+
}
250+
251+
@include mx(bootstrap, disabled, indeterminate) {
252+
@extend %igx-checkbox--disabled-indeterminate !optional;
255253
}
256254

257255
@include mx(fluent, disabled, indeterminate) {

projects/igniteui-angular/src/lib/core/styles/components/checkbox/_checkbox-theme.scss

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,9 @@
122122
}
123123

124124
%cbx-composite--hover {
125-
border-color: var-get($theme, 'empty-color-hover');
125+
@if $variant == 'bootstrap' or $variant == 'indigo' {
126+
border-color: var-get($theme, 'empty-color-hover');
127+
}
126128
}
127129

128130
%cbx-composite--x {
@@ -175,6 +177,7 @@
175177
%cbx-composite--x--disabled {
176178
@if $variant == 'material' or $variant == 'fluent' {
177179
background: var-get($theme, 'disabled-color');
180+
border-color: var-get($theme, 'disabled-color');
178181
}
179182

180183
@if $variant == 'indigo' or $variant == 'bootstrap' {
@@ -262,7 +265,7 @@
262265
}
263266

264267
%igx-checkbox--disabled-indeterminate-indigo {
265-
@extend %igx-checkbox--indeterminate-indigo;
268+
@extend %igx-checkbox--disabled-indeterminate;
266269

267270
%cbx-composite-mark {
268271
rect {
@@ -307,15 +310,15 @@
307310
}
308311

309312
%cbx-composite--x--disabled {
310-
background: transparent;
313+
border-color: var-get($theme, 'disabled-color');
311314

312315
&::before {
313316
background: var-get($theme, 'disabled-color');
314317
}
315318
}
316319
}
317320

318-
%igx-checkbox--disabled-indeterminate-material {
321+
%igx-checkbox--disabled-indeterminate {
319322
%cbx-composite--x--disabled {
320323
border-color: var-get($theme, 'disabled-indeterminate-color');
321324
background: var-get($theme, 'disabled-indeterminate-color');

0 commit comments

Comments
 (0)