CSS: Merge default colours with our own ones

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss
index 8c4f3724dfb0d4a39b9f375cc6f44b915beab86f..3fc97418500b0c0a0be289ad2e27525a34f0ef57 100644 (file)
--- a/src/scss/_variables.scss
+++ b/src/scss/_variables.scss
@@ -21,17 +21,17 @@ $cyan:                                              #2ee8c8;
 $lwl:                                          #4b0082;
 $twitter:                                      #00acee;
 
+$custom-colors: (
+       "lwl"                                   : $lwl,
+       "twitter"                               : $twitter,
+);
+
 // Theme
 $primary:                                      #FF2E53;
 $secondary:                                    $white;
 $light:                                                #faf5f6;
 $dark:                                         #4f4f4f;
 
-$theme-colors: (
-       "lwl"                                   : $lwl,
-       "twitter"               : $twitter,
-);
-
 $body-bg:                                      $white;
 $body-color:                           $dark;
 

diff --git a/src/scss/style.scss b/src/scss/style.scss
index 147ad077c3105488d376136e090961790416d8dd..e39b10949988d31e108a9c709a9e61649b695023 100644 (file)
--- a/src/scss/style.scss
+++ b/src/scss/style.scss
@@ -6,6 +6,8 @@
 @import "../bootstrap/scss/mixins";
 @import "../bootstrap/scss/utilities";
 
+$theme-colors: map-merge($theme-colors, $custom-colors);
+
 @import "../bootstrap/scss/root";
 @import "../bootstrap/scss/reboot";
 @import "../bootstrap/scss/type";