mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-03 15:29:08 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrew Nicols 2019-05-03 11:08:00 +08:00
commit ec59de637a
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
theme/boost/scss/preset/default.scss
View 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";

7
theme/classic/scss/preset/default.scss
View 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";