From: Andres Galante <agalante@gmail.com>
Date: Thu, 19 Oct 2017 06:05:00 +0000 (-0300)
Subject: Move theme variables outside of the theme map. (#23918)
X-Git-Tag: v4.0.0-beta.2~21^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bee20c04e884fd40e40bd1802d10ce70e0ebd390;p=thirdparty%2Fbootstrap.git

Move theme variables outside of the theme map. (#23918)
---

diff --git a/scss/_variables.scss b/scss/_variables.scss
index 3d78f0b8ae..af0846806e 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -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