Skip to content

fix(checkbox): use label-color-hover for all themes #16365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Oct 30, 2025
Merged

fix(checkbox): use label-color-hover for all themes #16365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fb264df
fix(checkbox): use label-color-hover for all themes
didimmova Oct 23, 2025
a13e309
Merge branch '20.1.x' into didimmova/fix-checkbox-label-hover
simeonoff Oct 23, 2025
4505581
Merge branch '20.1.x' into didimmova/fix-checkbox-label-hover
didimmova Oct 24, 2025
13b229a
fix(checkbox): fix checkbox theme to use properties properly
didimmova Oct 24, 2025
205eb11
fix(checkbox): address latest issues
didimmova Oct 24, 2025
64b35f9
fix(checkbox): add styles for label when positioned before
didimmova Oct 27, 2025
3c8fc1c
fix(checkbox): fix indigo indeterminate-disabled state
didimmova Oct 28, 2025
ccbb2b4
Merge branch '20.1.x' into didimmova/fix-checkbox-label-hover
didimmova Oct 28, 2025
3ce8576
fix(checkbox): fix indigo disabled indeterminate
didimmova Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 57 additions & 22 deletions projects/igniteui-angular/src/lib/core/styles/components/checkbox/_checkbox-component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,22 @@
@extend %cbx-display !optional;

&:hover {
@include e(label) {
@extend %cbx-label--hover !optional;
}

@include e(label, $m: before) {
@extend %cbx-label--hover !optional;
}

@include e(ripple) {
@extend %cbx-ripple--hover !optional;
}

@include e(composite) {
@extend %cbx-composite--hover !optional;
}

@include e(composite-mark) {
@extend %cbx-composite-mark--fluent !optional;
}
Expand Down Expand Up @@ -60,30 +72,10 @@
@extend %cbx-ripple !optional;
}

@include m(bootstrap) {
@include e(composite) {
&:hover {
@extend %cbx-composite--hover !optional;
}
}
}

@include m(indigo) {
@include e(composite) {
&:hover {
@extend %cbx-composite--hover !optional;
}
}

@include e(composite-mark) {
@extend %cbx-composite-mark-indigo !optional;
}

@include e(label) {
&:hover {
@extend %cbx-label--hover !optional;
}
}
}

@include m(invalid) {
Expand All @@ -99,6 +91,10 @@
@extend %cbx-label--invalid !optional;
}

@include e(label, $m: before) {
@extend %cbx-label--invalid !optional;
}

&:hover {
@include e(ripple) {
@extend %cbx-ripple--hover !optional;
Expand All @@ -112,6 +108,14 @@
@include e(composite-mark) {
@extend %cbx-composite-mark--invalid--fluent !optional;
}

@include e(label) {
@extend %cbx-label--invalid !optional;
}

@include e(label, $m: before) {
@extend %cbx-label--invalid !optional;
}
}

&:active {
Expand Down Expand Up @@ -183,6 +187,12 @@
@include e(ripple) {
@extend %cbx-ripple--focused-invalid !optional;
}

&:hover {
@include e(ripple) {
@extend %cbx-ripple--hover-invalid !optional;
}
}
}

@include mx(indigo, focused, invalid) {
Expand Down Expand Up @@ -239,19 +249,29 @@
@include e(composite) {
@extend %cbx-composite--x--hover !optional;
}

@include e(composite-mark) {
@extend %cbx-composite-mark--in--fluent !optional;
}
}
}

@include mx(material, disabled, indeterminate) {
@extend %igx-checkbox--disabled-indeterminate-material !optional;
@extend %igx-checkbox--disabled-indeterminate !optional;
}

@include mx(bootstrap, disabled, indeterminate) {
@extend %igx-checkbox--disabled-indeterminate !optional;
}

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

@include mx(indigo, disabled, indeterminate) {
@extend %igx-checkbox--disabled-indeterminate-indigo !optional;
@include e(composite) {
@extend %igx-checkbox--disabled-indeterminate-indigo !optional;
}
}

@include mx(indigo, focused, indeterminate) {
Expand Down Expand Up @@ -324,6 +344,21 @@
@extend %cbx-ripple--focused !optional;
@extend %cbx-ripple--focused-checked !optional;
}

&:hover {
@include e(ripple) {
@extend %cbx-ripple--focused !optional;
@extend %cbx-ripple--focused--hover-checked !optional;
}
}
}

@include mx(focused, invalid, checked) {
&:hover {
@include e(ripple) {
@extend %cbx-ripple--hover-invalid !optional;
}
}
}

@include mx(focused, indeterminate) {
Expand Down
27 changes: 21 additions & 6 deletions projects/igniteui-angular/src/lib/core/styles/components/checkbox/_checkbox-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,9 @@
}

%cbx-composite--hover {
border-color: var-get($theme, 'empty-color-hover');
@if $variant == 'bootstrap' or $variant == 'indigo' {
border-color: var-get($theme, 'empty-color-hover');
}
}

%cbx-composite--x {
Expand Down Expand Up @@ -175,6 +177,7 @@
%cbx-composite--x--disabled {
@if $variant == 'material' or $variant == 'fluent' {
background: var-get($theme, 'disabled-color');
border-color: var-get($theme, 'disabled-color');
}

@if $variant == 'indigo' or $variant == 'bootstrap' {
Expand Down Expand Up @@ -262,7 +265,7 @@
}

%igx-checkbox--disabled-indeterminate-indigo {
@extend %igx-checkbox--indeterminate-indigo;
@extend %cbx-composite--x--disabled;

%cbx-composite-mark {
rect {
Expand Down Expand Up @@ -291,6 +294,14 @@
z-index: 1;
}
}

&:hover {
%cbx-composite {
&::before {
background: var-get($theme, 'fill-color-hover');
}
}
}
}

%igx-checkbox--disabled-indeterminate-fluent {
Expand All @@ -299,15 +310,15 @@
}

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

&::before {
background: var-get($theme, 'disabled-color');
}
}
}

%igx-checkbox--disabled-indeterminate-material {
%igx-checkbox--disabled-indeterminate {
%cbx-composite--x--disabled {
border-color: var-get($theme, 'disabled-indeterminate-color');
background: var-get($theme, 'disabled-indeterminate-color');
Expand Down Expand Up @@ -458,11 +469,11 @@
}

%cbx-ripple--hover-checked {
background: var-get($theme, 'fill-color');
background: var-get($theme, 'fill-color-hover');
}

%cbx-ripple--hover-invalid {
background: var-get($theme, 'error-color');
background: var-get($theme, 'error-color-hover');
}

%igx-checkbox--focused-indigo {
Expand Down Expand Up @@ -544,6 +555,10 @@
background: var-get($theme, 'fill-color');
}

%cbx-ripple--focused--hover-checked {
background: var-get($theme, 'fill-color-hover');
}

%cbx-ripple--focused-invalid {
background: var-get($theme, 'error-color');
}
Expand Down
Loading