Skip to content

Commit 7d1e52a

Browse files
committed
Prevents issues merging maps with null.
1 parent d270a9c commit 7d1e52a

1 file changed

Lines changed: 37 additions & 37 deletions

File tree

scss/_colors-variables.scss

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -28,45 +28,45 @@ $cyan: #17a2b8 !default;
2828

2929
// region /////////////////////////////////////////////////////////////// Color Map
3030

31-
$colors: colors-merge((
32-
"blue": $blue,
33-
"indigo": $indigo,
34-
"purple": $purple,
35-
"pink": $pink,
36-
"red": $red,
37-
"orange": $orange,
38-
"yellow": $yellow,
39-
"green": $green,
40-
"teal": $teal,
41-
"cyan": $cyan,
42-
"white": $white,
43-
"gray": $gray-600,
44-
"gray-dark": $gray-800,
45-
"gray-light": $gray-700,
46-
"gray-lighter": $gray-300
47-
)) !default;
31+
$colors:(
32+
"blue": $blue,
33+
"indigo": $indigo,
34+
"purple": $purple,
35+
"pink": $pink,
36+
"red": $red,
37+
"orange": $orange,
38+
"yellow": $yellow,
39+
"green": $green,
40+
"teal": $teal,
41+
"cyan": $cyan,
42+
"white": $white,
43+
"gray": $gray-600,
44+
"gray-dark": $gray-800,
45+
"gray-light": $gray-700,
46+
"gray-lighter": $gray-300
47+
) !default;
4848

49-
$grays: grays-merge((
50-
"50": $gray-50,
51-
"100": $gray-100,
52-
"200": $gray-200,
53-
"300": $gray-300,
54-
"400": $gray-400,
55-
"500": $gray-500,
56-
"600": $gray-600,
57-
"700": $gray-700,
58-
"800": $gray-800,
59-
"900": $gray-900
60-
)) !default;
49+
$grays: (
50+
"50": $gray-50,
51+
"100": $gray-100,
52+
"200": $gray-200,
53+
"300": $gray-300,
54+
"400": $gray-400,
55+
"500": $gray-500,
56+
"600": $gray-600,
57+
"700": $gray-700,
58+
"800": $gray-800,
59+
"900": $gray-900
60+
) !default;
6161

6262

63-
$theme-colors: theme-colors-merge((
64-
"primary": $blue,
65-
"secondary": $gray-600,
66-
"success": $green,
67-
"info": $cyan,
68-
"warning": $yellow,
69-
"danger": $red,
70-
)) !default;
63+
$theme-colors: (
64+
"primary": $blue,
65+
"secondary": $gray-600,
66+
"success": $green,
67+
"info": $cyan,
68+
"warning": $yellow,
69+
"danger": $red,
70+
) !default;
7171

7272
// endregion //////////////////////////////////////////////////////////// End Color Map

0 commit comments

Comments
 (0)