Merge branch 'M65299_boost_theme-colors_override' of https://github.com/Dave-B/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 3 May 2019 03:08:00 +0000 (11:08 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 3 May 2019 03:08:00 +0000 (11:08 +0800)
theme/boost/scss/preset/default.scss
theme/classic/scss/preset/default.scss

index 7db7c03..39d8daf 100644 (file)
@@ -60,7 +60,9 @@ $alert-border-width:                0 !default;
 
 $card-group-margin: .25rem;
 
-$theme-colors: (
+// stylelint-disable
+$theme-colors: () !default;
+$theme-colors: map-merge((
     primary: $primary,
     secondary: $gray-400,
     success: $success,
@@ -69,7 +71,8 @@ $theme-colors: (
     danger: $danger,
     light: $gray-100,
     dark: $gray-800
-);
+), $theme-colors);
+// stylelint-enable
 
 // Import FontAwesome.
 @import "fontawesome";
index 52fc0bb..a7d15ca 100644 (file)
@@ -60,7 +60,9 @@ $alert-border-width:                0 !default;
 
 $card-group-margin: .25rem;
 
-$theme-colors: (
+// stylelint-disable
+$theme-colors: () !default;
+$theme-colors: map-merge((
     primary: $primary,
     secondary: $gray-200,
     success: $success,
@@ -69,7 +71,8 @@ $theme-colors: (
     danger: $danger,
     light: $gray-100,
     dark: $gray-800
-);
+), $theme-colors);
+// stylelint-enable
 
 // Import FontAwesome.
 @import "fontawesome";