Skip to content

Commit 36dba1d

Browse files
authored
Merge pull request #5373 from IgniteUI/fix-#5372
fix(themes): light/dark mixins don't respect custom colors
2 parents b910d00 + c5a1bc9 commit 36dba1d

File tree

1 file changed

+26
-16
lines changed
  • projects/igniteui-angular/src/lib/core/styles/themes

1 file changed

+26
-16
lines changed

projects/igniteui-angular/src/lib/core/styles/themes/_index.scss

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -274,17 +274,22 @@
274274
$exclude: (),
275275
$legacy-support: true
276276
) {
277-
$primary: igx-color($palette, 'primary');
278-
$secondary: igx-color($palette, 'secondary');
277+
$grays: igx-color($palette, 'grays');
279278
$surface: igx-color($palette, 'surface');
280279

280+
$light-palette: igx-palette(
281+
$primary: igx-color($palette, 'primary'),
282+
$secondary: igx-color($palette, 'secondary'),
283+
$info: igx-color($palette, 'info'),
284+
$success: igx-color($palette, 'success'),
285+
$warn: igx-color($palette, 'warn'),
286+
$error: igx-color($palette, 'error'),
287+
$surface: if($surface != #fff, $surface, #fff),
288+
$grays: if($grays != rgba(0, 0, 0, .38), $grays, #000),
289+
);
290+
281291
@include igx-theme(
282-
$palette: igx-palette(
283-
$primary,
284-
$secondary,
285-
$surface: if($surface != #fff, $surface, #fff),
286-
$grays: #000
287-
),
292+
$palette: $light-palette,
288293
$schema: $light-schema,
289294
$legacy-support: $legacy-support,
290295
$exclude: $exclude
@@ -300,17 +305,22 @@
300305
$exclude: (),
301306
$legacy-support: true
302307
) {
303-
$primary: igx-color($palette, 'primary');
304-
$secondary: igx-color($palette, 'secondary');
308+
$grays: igx-color($palette, 'grays');
305309
$surface: igx-color($palette, 'surface');
306310

311+
$dark-palette: igx-palette(
312+
$primary: igx-color($palette, 'primary'),
313+
$secondary: igx-color($palette, 'secondary'),
314+
$info: igx-color($palette, 'info'),
315+
$success: igx-color($palette, 'success'),
316+
$warn: igx-color($palette, 'warn'),
317+
$error: igx-color($palette, 'error'),
318+
$surface: if($surface != #fff, $surface, #222),
319+
$grays: if($grays != rgba(0, 0, 0, .38), $grays, #fff),
320+
);
321+
307322
@include igx-theme(
308-
$palette: igx-palette(
309-
$primary,
310-
$secondary,
311-
$surface: if($surface != #fff, $surface, #222),
312-
$grays: #fff
313-
),
323+
$palette: $dark-palette,
314324
$schema: $dark-schema,
315325
$legacy-support: $legacy-support,
316326
$exclude: $exclude

0 commit comments

Comments
 (0)