Skip to content

Commit 20eaf6c

Browse files
authored
Merge branch 'master' into copilot/enhance-igx-badge-component
2 parents 03db320 + c849012 commit 20eaf6c

File tree

11 files changed

+144
-98
lines changed

11 files changed

+144
-98
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 {

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

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
'material': pad-inline(rem(4px), rem(8px), rem(16px)),
1414
'fluent': pad-inline(rem(2px), rem(4px), rem(8px)),
1515
'bootstrap': pad-inline(rem(4px), rem(8px), rem(16px)),
16-
'indigo': pad-inline(rem(12px))
16+
'indigo': pad-inline(rem(8px), rem(12px), rem(12px))
1717
), $variant);
1818

1919
$search-input-block-padding: map.get((
@@ -73,6 +73,16 @@
7373
igx-input-group {
7474
--theme: #{if($variant == 'indigo', 'indigo', 'material')};
7575
--ig-size: #{if($variant == 'indigo', 2, 1)};
76+
77+
@if $variant == 'bootstrap' or $variant == 'indigo' {
78+
input {
79+
height: rem(28px);
80+
}
81+
} @else if $variant == 'fluent' {
82+
input {
83+
height: rem(32px);
84+
}
85+
}
7686
}
7787
}
7888

@@ -151,6 +161,18 @@
151161
%igx-combo__search {
152162
--igx-input-group-input-suffix-background: transparent;
153163
--igx-input-group-input-suffix-background--focused: transparent;
164+
165+
.igx-input-group__bundle::after {
166+
border-block-end-color: var(--border-color);
167+
}
168+
169+
.igx-input-group__bundle:hover::after {
170+
border-block-end-color: #{if($variant == 'fluent', var(--hover-border-color), var(--border-color))};;
171+
}
172+
173+
.igx-input-group--focused .igx-input-group__bundle::after {
174+
border-block-end-color: var(--focused-bottom-line-color);
175+
}
154176
}
155177
}
156178

projects/igniteui-angular/src/lib/core/styles/components/date-range-picker/_date-range-picker-theme.scss

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@
2323
}
2424
}
2525

26+
igx-date-range-start,
27+
igx-date-range-end {
28+
min-width: 0;
29+
}
30+
2631
igx-date-range-start,
2732
igx-date-range-end,
2833
%igx-date-range-picker__start,
@@ -57,18 +62,18 @@
5762
}
5863

5964
/// Adds typography styles for the igx-date-range-picker component.
60-
/// Uses the 'subtitle-1'
65+
/// Uses the 'caption'
6166
/// categories from the typographic scale.
6267
/// @group typography
63-
/// @param {Map} $categories [(label: 'subtitle-1')] - The categories from the typographic scale used for type styles.
68+
/// @param {Map} $categories [(label: 'caption')] - The categories from the typographic scale used for type styles.
6469
@mixin date-range-typography(
6570
$categories: (
66-
label: 'subtitle-1',
71+
label: 'caption',
6772
)
6873
) {
6974
$label: map.get($categories, 'label');
7075

71-
%igx-date-range__label {
76+
%igx-date-range-picker__label {
7277
@include type-style($label);
7378
}
7479
}

0 commit comments

Comments
 (0)