Skip to content

Commit 1ff6dfa

Browse files
desig9steinLipatasimeonoff
authored
fix(select, combo): update focus styles for toggle and clear buttons (#16153)
Co-authored-by: Nikolay Alipiev <[email protected]> Co-authored-by: Simeon Simeonoff <[email protected]>
1 parent 0bf4fe5 commit 1ff6dfa

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

projects/igniteui-angular/src/lib/core/styles/components/combo/_combo-theme.scss

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -182,19 +182,11 @@
182182
%igx-combo__toggle-button {
183183
color: var-get($theme, 'toggle-button-foreground-focus');
184184
background: var-get($theme, 'toggle-button-background-focus');
185-
186-
&:focus {
187-
color: color($color: 'secondary');
188-
}
189185
}
190186

191187
%igx-combo__clear-button {
192188
color: var-get($theme, 'clear-button-foreground-focus');
193189
background: var-get($theme, 'clear-button-background-focus');
194-
195-
&:focus {
196-
color: color($color: 'secondary');
197-
}
198190
}
199191
}
200192

@@ -225,13 +217,29 @@
225217
}
226218

227219
.igx-input-group.igx-input-group--focused:not(.igx-input-group--box) {
228-
@if $variant != 'fluent' {
220+
@if $variant == 'material' {
229221
%igx-combo__toggle-button {
230222
background: var-get($theme, 'toggle-button-background-focus--border');
231223
}
232224
}
233225
}
234226

227+
%form-group-bundle:not(%form-group-bundle--disabled) {
228+
%igx-combo__clear-button:focus-visible,
229+
%igx-combo__toggle-button:focus-visible {
230+
color: color($color: 'secondary');
231+
background: var-get($theme, 'toggle-button-background');
232+
}
233+
}
234+
235+
//.igx-input-group:not(.igx-input-group--box) {
236+
// %igx-combo__toggle-button:focus {
237+
// @if $variant == 'material' {
238+
// background: var-get($theme, 'toggle-button-background-focus--border');
239+
// }
240+
// }
241+
//}
242+
235243
.igx-input-group--disabled {
236244
%igx-combo__toggle-button {
237245
background: var-get($theme, 'toggle-button-background-disabled') !important;

projects/igniteui-angular/src/lib/core/styles/components/select/_select-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
}
4747

4848
.igx-input-group.igx-input-group--focused:not(.igx-input-group--box) {
49-
@if $variant != 'fluent' and $variant != 'material' {
49+
@if $variant == 'material' {
5050
%igx-select__toggle-button {
5151
background: var-get($theme, 'toggle-button-background-focus--border');
5252
}

0 commit comments

Comments
 (0)