Skip to content

Commit 235dfe4

Browse files
authored
Merge branch 'master' into didimmova/fix-input-theme
2 parents 39196d0 + 0d418b7 commit 235dfe4

File tree

9 files changed

+193
-111
lines changed

9 files changed

+193
-111
lines changed

package-lock.json

Lines changed: 73 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
"gulp-uglify": "^3.0.1",
119119
"hammer-simulator": "0.0.1",
120120
"hammerjs": "^2.0.8",
121-
"ig-typedoc-theme": "^6.0.0",
121+
"ig-typedoc-theme": "^7.0.0",
122122
"igniteui-dockmanager": "^1.17.0",
123123
"igniteui-sassdoc-theme": "^2.1.0",
124124
"igniteui-webcomponents": "6.2.1",
@@ -146,8 +146,8 @@
146146
"stylelint-prettier": "^5.0.2",
147147
"stylelint-scss": "^6.9.0",
148148
"ts-node": "^10.8.1",
149-
"typedoc": "^0.27.0",
150-
"typedoc-plugin-localization": "^3.0.6",
149+
"typedoc": "^0.28.14",
150+
"typedoc-plugin-localization": "^3.1.0",
151151
"typescript": "5.8.3"
152152
}
153153
}

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

Lines changed: 57 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,22 @@
1414
@extend %cbx-display !optional;
1515

1616
&:hover {
17+
@include e(label) {
18+
@extend %cbx-label--hover !optional;
19+
}
20+
21+
@include e(label, $m: before) {
22+
@extend %cbx-label--hover !optional;
23+
}
24+
1725
@include e(ripple) {
1826
@extend %cbx-ripple--hover !optional;
1927
}
2028

29+
@include e(composite) {
30+
@extend %cbx-composite--hover !optional;
31+
}
32+
2133
@include e(composite-mark) {
2234
@extend %cbx-composite-mark--fluent !optional;
2335
}
@@ -60,30 +72,10 @@
6072
@extend %cbx-ripple !optional;
6173
}
6274

63-
@include m(bootstrap) {
64-
@include e(composite) {
65-
&:hover {
66-
@extend %cbx-composite--hover !optional;
67-
}
68-
}
69-
}
70-
7175
@include m(indigo) {
72-
@include e(composite) {
73-
&:hover {
74-
@extend %cbx-composite--hover !optional;
75-
}
76-
}
77-
7876
@include e(composite-mark) {
7977
@extend %cbx-composite-mark-indigo !optional;
8078
}
81-
82-
@include e(label) {
83-
&:hover {
84-
@extend %cbx-label--hover !optional;
85-
}
86-
}
8779
}
8880

8981
@include m(invalid) {
@@ -99,6 +91,10 @@
9991
@extend %cbx-label--invalid !optional;
10092
}
10193

94+
@include e(label, $m: before) {
95+
@extend %cbx-label--invalid !optional;
96+
}
97+
10298
&:hover {
10399
@include e(ripple) {
104100
@extend %cbx-ripple--hover !optional;
@@ -112,6 +108,14 @@
112108
@include e(composite-mark) {
113109
@extend %cbx-composite-mark--invalid--fluent !optional;
114110
}
111+
112+
@include e(label) {
113+
@extend %cbx-label--invalid !optional;
114+
}
115+
116+
@include e(label, $m: before) {
117+
@extend %cbx-label--invalid !optional;
118+
}
115119
}
116120

117121
&:active {
@@ -183,6 +187,12 @@
183187
@include e(ripple) {
184188
@extend %cbx-ripple--focused-invalid !optional;
185189
}
190+
191+
&:hover {
192+
@include e(ripple) {
193+
@extend %cbx-ripple--hover-invalid !optional;
194+
}
195+
}
186196
}
187197

188198
@include mx(indigo, focused, invalid) {
@@ -239,19 +249,29 @@
239249
@include e(composite) {
240250
@extend %cbx-composite--x--hover !optional;
241251
}
252+
253+
@include e(composite-mark) {
254+
@extend %cbx-composite-mark--in--fluent !optional;
255+
}
242256
}
243257
}
244258

245259
@include mx(material, disabled, indeterminate) {
246-
@extend %igx-checkbox--disabled-indeterminate-material !optional;
260+
@extend %igx-checkbox--disabled-indeterminate !optional;
261+
}
262+
263+
@include mx(bootstrap, disabled, indeterminate) {
264+
@extend %igx-checkbox--disabled-indeterminate !optional;
247265
}
248266

249267
@include mx(fluent, disabled, indeterminate) {
250268
@extend %igx-checkbox--disabled-indeterminate-fluent !optional;
251269
}
252270

253271
@include mx(indigo, disabled, indeterminate) {
254-
@extend %igx-checkbox--disabled-indeterminate-indigo !optional;
272+
@include e(composite) {
273+
@extend %igx-checkbox--disabled-indeterminate-indigo !optional;
274+
}
255275
}
256276

257277
@include mx(indigo, focused, indeterminate) {
@@ -324,6 +344,21 @@
324344
@extend %cbx-ripple--focused !optional;
325345
@extend %cbx-ripple--focused-checked !optional;
326346
}
347+
348+
&:hover {
349+
@include e(ripple) {
350+
@extend %cbx-ripple--focused !optional;
351+
@extend %cbx-ripple--focused--hover-checked !optional;
352+
}
353+
}
354+
}
355+
356+
@include mx(focused, invalid, checked) {
357+
&:hover {
358+
@include e(ripple) {
359+
@extend %cbx-ripple--hover-invalid !optional;
360+
}
361+
}
327362
}
328363

329364
@include mx(focused, indeterminate) {

0 commit comments

Comments
 (0)