Skip to content

Commit 2709d52

Browse files
authored
Merge branch 'master' into fix-#5983-master
2 parents f1cc4fd + c74ed95 commit 2709d52

38 files changed

+339
-56
lines changed

projects/igniteui-angular/src/lib/core/styles/components/avatar/_avatar-theme.scss

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,13 @@
3434
$image-background: null
3535
) {
3636
$name: 'igx-avatar';
37-
$theme: apply-palette(map-get($schema, $name), $palette);
37+
$theme: ();
38+
39+
@if map-has-key($schema, $name) {
40+
$theme: apply-palette(map-get($schema, $name), $palette);
41+
} @else {
42+
$theme: apply-palette($schema, $palette);
43+
}
3844

3945
@if not($icon-color) and $icon-background {
4046
$icon-color: text-contrast($icon-background);

projects/igniteui-angular/src/lib/core/styles/components/badge/_badge-theme.scss

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,16 @@
5454
$disable-border: true
5555
) {
5656
$name: 'igx-badge';
57-
$badge-schema: map-get($schema, $name);
58-
$border-width: if($disable-border == true, 0, rem(1px));
59-
$theme: apply-palette($badge-schema, $palette);
57+
$badge-schema: ();
58+
59+
@if map-has-key($schema, $name) {
60+
$badge-schema: map-get($schema, $name);
61+
} @else {
62+
$badge-schema: $schema;
63+
}
6064

65+
$theme: apply-palette($badge-schema, $palette);
66+
$border-width: if($disable-border == true, 0, rem(1px));
6167
$border-radius: round-borders(
6268
if($border-radius, $border-radius, map-get($badge-schema, 'border-radius')), 0, 11px
6369
);

projects/igniteui-angular/src/lib/core/styles/components/banner/_banner-theme.scss

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,15 @@
3434
$banner-illustration-color: null
3535
) {
3636
$name: 'igx-banner';
37-
$theme: apply-palette(map-get($schema, $name), $palette);
37+
$banner-schema: ();
38+
39+
@if map-has-key($schema, $name) {
40+
$banner-schema: map-get($schema, $name);
41+
} @else {
42+
$banner-schema: $schema;
43+
}
44+
45+
$theme: apply-palette($banner-schema, $palette);
3846

3947
@if not($banner-message-color) and $banner-background {
4048
$banner-message-color: text-contrast($banner-background);

projects/igniteui-angular/src/lib/core/styles/components/bottom-nav/_bottom-nav-theme.scss

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,13 @@
3838
$shadow: null
3939
) {
4040
$name: 'igx-bottom-nav';
41-
$bottom-nav-schema: map-get($schema, $name);
41+
$bottom-nav-schema: ();
42+
43+
@if map-has-key($schema, $name) {
44+
$bottom-nav-schema: map-get($schema, $name);
45+
} @else {
46+
$bottom-nav-schema: $schema;
47+
}
4248

4349
$theme: apply-palette($bottom-nav-schema, $palette);
4450

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,14 @@
7070
$item-selected-hover-background: null
7171
) {
7272
$name: 'igx-button-group';
73-
$button-group-schema: map-get($schema, $name);
73+
$button-group-schema: ();
74+
75+
@if map-has-key($schema, $name) {
76+
$button-group-schema: map-get($schema, $name);
77+
} @else {
78+
$button-group-schema: $schema;
79+
}
80+
7481
$theme: apply-palette($button-group-schema, $palette);
7582

7683
$border: 1px solid map-get($theme, 'item-selected-border-color');

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

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,14 @@
158158
$disabled-background: null
159159
) {
160160
$name: 'igx-button';
161-
$button-schema: map-get($schema, $name);
161+
$button-schema: ();
162+
163+
@if map-has-key($schema, $name) {
164+
$button-schema: map-get($schema, $name);
165+
} @else {
166+
$button-schema: $schema;
167+
}
168+
162169
$theme: apply-palette($button-schema, $palette);
163170

164171
$flat-border-radius: round-borders(
@@ -409,35 +416,35 @@
409416
cosy: rem(6px, 16px) rem(16px, 16px),
410417
compact: rem(3px, 16px) rem(16px, 16px)
411418
);
412-
419+
413420
$button-padding-fluent: (
414421
comfortable: 0 rem(16px, 16px),
415422
cosy: 0 rem(16px, 16px),
416423
compact: 0 rem(16px, 16px)
417424
);
418-
425+
419426
$button-padding: map-get((
420427
material: $button-padding-material,
421428
fluent: $button-padding-fluent
422429
), map-get($theme, variant));
423-
430+
424431
$button--size-material: (
425432
comfortable: rem(36px),
426433
cosy: rem(30px),
427434
compact: rem(24px)
428435
);
429-
436+
430437
$button--size-fluent: (
431438
comfortable: rem(32px),
432439
cosy: rem(28px),
433440
compact: rem(24px)
434441
);
435-
442+
436443
$button-size: map-get((
437444
material: $button--size-material,
438445
fluent: $button--size-fluent
439446
), map-get($theme, variant));
440-
447+
441448

442449
$button-floating-padding: (
443450
comfortable: rem(15px),
@@ -564,13 +571,13 @@
564571
color: --var($theme, 'raised-hover-text-color');
565572
background: --var($theme, 'raised-hover-background');
566573
box-shadow: --var($theme, 'raised-hover-shadow');
567-
568-
574+
575+
569576
%igx-icon-display {
570577
color: --var($theme, 'raised-hover-icon-color')
571578
}
572579
}
573-
580+
574581
&:active {
575582
color: --var($theme, 'raised-focus-text-color');
576583
background: --var($theme, 'raised-focus-background');

projects/igniteui-angular/src/lib/core/styles/components/calendar/_calendar-theme.scss

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,14 @@
112112
$date-disabled-background: null,
113113
) {
114114
$name: 'igx-calendar';
115-
$calendar-schema: map-get($schema, $name);
115+
$calendar-schema: ();
116+
117+
@if map-has-key($schema, $name) {
118+
$calendar-schema: map-get($schema, $name);
119+
} @else {
120+
$calendar-schema: $schema;
121+
}
122+
116123
$theme: apply-palette($calendar-schema, $palette);
117124

118125
$border-radius: round-borders(

projects/igniteui-angular/src/lib/core/styles/components/card/_card-theme.scss

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,14 @@
5454
$card-border-color: null
5555
) {
5656
$name: 'igx-card';
57-
$card-schema: map-get($schema, $name);
57+
$card-schema: ();
58+
59+
@if map-has-key($schema, $name) {
60+
$card-schema: map-get($schema, $name);
61+
} @else {
62+
$card-schema: $schema;
63+
}
64+
5865
$theme: apply-palette($card-schema, $palette);
5966

6067
$border-radius: round-borders(

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,14 @@
5252
$indicator-active-border-color: null,
5353
){
5454
$name: 'igx-carousel';
55-
$carousel-schema: map-get($schema, $name);
55+
$carousel-schema: ();
56+
57+
@if map-has-key($schema, $name) {
58+
$carousel-schema: map-get($schema, $name);
59+
} @else {
60+
$carousel-schema: $schema;
61+
}
62+
5663
$theme: apply-palette($carousel-schema, $palette);
5764

5865
$border-radius: round-borders(

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,14 @@
4343
$border-radius-ripple: null
4444
) {
4545
$name: 'igx-checkbox';
46-
$checkbox-schema: map-get($schema, $name);
46+
$checkbox-schema: ();
47+
48+
@if map-has-key($schema, $name) {
49+
$checkbox-schema: map-get($schema, $name);
50+
} @else {
51+
$checkbox-schema: $schema;
52+
}
53+
4754
$theme: apply-palette($checkbox-schema, $palette);
4855

4956
$border-radius: round-borders(
@@ -54,7 +61,6 @@
5461
if($border-radius-ripple, $border-radius-ripple, map-get($checkbox-schema, 'border-radius-ripple')), 0, 24px
5562
);
5663

57-
5864
@return extend($theme, (
5965
name: $name,
6066
palette: $palette,

0 commit comments

Comments
 (0)