Skip to content

Commit 47f2185

Browse files
kdinevkdinev
authored
Merge branch 'master' into chore-update-roadmap-22-nov
2 parents e3b1596 + 63df8c1 commit 47f2185

33 files changed

+247
-113
lines changed

‎projects/igniteui-angular/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
}
9494
},
9595
"igxDevDependencies": {
96-
"@igniteui/angular-schematics": "~19.0.1430-rc.0"
96+
"@igniteui/angular-schematics": "~19.0.1430"
9797
},
9898
"ng-update": {
9999
"migrations": "./migrations/migration-collection.json",

‎projects/igniteui-angular/src/lib/core/styles/components/dock-manager/_dock-manager-theme.scss‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@use 'sass:map';
2+
@use 'sass:meta';
23
@use '../../base' as *;
34
@use '../../themes/schemas' as *;
45

@@ -65,7 +66,7 @@
6566

6667
$theme: digest-schema($dock-manager-schema);
6768

68-
@return extend($theme, (name: $name, prefix: 'igc'), keywords($rest));
69+
@return extend($theme, (name: $name, prefix: 'igc'), meta.keywords($rest));
6970
}
7071

7172
/// @deprecated Use the `css-vars` mixin instead.

‎projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1434,15 +1434,15 @@
14341434
}
14351435

14361436
&%igx-grid__tr--ghost {
1437+
background: var-get($theme, 'row-ghost-background');
1438+
color: var-get($theme, 'row-drag-color');
1439+
z-index: 10002;
1440+
14371441
@include css-vars((
14381442
name: 'igx-grid-row',
14391443
row-ghost-background: map.get($theme, 'row-ghost-background'),
14401444
row-drag-color: map.get($theme, 'row-drago-color')
14411445
));
1442-
1443-
background: var-get($theme, 'row-ghost-background');
1444-
color: var-get($theme, 'row-drag-color');
1445-
z-index: 10002;
14461446
}
14471447
}
14481448

@@ -2797,9 +2797,9 @@
27972797
compact: calc(#{$i * map.get($grid-grouping-indicator-padding, 'compact')} + #{$indicator-icon-width})
27982798
);
27992799

2800-
$level--comfortable: map-get($row-indentation-level, 'comfortable');
2801-
$level--cosy: map-get($row-indentation-level, 'cosy');
2802-
$level--compact: map-get($row-indentation-level, 'compact');
2800+
$level--comfortable: map.get($row-indentation-level, 'comfortable');
2801+
$level--cosy: map.get($row-indentation-level, 'cosy');
2802+
$level--compact: map.get($row-indentation-level, 'compact');
28032803

28042804
%igx-grid__row-indentation--level-#{$i} {
28052805
--indicator-inline-inset: #{sizable(

‎projects/igniteui-angular/src/lib/core/styles/components/input/_input-group-theme.scss‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1884,15 +1884,14 @@
18841884
%form-group-bundle-start--bootstrap,
18851885
%form-group-bundle-end--bootstrap {
18861886
flex: none;
1887-
1888-
&:empty {
1889-
display: none;
1890-
}
1891-
18921887
border-width: rem(1px);
18931888
border-style: solid;
18941889
border-color: var-get($theme, 'border-color');
18951890
overflow: hidden;
1891+
1892+
&:empty {
1893+
display: none;
1894+
}
18961895
}
18971896

18981897
%form-group-bundle-start--bootstrap {

‎projects/igniteui-angular/src/lib/core/styles/components/list/_list-theme.scss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,10 @@
520520
}
521521

522522
%igx-list-item-content--active {
523+
color: var-get($theme, 'item-text-color-active');
524+
background: var-get($theme, 'item-background-active');
525+
z-index: 3;
526+
523527
%igx-list__item-line-title {
524528
color: var-get($theme, 'item-title-color-active')
525529
}
@@ -544,10 +548,6 @@
544548
color: var-get($theme, 'item-thumbnail-color-active')
545549
}
546550
}
547-
548-
color: var-get($theme, 'item-text-color-active');
549-
background: var-get($theme, 'item-background-active');
550-
z-index: 3;
551551
}
552552

553553
%igx-list-item-content--inactive {

‎projects/igniteui-angular/src/lib/core/styles/components/rating/_rating-theme.scss‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@use 'sass:map';
2+
@use 'sass:meta';
23
@use '../../base' as *;
34
@use '../../themes/schemas' as *;
45

@@ -40,7 +41,7 @@
4041

4142
$theme: digest-schema($rating-schema);
4243

43-
@return extend($theme, (name: $name), keywords($rest));
44+
@return extend($theme, (name: $name), meta.keywords($rest));
4445
}
4546

4647
/// @deprecated Use the `css-vars` mixin instead.

‎projects/igniteui-angular/src/lib/core/styles/components/scrollbar/scrollbar-theme.scss‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@use 'sass:map';
2+
@use 'sass:meta';
23
@use '../../base' as *;
34
@use '../../themes/schemas' as *;
45

@@ -99,7 +100,7 @@
99100
}
100101

101102
::-webkit-scrollbar {
102-
@if type-of(map.get($theme, 'sb-size') == 'string') {
103+
@if meta.type-of(map.get($theme, 'sb-size') == 'string') {
103104
width: var-get($theme, 'sb-size');
104105
height: var-get($theme, 'sb-size');
105106
}

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

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -360,13 +360,6 @@
360360
}
361361

362362
%tabs-header-item {
363-
> * {
364-
margin-inline-start: rem(if($variant != 'indigo', 12px, 8px));
365-
366-
&:first-child {
367-
margin-inline-start: 0;
368-
}
369-
}
370363
display: inline-flex;
371364
justify-content: center;
372365
align-items: center;
@@ -390,32 +383,6 @@
390383
color: var-get($theme, 'item-icon-color');
391384
}
392385

393-
&::-moz-focus-inner {
394-
border: 0;
395-
}
396-
397-
&:focus {
398-
background: var-get($theme, 'item-active-background');
399-
color: var-get($theme, 'item-hover-color');
400-
border-bottom-color: transparent;
401-
}
402-
403-
&:hover {
404-
background: var-get($theme, 'item-hover-background');
405-
color: var-get($theme, 'item-hover-color');
406-
407-
@if $bootstrap-theme {
408-
box-shadow: inset 0 0 0 rem(1px) var-get($theme, 'border-color--hover');
409-
}
410-
}
411-
412-
&:hover,
413-
&:focus {
414-
igx-icon {
415-
color: var-get($theme, 'item-hover-icon-color');
416-
}
417-
}
418-
419386
@if $bootstrap-theme {
420387
padding-block: rem(12px);
421388
border-start-start-radius: var-get($theme, 'border-radius');
@@ -448,6 +415,40 @@
448415
}
449416
}
450417

418+
> * {
419+
margin-inline-start: rem(if($variant != 'indigo', 12px, 8px));
420+
421+
&:first-child {
422+
margin-inline-start: 0;
423+
}
424+
}
425+
426+
&::-moz-focus-inner {
427+
border: 0;
428+
}
429+
430+
&:focus {
431+
background: var-get($theme, 'item-active-background');
432+
color: var-get($theme, 'item-hover-color');
433+
border-bottom-color: transparent;
434+
}
435+
436+
&:hover {
437+
background: var-get($theme, 'item-hover-background');
438+
color: var-get($theme, 'item-hover-color');
439+
440+
@if $bootstrap-theme {
441+
box-shadow: inset 0 0 0 rem(1px) var-get($theme, 'border-color--hover');
442+
}
443+
}
444+
445+
&:hover,
446+
&:focus {
447+
igx-icon {
448+
color: var-get($theme, 'item-hover-icon-color');
449+
}
450+
}
451+
451452
@include ripple($tabs-ripple-theme);
452453
@include css-vars($tabs-ripple-theme);
453454
}

‎projects/igniteui-angular/src/lib/core/styles/themes/generators/_base.scss‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
@use '../../base' as *;
77
@use '../../components' as *;
88
@use 'igniteui-theming/sass/color' as *;
9+
@use 'igniteui-theming/sass/color/presets' as *;
910
@use 'igniteui-theming/sass/elevations' as *;
1011
@use 'igniteui-theming/sass/elevations/presets' as elevations;
1112
@use 'igniteui-theming/sass/utils' as *;
@@ -683,7 +684,7 @@
683684
);
684685

685686
@include theme(
686-
$palette: $light-palette,
687+
$palette: $light-material-palette,
687688
$schema: $light-material-schema,
688689
$exclude: $exclude,
689690
$roundness: $roundness,
@@ -716,7 +717,7 @@
716717
);
717718

718719
@include theme(
719-
$palette: $dark-palette,
720+
$palette: $dark-material-palette,
720721
$schema: $dark-material-schema,
721722
$exclude: $exclude,
722723
$roundness: $roundness,

‎projects/igniteui-angular/src/lib/core/styles/themes/generators/_bootstrap.scss‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@use 'base' as *;
22
@use '../schemas' as *;
33
@use 'igniteui-theming/sass/color' as *;
4+
@use 'igniteui-theming/sass/color/presets' as *;
45

56
////
67
/// @group themes
@@ -20,7 +21,8 @@
2021
) {
2122
$primary: color($palette, 'primary');
2223
$secondary: color($palette, 'secondary');
23-
$surface: color($palette, 'surface');
24+
$gray: color($light-bootstrap-palette, 'gray');
25+
$surface: color($light-bootstrap-palette, 'surface');
2426
$info: color($palette, 'info');
2527
$success: color($palette, 'success');
2628
$warn: color($palette, 'warn');
@@ -30,8 +32,8 @@
3032
$palette: palette(
3133
$primary,
3234
$secondary,
33-
$surface: if($surface != #f8f9fa, $surface, #f8f9fa),
34-
$gray: #212529,
35+
$surface: $surface,
36+
$gray: $gray,
3537
$info: $info,
3638
$success: $success,
3739
$warn: $warn,
@@ -56,7 +58,8 @@
5658
) {
5759
$primary: color($palette, 'primary');
5860
$secondary: color($palette, 'secondary');
59-
$surface: color($palette, 'surface');
61+
$gray: color($dark-bootstrap-palette, 'gray');
62+
$surface: color($dark-bootstrap-palette, 'surface');
6063
$info: color($palette, 'info');
6164
$success: color($palette, 'success');
6265
$warn: color($palette, 'warn');
@@ -66,8 +69,8 @@
6669
$palette: palette(
6770
$primary,
6871
$secondary,
69-
$surface: if($surface != white, $surface, #222),
70-
$gray: #fff,
72+
$surface: $surface,
73+
$gray: $gray,
7174
$info: $info,
7275
$success: $success,
7376
$warn: $warn,

0 commit comments

Comments
 (0)