refactor(utilities): override theme-colors in map-merge() instead of …

…using another map
Orange-OpenSource · Apr 8, 2020 · 10d075f · 10d075f
1 parent 73c6e06
commit 10d075f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/scss/_utilities.scss b/scss/_utilities.scss
@@ -399,10 +399,13 @@ $utilities: map-merge(
       property: background-color,
       class: bg,
       values: map-merge(
-        $supporting-colors,
+        $theme-colors,
         (
-          "primary": $primary,
-          "secondary": $secondary,
+          "success": $green-2,
+          "info": $blue-2,
+          "warning": $yellow-2,
+          "danger": $pink,
+          "purple": $purple,
           "body": $body-bg,
           "light": $light,
           "white": $white,

diff --git a/scss/_variables.scss b/scss/_variables.scss
@@ -86,16 +86,6 @@ $theme-colors: (
   "light":      $light,
   "dark":       $dark
 ) !default;
-
-// Boosted mod
-$supporting-colors: (
-  "success":    $green-2,
-  "info":       $blue-2,
-  "warning":    $yellow-2,
-  "danger":     $pink,
-  "purple":     $purple
-) !default;
-// End mod
 // fusv-enable
 
 // Set a specific jump point for requesting color jumps