Skip to content

Commit b02c3d2

Browse files
desig9steinStefan Ivanovsimeonoff
authored
Update theme colors (#10900)
* feat(scrollbar): update dark bootstrap theme * feat(card): update dark bootstrap theme * feat(card): update light & dark bootstrap themes * feat(expansion-panel): update bootstrap theme * feat(action-strip): update bootstrap theme * feat(avatar): update bootstrap theme * feat(badge): update dark bootstrap theme * feat(banner): update bootstrap themes * feat(list): update bootstrap themes * feat(list): update indigo theme * feat(scrollbar): update indigo dark theme * feat(navdrawer): update dark bootstrap theme * feat(grid): update bootstrap dark theme * feat(input-group): update dark bootstrap theme. * feat(button-group): fix icons position inside buttongroup buttons * feat(grid): fix bootstrap themes * feat(tree): fix dark bootstrap theme * feat(grid): fix indigo themes * feat(grid): update indigo scrollbar theme * feat(input-group): fix fluent dark theme. feat(scrollbar): fix fluent dark theme. * feat(grid): fix fluent theme * Update fluent typography (#10775) * feat(fluent typography): update type scales and component typography * feat(fluent typography): update components typography * Update projects/igniteui-angular/src/lib/core/styles/typography/scale-presets/_fluent.scss Co-authored-by: Stefan Ivanov <[email protected]> * Update projects/igniteui-angular/src/lib/core/styles/typography/scale-presets/_fluent.scss Co-authored-by: Stefan Ivanov <[email protected]> * feat(fluent typography): update input label and list item * feat(fluent typography): fix overline scale * Update projects/igniteui-angular/src/lib/core/styles/typography/scale-presets/_fluent.scss Co-authored-by: Stefan Ivanov <[email protected]> * Update projects/igniteui-angular/src/lib/core/styles/typography/scale-presets/_fluent.scss Co-authored-by: Stefan Ivanov <[email protected]> * Update projects/igniteui-angular/src/lib/core/styles/typography/scale-presets/_fluent.scss Co-authored-by: Stefan Ivanov <[email protected]> Co-authored-by: Stefan Ivanov <[email protected]> Co-authored-by: Stefan Ivanov <[email protected]> Co-authored-by: Simeon Simeonoff <[email protected]>
1 parent 2b239df commit b02c3d2

35 files changed

+457
-96
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,7 @@
323323

324324
%igx-group-item-content {
325325
display: flex;
326+
align-items: center;
326327
flex-flow: row nowrap;
327328
min-width: 0;
328329

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,13 @@
151151
justify-content: space-between;
152152
grid-row: 1;
153153
font-size: $grid-toolbar-fs;
154-
border-bottom: 1px solid igx-color(map.get($theme, 'palette'), 'grays', 300);
154+
155+
@if $bootstrap-theme {
156+
border-bottom: 1px solid igx-color(map.get($theme, 'palette'), 'grays', 100);
157+
} @else {
158+
border-bottom: 1px solid igx-color(map.get($theme, 'palette'), 'grays', 300);
159+
}
160+
155161
background: var-get($theme, 'background-color');
156162
height: auto;
157163
min-height: map.get($grid-toolbar-height, 'comfortable');

projects/igniteui-angular/src/lib/core/styles/components/grid/_advanced-filtering-theme.scss

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
$left: if-ltr(left, right);
2929
$right: if-ltr(right, left);
3030

31+
$bootstrap-theme: $variant == 'bootstrap';
32+
3133
%advanced-filter {
3234
width: 660px;
3335
min-width: 660px;
@@ -42,9 +44,20 @@
4244
align-items: center;
4345
padding: $vertical-space-comfortable;
4446
color: igx-color($palette, 'grays', 700);
45-
background-color: igx-color($palette, 'grays', 200);
47+
48+
@if $bootstrap-theme {
49+
background-color: igx-color($palette, 'grays', 100, .5);
50+
} @else {
51+
background-color: igx-color($palette, 'grays', 100);
52+
}
53+
4654
user-select: none;
4755
cursor: grab;
56+
57+
h4,
58+
.igx-typography__h6 {
59+
margin-bottom: 0;
60+
}
4861
}
4962

5063
%advanced-filter__main {

projects/igniteui-angular/src/lib/core/styles/components/grid/_excel-filtering-theme.scss

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
$left: if-ltr(left, right);
2222
$right: if-ltr(right, left);
2323
$variant: map.get($theme, 'variant');
24+
$bootstrap-theme: $variant == 'bootstrap';
25+
2426

2527
%grid-excel-filter {
2628
display: block;
@@ -248,8 +250,13 @@
248250
overflow: hidden;
249251
margin: rem(8px) -#{rem(16px)} 0;
250252
border: 0;
251-
border-top: 1px dashed igx-color($palette, 'grays', 300);
252-
border-bottom: 1px dashed igx-color($palette, 'grays', 300);
253+
@if $bootstrap-theme {
254+
border-top: 1px dashed igx-color($palette, 'grays', 100);
255+
border-bottom: 1px dashed igx-color($palette, 'grays', 100);
256+
} @else {
257+
border-top: 1px dashed igx-color($palette, 'grays', 300);
258+
border-bottom: 1px dashed igx-color($palette, 'grays', 300);
259+
}
253260
}
254261
}
255262

@@ -376,7 +383,11 @@
376383
}
377384

378385
%grid-excel-menu__secondary-header {
379-
border-bottom: 1px solid igx-color($palette, 'grays', 300);
386+
@if $bootstrap-theme {
387+
border-bottom: 1px solid igx-color($palette, 'grays', 100);
388+
} @else {
389+
border-bottom: 1px solid igx-color($palette, 'grays', 300);
390+
}
380391
}
381392

382393
%grid-excel-menu__secondary-main {
@@ -385,7 +396,11 @@
385396
}
386397

387398
%grid-excel-menu__secondary-footer {
388-
border-top: 1px dashed igx-color($palette, 'grays', 300);
399+
@if $bootstrap-theme {
400+
border-top: 1px dashed igx-color($palette, 'grays', 100);
401+
} @else {
402+
border-top: 1px dashed igx-color($palette, 'grays', 300);
403+
}
389404

390405
%grid-excel-filter__apply,
391406
%grid-excel-filter__cancel {

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -974,20 +974,20 @@
974974

975975
%grid-thead-thumb {
976976
background: var-get($theme, 'header-background');
977-
border-#{$left}: 1px solid var-get($theme, 'header-border-color');
977+
border-#{$left}: rem(1px) solid var-get($theme, 'header-border-color');
978978
}
979979

980980
%grid-tfoot-thumb {
981981
position: absolute;
982982
top: 0;
983983
#{$right}: 0;
984984
background: var-get($theme, 'header-background');
985-
border-#{$left}: 1px solid igx-color($palette, 'grays', 300);
985+
border-#{$left}: rem(1px) solid var-get($theme, 'header-border-color');
986986
}
987987

988988
%grid-tbody-scrollbar {
989989
background: var-get($theme, 'content-background');
990-
border-#{$left}: 1px solid var-get($theme, 'row-border-color');
990+
border-#{$left}: rem(1px) solid var-get($theme, 'row-border-color');
991991
position: relative;
992992
}
993993

@@ -1859,7 +1859,11 @@
18591859
}
18601860

18611861
%grid-summaries-patch {
1862-
background: inherit;
1862+
@if $bootstrap-theme {
1863+
background: igx-color($palette, 'grays', 100);
1864+
} @else {
1865+
background: inherit;
1866+
}
18631867
position: relative;
18641868
z-index: 1;
18651869
border-#{$right}: 1px solid var-get($theme, 'header-border-color');
@@ -2722,6 +2726,7 @@
27222726
cursor: pointer;
27232727
z-index: 3;
27242728
color: var-get($theme, 'expand-icon-color');
2729+
background-clip: initial;
27252730

27262731
&:focus {
27272732
outline: none;

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -784,6 +784,8 @@
784784

785785
%fluent-label {
786786
padding: rem(5px) 0;
787+
font-size: rem(14px, 16px);
788+
font-weight: 600;
787789
line-height: normal !important;
788790
position: static;
789791
transform: translateY(0);
@@ -1245,6 +1247,7 @@
12451247
height: auto;
12461248
line-height: normal;
12471249
font-weight: 400;
1250+
border-radius: var-get($theme, 'border-border-radius') 0 0 var-get($theme, 'border-border-radius');
12481251

12491252
igx-icon {
12501253
width: rem(18px);
@@ -1278,6 +1281,7 @@
12781281
width: auto;
12791282
height: auto;
12801283
line-height: normal;
1284+
border-radius: 0 var-get($theme, 'border-border-radius') var-get($theme, 'border-border-radius') 0;
12811285

12821286
igx-icon {
12831287
width: rem(18px);

projects/igniteui-angular/src/lib/core/styles/themes/schemas/dark/_action-strip.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,17 @@ $dark-fluent-action-strip: extend(
2727

2828
/// Generates a dark bootstrap action strip schema.
2929
/// @type {Map}
30+
/// @prop {Map} actions-background [igx-color: ('grays', 100)] - The color used for actions background.
3031
/// @requires {function} extend
3132
/// @requires $dark-action-strip
3233
$dark-bootstrap-action-strip: extend(
3334
$dark-action-strip,
3435
(
35-
variant: 'bootstrap'
36+
variant: 'bootstrap',
37+
38+
actions-background: (
39+
igx-color: ('grays', 100),
40+
),
3641
)
3742
);
3843

projects/igniteui-angular/src/lib/core/styles/themes/schemas/dark/_avatar.scss

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@use '../../../base' as *;
12
@use '../light/avatar' as *;
23

34
////
@@ -20,9 +21,22 @@ $dark-fluent-avatar: $fluent-avatar;
2021

2122
/// Generates a dark bootstrap avatar schema.
2223
/// @type {Map}
24+
/// @prop {Map} background [igx-color: ('grays', 200)]- The background color of the avatar.
25+
/// @prop {Map} color [igx-contrast-color: ('grays', 200)] - The text/icon color of the avatar.
2326
/// @requires {function} extend
2427
/// @requires $bootstrap-avatar
25-
$dark-bootstrap-avatar: $bootstrap-avatar;
28+
$dark-bootstrap-avatar: extend(
29+
$bootstrap-avatar,
30+
(
31+
background: (
32+
igx-color: ('grays', 200)
33+
),
34+
35+
color: (
36+
igx-contrast-color: ('grays', 200)
37+
),
38+
)
39+
);
2640

2741
/// Generates a dark indigo avatar schema.
2842
/// @type {Map}

projects/igniteui-angular/src/lib/core/styles/themes/schemas/dark/_badge.scss

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@use '../../../base' as *;
12
@use '../light/badge' as *;
23

34
////
@@ -21,9 +22,17 @@ $dark-fluent-badge: $fluent-badge;
2122

2223
/// Generates a dark bootstrap badge schema.
2324
/// @type {Map}
25+
/// @prop {Map} border-color [igx-contrast-color: ('grays', 50)] - The border color used.
2426
/// @requires {function} extend
2527
/// @requires $bootstrap-badge
26-
$dark-bootstrap-badge: $bootstrap-badge;
28+
$dark-bootstrap-badge: extend(
29+
$bootstrap-badge,
30+
(
31+
border-color: (
32+
igx-contrast-color: ('grays', 50)
33+
),
34+
)
35+
);
2736

2837
/// Generates a dark indigo badge schema.
2938
/// @type {Map}

projects/igniteui-angular/src/lib/core/styles/themes/schemas/dark/_banner.scss

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,27 @@ $dark-fluent-banner: $fluent-banner;
2020

2121
/// Generates a dark bootstrap banner schema.
2222
/// @type {Map}
23+
/// @property {Map} banner-background [igx-color: ('surface')] - The background color used banner background.
24+
/// @property {Map} banner-message-color [igx-color: ('grays', 600)] - The color used for banner label.
25+
/// @property {Map} banner-illustration-color [igx-color: ('grays', 600)] - The color used banner illustration.
2326
/// @requires {function} extend
2427
/// @requires $bootstrap-banner
25-
$dark-bootstrap-banner: $bootstrap-banner;
28+
$dark-bootstrap-banner: extend(
29+
$bootstrap-banner,
30+
(
31+
banner-background: (
32+
igx-color: ('surface'),
33+
),
34+
35+
banner-message-color: (
36+
igx-color: ('grays', 600)
37+
),
38+
39+
banner-illustration-color: (
40+
igx-color: ('grays', 600)
41+
)
42+
)
43+
);
2644

2745
/// Generates a dark indigo banner schema.
2846
/// @type {Map}

0 commit comments

Comments
 (0)