Skip to content

Commit 9bfd3d8

Browse files
authored
Merge branch '19.2.x' into sivanova/radio-label
2 parents cdb83c0 + fedcaff commit 9bfd3d8

File tree

5 files changed

+32
-22
lines changed

5 files changed

+32
-22
lines changed

package-lock.json

Lines changed: 4 additions & 4 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
@@ -74,7 +74,7 @@
7474
"@types/source-map": "0.5.2",
7575
"express": "^4.21.1",
7676
"fflate": "^0.8.1",
77-
"igniteui-theming": "^18.0.0",
77+
"igniteui-theming": "^18.0.1",
7878
"igniteui-trial-watermark": "^3.0.2",
7979
"lodash-es": "^4.17.21",
8080
"rxjs": "^7.8.2",

projects/igniteui-angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"tslib": "^2.3.0",
7474
"igniteui-trial-watermark": "^3.0.2",
7575
"lodash-es": "^4.17.21",
76-
"igniteui-theming": "^18.0.0",
76+
"igniteui-theming": "^18.0.1",
7777
"@igniteui/material-icons-extended": "^3.1.0"
7878
},
7979
"peerDependencies": {

projects/igniteui-angular/src/lib/core/styles/components/stepper/_stepper-theme.scss

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,14 @@
502502

503503
&:hover {
504504
background: var-get($theme, 'step-hover-background');
505-
color: var-get($theme, 'title-hover-color');
505+
506+
%igx-stepper__step-title {
507+
color: var-get($theme, 'title-hover-color');
508+
}
509+
510+
%igx-stepper__step-subtitle {
511+
color: var-get($theme, 'subtitle-hover-color');
512+
}
506513
}
507514

508515
@if $variant != material {

projects/igniteui-angular/src/lib/core/styles/components/tabs/_tabs-theme.scss

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@
187187
button-ripple-color: $button-ripple-color,
188188
border-color: $border-color,
189189
border-radius: $border-radius,
190+
border-color--hover: $border-color--hover,
190191
theme: map.get($schema, '_meta', 'theme'),
191192
_meta: map.merge(if($meta, $meta, ()), (
192193
variant: map.get($schema, '_meta', 'theme'),
@@ -253,6 +254,21 @@
253254
flex: 0 0 auto;
254255
background: var-get($theme, 'item-background');
255256
z-index: 1;
257+
258+
@if $bootstrap-theme {
259+
position: relative;
260+
261+
&::after {
262+
content: '';
263+
position: absolute;
264+
bottom: 0;
265+
inset-inline-start: 0;
266+
width: 100%;
267+
height: rem(1px);
268+
background: var-get($theme, 'border-color');
269+
z-index: 0;
270+
}
271+
}
256272
}
257273

258274
%tabs-header-content {
@@ -264,19 +280,6 @@
264280
%tabs-header-wrapper {
265281
position: relative;
266282
flex-grow: 1;
267-
268-
@if $bootstrap-theme {
269-
&::after {
270-
content: '';
271-
position: absolute;
272-
bottom: 0;
273-
inset-inline-start: 0;
274-
width: 100%;
275-
height: rem(1px);
276-
background: var-get($theme, 'border-color');
277-
z-index: 0;
278-
}
279-
}
280283
}
281284

282285
%tabs-header-scroll {
@@ -407,7 +410,7 @@
407410
&:focus {
408411
border-top: rem(1px) solid transparent;
409412
border-inline: none;
410-
border-bottom: rem(1px) solid var-get($theme, 'border-color');
413+
border-bottom: rem(1px) solid var-get($theme, 'border-color--hover');
411414
}
412415

413416
igx-icon {
@@ -509,7 +512,7 @@
509512

510513
@if $indigo-theme {
511514
&:hover,
512-
&:focus-visible {
515+
&:focus-within {
513516
background: var-get($theme, 'item-hover-background');
514517
}
515518
}

0 commit comments

Comments
 (0)