Skip to content

Commit 8dfca19

Browse files
Merge branch 'master' into ipetrov/prevent-agents-changing-dependencies
2 parents af27883 + e8c2259 commit 8dfca19

3 files changed

Lines changed: 37 additions & 21 deletions

File tree

package-lock.json

Lines changed: 29 additions & 8 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
@@ -82,7 +82,7 @@
8282
"express": "^5.2.1",
8383
"fflate": "^0.8.1",
8484
"igniteui-i18n-core": "^1.0.2",
85-
"igniteui-theming": "^25.0.0",
85+
"igniteui-theming": "^25.0.3",
8686
"igniteui-trial-watermark": "^3.1.0",
8787
"jspdf": "^4.2.1",
8888
"lodash-es": "^4.17.21",

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

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -175,15 +175,8 @@
175175
}
176176

177177
%cbx-composite--x--disabled {
178-
@if $variant == 'material' or $variant == 'fluent' {
179-
background: var-get($theme, 'disabled-color');
180-
border-color: var-get($theme, 'disabled-color');
181-
}
182-
183-
@if $variant == 'indigo' or $variant == 'bootstrap' {
184-
background: var-get($theme, 'disabled-indeterminate-color');
185-
border-color: transparent;
186-
}
178+
background: var-get($theme, 'disabled-fill-color');
179+
border-color: transparent;
187180

188181
@if $variant != 'indigo' {
189182
%cbx-composite-mark {
@@ -267,6 +260,8 @@
267260
%igx-checkbox--disabled-indeterminate-indigo {
268261
@extend %cbx-composite--x--disabled;
269262

263+
background: var-get($theme, 'disabled-indeterminate-color');
264+
270265
%cbx-composite-mark {
271266
rect {
272267
fill: var-get($theme, 'disabled-tick-color');
@@ -310,17 +305,17 @@
310305
}
311306

312307
%cbx-composite--x--disabled {
313-
border-color: var-get($theme, 'disabled-color');
308+
border-color: var-get($theme, 'disabled-indeterminate-color');
314309

315310
&::before {
316-
background: var-get($theme, 'disabled-color');
311+
background: var-get($theme, 'disabled-indeterminate-color');
317312
}
318313
}
319314
}
320315

321316
%igx-checkbox--disabled-indeterminate {
322317
%cbx-composite--x--disabled {
323-
border-color: var-get($theme, 'disabled-indeterminate-color');
318+
border-color: transparent;
324319
background: var-get($theme, 'disabled-indeterminate-color');
325320
}
326321
}

0 commit comments

Comments
 (0)