Skip to content

Commit 191470d

Browse files
didimmovadesig9steinsimeonoff
authored
feat(checkbox): update checkbox disabled checked and indeterminate styles (#2158)
* feat(checkbox): update checkbox disabled checked and indeterminate styles * deps: bump theming * npm: fix mangled package-lock.json --------- Co-authored-by: Marin Popov <desig9stein@users.noreply.github.com> Co-authored-by: Simeon Simeonoff <sim.simeonoff@gmail.com>
1 parent 692e431 commit 191470d

File tree

7 files changed

+27
-45
lines changed

7 files changed

+27
-45
lines changed

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"husky": "^9.1.7",
8282
"ig-typedoc-theme": "^7.0.1",
8383
"igniteui-i18n-resources": "^1.0.4",
84-
"igniteui-theming": "^25.0.2",
84+
"igniteui-theming": "^25.0.3",
8585
"keep-a-changelog": "^3.0.2",
8686
"lint-staged": "^16.4.0",
8787
"lit-analyzer": "^2.0.3",

src/components/checkbox/themes/shared/checkbox/checkbox.bootstrap.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,15 +170,13 @@ $theme: $bootstrap;
170170
}
171171

172172
[part='control checked']::after {
173-
background: var-get($theme, 'disabled-indeterminate-color');
174173
box-shadow: none;
175174
}
176175
}
177176

178177
:host([disabled][indeterminate]),
179178
:host(:disabled[indeterminate]) {
180179
[part~='control']::after {
181-
background: var-get($theme, 'disabled-indeterminate-color');
182180
box-shadow: none;
183181
}
184182
}

src/components/checkbox/themes/shared/checkbox/checkbox.common.scss

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,19 @@ $theme: $material;
4545
[part~='indicator'] {
4646
stroke: var-get($theme, 'disabled-tick-color');
4747
}
48+
49+
[part='control checked'] {
50+
&::after {
51+
background: var-get($theme, 'disabled-fill-color');
52+
}
53+
}
54+
}
55+
56+
:host([disabled][indeterminate]),
57+
:host(:disabled[indeterminate]) {
58+
[part~='control'] {
59+
&::after {
60+
background: var-get($theme, 'disabled-indeterminate-color');
61+
}
62+
}
4863
}

src/components/checkbox/themes/shared/checkbox/checkbox.fluent.scss

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ $checked-hover-color: var-get($theme, 'fill-color-hover');
88
$invalid-color: var-get($theme, 'error-color');
99
$invalid-hover-color: var-get($theme, 'error-color-hover');
1010
$disabled-color: var-get($theme, 'disabled-color');
11+
$disabled-indeterminate-color: var-get($theme, 'disabled-indeterminate-color');
12+
$disabled-fill-color: var-get($theme, 'disabled-fill-color');
1113

1214
:host {
1315
::part(helper-text) {
@@ -223,7 +225,7 @@ $disabled-color: var-get($theme, 'disabled-color');
223225

224226
[part='control checked'] {
225227
&::after {
226-
background: $disabled-color;
228+
box-shadow: none;
227229
}
228230
}
229231
}
@@ -232,11 +234,11 @@ $disabled-color: var-get($theme, 'disabled-color');
232234
:host(:disabled[indeterminate]) {
233235
[part~='control'] {
234236
&::before {
235-
background: $disabled-color;
237+
background: $disabled-indeterminate-color;
236238
}
237239

238240
&::after {
239-
box-shadow: inset 0 0 0 rem(1px) $disabled-color;
241+
box-shadow: inset 0 0 0 rem(1px) $disabled-indeterminate-color;
240242
background: transparent;
241243
}
242244
}

src/components/checkbox/themes/shared/checkbox/checkbox.indigo.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ $error-color-hover: var-get($theme, 'error-color-hover');
207207
}
208208

209209
[part='control checked']::after {
210-
background: $disabled-indeterminate-color;
211210
border-color: transparent;
212211
}
213212

@@ -220,7 +219,6 @@ $error-color-hover: var-get($theme, 'error-color-hover');
220219
:host([disabled][indeterminate]),
221220
:host(:disabled[indeterminate]) {
222221
[part~='control']::after {
223-
background: $disabled-indeterminate-color;
224222
border-color: transparent;
225223
}
226224

src/components/checkbox/themes/shared/checkbox/checkbox.material.scss

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ $theme: $material;
226226

227227
[part='control checked'] {
228228
&::after {
229-
background: var-get($theme, 'disabled-color');
229+
border-color: transparent;
230230
}
231231
}
232232
}
@@ -235,8 +235,7 @@ $theme: $material;
235235
:host(:disabled[indeterminate]) {
236236
[part~='control'] {
237237
&::after {
238-
background: var-get($theme, 'disabled-indeterminate-color');
239-
border-color: var-get($theme, 'disabled-indeterminate-color');
238+
border-color: transparent;
240239
}
241240
}
242241
}

0 commit comments

Comments
 (0)