Skip to content

Commit fcc8156

Browse files
committed
feat(button-group): update active states and z-indexes
1 parent cf95dc0 commit fcc8156

1 file changed

Lines changed: 31 additions & 24 deletions

File tree

projects/igniteui-angular/core/src/core/styles/components/button-group/_button-group-theme.scss

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -85,26 +85,25 @@
8585
}
8686
}
8787

88-
&:hover {
89-
z-index: 1;
88+
&:hover,
89+
&:active {
9090
color: var-get($theme, 'item-hover-text-color');
91-
background: var-get($theme, 'item-hover-background');
92-
border-color: var-get($theme, 'item-hover-border-color');
9391

9492
igx-icon {
9593
color: var-get($theme, 'item-hover-icon-color');
9694
}
9795
}
9896

97+
&:hover {
98+
z-index: 1;
99+
background: var-get($theme, 'item-hover-background');
100+
border-color: var-get($theme, 'item-hover-border-color');
101+
}
102+
99103
&:active {
100104
z-index: 2;
101-
color: var-get($theme, 'item-hover-text-color');
102105
background: var-get($theme, 'item-active-background');
103106
border-color: var-get($theme, 'item-active-border-color');
104-
105-
igx-icon {
106-
color: var-get($theme, 'item-hover-icon-color');
107-
}
108107
}
109108

110109
@if $variant == 'fluent' {
@@ -162,9 +161,8 @@
162161
box-shadow: 0 0 0 rem(3px) var-get($theme, 'idle-shadow-color');
163162
}
164163

165-
&:hover {
166-
background: var-get($theme, 'item-focused-hover-background');
167-
border-color: var-get($theme, 'item-focused-hover-border-color');
164+
&:hover,
165+
&:active {
168166
color: var-get($theme, 'item-focused-hover-text-color');
169167

170168
igx-icon {
@@ -178,6 +176,11 @@
178176
}
179177
}
180178

179+
&:hover {
180+
background: var-get($theme, 'item-focused-hover-background');
181+
border-color: var-get($theme, 'item-focused-hover-border-color');
182+
}
183+
181184
&:active {
182185
background: var-get($theme, 'item-active-background');
183186
border-color: var-get($theme, 'item-active-border-color');
@@ -207,6 +210,7 @@
207210
}
208211

209212
%igx-group-item-selected {
213+
z-index: 2;
210214
color: var-get($theme, 'item-selected-text-color');
211215
background: var-get($theme, 'item-selected-background');
212216
border-color: var-get($theme, 'item-selected-border-color');
@@ -220,24 +224,23 @@
220224
color: var-get($theme, 'item-selected-icon-color');
221225
}
222226

223-
&:hover {
224-
border-color: var-get($theme, 'item-selected-hover-border-color');
227+
&:hover,
228+
&:active {
225229
color: var-get($theme, 'item-selected-hover-text-color');
226-
background: var-get($theme, 'item-selected-hover-background');
227230

228231
igx-icon {
229232
color: var-get($theme, 'item-selected-hover-icon-color');
230233
}
231234
}
232235

236+
&:hover {
237+
border-color: var-get($theme, 'item-selected-hover-border-color');
238+
background: var-get($theme, 'item-selected-hover-background');
239+
}
240+
233241
&:active {
234242
border-color: var-get($theme, 'item-selected-active-border-color');
235-
color: var-get($theme, 'item-selected-hover-text-color');
236243
background: var-get($theme, 'item-selected-active-background');
237-
238-
igx-icon {
239-
color: var-get($theme, 'item-selected-hover-icon-color');
240-
}
241244
}
242245

243246
&[igxButton].igx-button--focused {
@@ -266,10 +269,9 @@
266269
box-shadow: 0 0 0 rem(4px) var-get($theme, 'selected-shadow-color');
267270
}
268271

269-
&:hover {
270-
background: var-get($theme, 'item-selected-focus-hover-background');
272+
&:hover,
273+
&:active {
271274
color: var-get($theme, 'item-selected-hover-text-color');
272-
border-color: var-get($theme, 'item-selected-border-color');
273275

274276
igx-icon {
275277
color: var-get($theme, 'item-selected-hover-icon-color');
@@ -280,9 +282,14 @@
280282
}
281283
}
282284

285+
&:hover {
286+
background: var-get($theme, 'item-selected-focus-hover-background');
287+
border-color: var-get($theme, 'item-selected-border-color');
288+
}
289+
283290
&:active {
284-
background: var-get($theme, 'item-selected-active-background');
285291
border-color: var-get($theme, 'item-selected-active-border-color');
292+
background: var-get($theme, 'item-selected-active-background');
286293
}
287294
}
288295

0 commit comments

Comments
 (0)