]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Move theme variables outside of the theme map. (#23918)
authorAndres Galante <agalante@gmail.com>
Thu, 19 Oct 2017 06:05:00 +0000 (03:05 -0300)
committerXhmikosR <xhmikosr@gmail.com>
Thu, 19 Oct 2017 06:05:00 +0000 (09:05 +0300)
scss/_variables.scss

index 3d78f0b8ae0f5a9bb91fafe2a2a5aa3f6a9a69a1..af0846806ee78cb88457e989209334fcc6a898b1 100644 (file)
@@ -62,16 +62,25 @@ $colors: map-merge((
   "gray-dark":  $gray-800
 ), $colors);
 
+$primary:       $blue !default;
+$secondary:     $gray-600 !default;
+$success:       $green !default;
+$info:          $cyan !default;
+$warning:       $yellow !default;
+$danger:        $red !default;
+$light:         $gray-100 !default;
+$dark:          $gray-800 !default;
+
 $theme-colors: () !default;
 $theme-colors: map-merge((
-  "primary":    $blue,
-  "secondary":  $gray-600,
-  "success":    $green,
-  "info":       $cyan,
-  "warning":    $yellow,
-  "danger":     $red,
-  "light":      $gray-100,
-  "dark":       $gray-800
+  "primary":    $primary,
+  "secondary":  $secondary,
+  "success":    $success,
+  "info":       $info,
+  "warning":    $warning,
+  "danger":     $danger,
+  "light":      $light,
+  "dark":       $dark
 ), $theme-colors);
 // stylelint-enable