Skip to content

Commit 4c5ad5e

Browse files
authored
Merge branch 'master' into clear-active-node-summary
2 parents 170c071 + edb2e85 commit 4c5ad5e

File tree

3 files changed

+33
-25
lines changed

3 files changed

+33
-25
lines changed

projects/igniteui-angular/src/lib/core/styles/base/utilities/_mixins.scss

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,14 +161,16 @@
161161
///
162162
@mixin igx-palette-vars($palette, $contrast: true) {
163163
$scope: if(is-root(), ':root', '&');
164-
$theme: map-get(map-get($palette, '_meta'), 'variant');
164+
$_meta: map-get($palette, '_meta');
165+
$theme: if($_meta, map-get($_meta, 'variant'), null);
165166

166167
#{$scope} {
167168
@each $name, $color in $palette {
168169
@each $variant, $value in $color {
169-
$valid: not(str-index(#{$variant}, 'contrast')) and not(str-index(#{$variant}, 'variant'));
170+
$_valid-base: type-of(map-get($color, 500)) == 'color' and $theme;
171+
$_valid-variant: not(str-index(#{$variant}, 'contrast')) and not(str-index(#{$variant}, 'variant')) and $theme;
170172

171-
@if($variant == 500) {
173+
@if $_valid-base and $variant == 500 {
172174
--igx-#{$name}-h: #{round(hue($value))};
173175
--igx-#{$name}-s: #{round(saturation($value))};
174176
--igx-#{$name}-l: #{round(lightness($value))};
@@ -180,7 +182,7 @@
180182
}
181183
}
182184

183-
@if $valid {
185+
@if $_valid-base and $_valid-variant {
184186
--igx-#{$name}-#{$variant}: #{_gen-hsla-color($name, $variant, $theme)};
185187
} @else if $name != '_meta' {
186188
--igx-#{$name}-#{$variant}: #{$value};

src/styles/_demo-theme.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ body {
99
color: $igx-foreground-color;
1010
}
1111

12+
:root {
13+
--some-dynamic-color: hsl(#{random(360)}, 100%, 50%);
14+
}
15+
1216
@include igx-core($direction: $direction);
1317
@include igx-typography($font-family: $typeface, $type-scale: $type-scale);
1418
@include igx-theme($palette: $palette, $schema: $schema, $legacy-support: $legacy-support);

src/styles/_variables.scss

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -73,26 +73,26 @@ $handmade-palette: (
7373
'A700-contrast': white
7474
),
7575
grays: (
76-
50: rgba(0, 0, 0, .02),
77-
'50-contrast': black,
78-
100: rgba(0, 0, 0, .04),
79-
'100-contrast': black,
80-
200: rgba(0, 0, 0, .08),
81-
'200-contrast': black,
82-
300: rgba(0, 0, 0, .12),
83-
'300-contrast': black,
84-
400: rgba(0, 0, 0, .26),
85-
'400-contrast': black,
86-
500: rgba(0, 0, 0, .38),
76+
50: rgba(255, 255, 255, .02),
77+
'50-contrast': white,
78+
100: rgba(255, 255, 255, .04),
79+
'100-contrast': white,
80+
200: rgba(255, 255, 255, .08),
81+
'200-contrast': white,
82+
300: rgba(255, 255, 255, .12),
83+
'300-contrast': white,
84+
400: rgba(255, 255, 255, .26),
85+
'400-contrast': white,
86+
500: rgba(255, 255, 255, .38),
8787
'500-contrast': black,
88-
600: rgba(0, 0, 0, .54),
89-
'600-contrast': white,
90-
700: rgba(0, 0, 0, .62),
91-
'700-contrast': white,
92-
800: rgba(0, 0, 0, .74),
93-
'800-contrast': white,
94-
900: rgba(0, 0, 0, .87),
95-
'900-contrast': white
88+
600: rgba(255, 255, 255, .54),
89+
'600-contrast': black,
90+
700: rgba(255, 255, 255, .62),
91+
'700-contrast': black,
92+
800: rgba(255, 255, 255, .74),
93+
'800-contrast': black,
94+
900: rgba(255, 255, 255, .87),
95+
'900-contrast': black
9696
),
9797
info: (
9898
500: #1377d5,
@@ -111,7 +111,9 @@ $handmade-palette: (
111111
'500-contrast': black
112112
),
113113
surface: (
114-
500: #fff,
115-
'500-contrast': black
114+
500: #222,
115+
'500-contrast': white
116116
)
117117
);
118+
119+
// $palette: $handmade-palette;

0 commit comments

Comments
 (0)