Skip to content

Commit 9338511

Browse files
authored
Merge branch 'master' into didimmova/fix-checkbox-label-hover-master
2 parents 03d9bc2 + 33f432e commit 9338511

File tree

2 files changed

+16
-21
lines changed

2 files changed

+16
-21
lines changed

projects/igniteui-angular/src/lib/core/styles/components/carousel/_carousel-theme.scss

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,6 @@
247247
background: var-get($theme, 'indicator-dot-color');
248248

249249
@if $variant != 'indigo' {
250-
@include animation('scale-out-center' .15s $ease-out-quad forwards);
251250
inset: rem(1px);
252251
} @else {
253252
width: rem(8px);
@@ -261,11 +260,11 @@
261260
&:hover {
262261
border-color: var-get($theme, 'indicator-active-border-color');
263262

264-
@if $variant == 'indigo' {
265-
&::after {
266-
background: var-get($theme, 'indicator-hover-dot-color');
267-
}
263+
&::after {
264+
background: var-get($theme, 'indicator-hover-dot-color');
265+
}
268266

267+
@if $variant == 'indigo' {
269268
&::before {
270269
position: absolute;
271270
content: '';
@@ -290,7 +289,7 @@
290289
content: '';
291290
width: inherit;
292291
height: inherit;
293-
border: rem(2px) solid var-get($theme, 'indicator-active-dot-color');
292+
border: rem(2px) solid var-get($theme, 'indicator-active-border-color');
294293
inset-inline-start: 0;
295294
top: 0;
296295
border-radius: border-radius(50%);
@@ -304,12 +303,14 @@
304303
}
305304
}
306305

307-
@if $variant == 'indigo' {
308-
&:hover {
309-
&::after {
310-
background: var-get($theme, 'indicator-active-hover-dot-color');
311-
}
306+
&:hover {
307+
border-color: var-get($theme, 'indicator-active-hover-dot-color');
312308

309+
&::after {
310+
background: var-get($theme, 'indicator-active-hover-dot-color');
311+
}
312+
313+
@if $variant == 'indigo' {
313314
&::before {
314315
border-color: var-get($theme, 'indicator-active-hover-dot-color');
315316
}

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* stylelint-disable max-nesting-depth */
12
@use 'sass:map';
23
@use 'sass:math';
34
@use '../../base' as *;
@@ -49,13 +50,6 @@
4950
'indigo': rem(8px),
5051
), $variant);
5152

52-
$mark-stroke: map.get((
53-
'material': 3,
54-
'fluent': 1,
55-
'bootstrap': 3,
56-
'indigo': 3,
57-
), $variant);
58-
5953
$mark-offset: map.get((
6054
'material': 0,
6155
'fluent': -1px,
@@ -64,7 +58,7 @@
6458
), $variant);
6559

6660
$mark-length: 24;
67-
$mark-x-factor: math.div($mark-stroke, $mark-length);
61+
$mark-x-factor: calc(#{var-get($theme, 'tick-width')} / $mark-length);
6862

6963
$ripple-size: rem(40px);
7064
$ripple-radius: math.div($ripple-size, 2);
@@ -205,7 +199,7 @@
205199
inset: 0;
206200
stroke: var-get($theme, 'tick-color');
207201
stroke-linecap: square;
208-
stroke-width: $mark-stroke;
202+
stroke-width: var-get($theme, 'tick-width');
209203
stroke-dasharray: $mark-length;
210204
stroke-dashoffset: $mark-length;
211205
fill: none;
@@ -366,7 +360,7 @@
366360
%cbx-composite-mark--in {
367361
stroke-dashoffset: 41; /* length of path - adjacent line length */
368362
opacity: 1;
369-
transform: rotate(45deg) translateX(-#{$mark-x-factor}em);
363+
transform: rotate(45deg) translateX(calc(#{$mark-x-factor} * -1em));
370364
}
371365

372366
%cbx-composite-mark--fluent {

0 commit comments

Comments
 (0)