Merge branch 'MDL-64494-38' of git://github.com/bmbrands/moodle into …

…MOODLE_38_STABLE
moodle · Mar 31, 2020 · f9ecf3d · f9ecf3d
2 parents 3b1be8f + 463ad12
commit f9ecf3d
Show file tree

Hide file tree

Showing 5 changed files with 765 additions and 615 deletions.
diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
@@ -2421,3 +2421,9 @@ $picker-emojis-per-row: 7 !default;
         margin-top: $spacer;
     }
 }
+
+@each $color, $value in $theme-colors {
+    .alert-#{$color} a {
+        color: darken(theme-color-level($color, $alert-color-level), 10%);
+    }
+}
diff --git a/theme/boost/scss/preset/default.scss b/theme/boost/scss/preset/default.scss
@@ -1,36 +1,36 @@
 // Bootstrap variables
-
 $white:    #fff !default;
 $gray-100: #f8f9fa !default;
 $gray-200: #e9ecef !default;
 $gray-300: #dee2e6 !default;
 $gray-400: #ced4da !default;
 $gray-500: #adb5bd !default;
-$gray-600: #868e96 !default;
+$gray-600: #6c757d !default;
 $gray-700: #495057 !default;
-$gray-800: #373a3c !default;
+$gray-800: #343a40 !default;
 $gray-900: #212529 !default;
 $black:    #000 !default;
 
 $blue:    #1177d1 !default;
 $indigo:  #6610f2 !default;
 $purple:  #613d7c !default;
 $pink:    #e83e8c !default;
-$red:     #d9534f !default;
+$red:     #d43f3a !default;
 $orange:  #f0ad4e !default;
 $yellow:  #ff7518 !default;
-$green:   #5cb85c !default;
+$green:   #398439 !default;
 $teal:    #20c997 !default;
 $cyan:    #5bc0de !default;
 
 $primary:       $blue !default;
-$secondary:     $gray-800 !default;
 $success:       $green !default;
 $info:          $cyan !default;
-$warning:       $yellow !default;
+$warning:       $orange !default;
 $danger:        $red !default;
-$light:         $gray-100 !default;
-$dark:          $gray-800 !default;
+$secondary:     $gray-400 !default;
+
+$info-outline:    #1f7e9a;
+$warning-outline: #a6670e;
 
 // Options
 $enable-rounded: false !default;
@@ -64,13 +64,11 @@ $card-group-margin: .25rem;
 $theme-colors: () !default;
 $theme-colors: map-merge((
     primary: $primary,
-    secondary: $gray-400,
+    secondary: $secondary,
     success: $success,
     info: $info,
-    warning: $orange,
+    warning: $warning,
     danger: $danger,
-    light: $gray-100,
-    dark: $gray-800
 ), $theme-colors);
 // stylelint-enable
 
@@ -108,7 +106,15 @@ body {
 // for an outline button.
 .btn-outline-secondary {
     @include button-outline-variant($gray-600);
-    border-color: $border-color;
+    border-color: $gray-600;
+}
+
+.btn-outline-info {
+    @include button-outline-variant($info-outline);
+}
+
+.btn-outline-warning {
+    @include button-outline-variant($warning-outline);
 }
 
-@include bg-variant(".bg-gray", $gray-200);
+@include bg-variant(".bg-gray", $gray-200);