Merge branch 'M65299_boost_theme-colors_override' of https://github.com/Dave-B/moodle

diff --git a/theme/boost/scss/preset/default.scss b/theme/boost/scss/preset/default.scss
index 7db7c03..39d8daf 100644 (file)
--- a/theme/boost/scss/preset/default.scss
+++ b/theme/boost/scss/preset/default.scss
@@ -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";

diff --git a/theme/classic/scss/preset/default.scss b/theme/classic/scss/preset/default.scss
index 52fc0bb..a7d15ca 100644 (file)
--- a/theme/classic/scss/preset/default.scss
+++ b/theme/classic/scss/preset/default.scss
@@ -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";