From 8096d76275a3ce0fbaf7c4c10c2b30980c867037 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Fri, 23 Jul 2021 15:05:25 +0800
Subject: [PATCH] MDL-72206 theme_boost: Have env check classes extend alert
 classes

To achieve good colour contrast and consistency with other parts of
Moodle, the environment check classes need to extend the alert-*
classes.
---
 theme/boost/scss/moodle/admin.scss |  9 +++------
 theme/boost/style/moodle.css       | 36 ++++++++++++------------------------
 theme/classic/style/moodle.css     | 36 ++++++++++++------------------------
 3 files changed, 27 insertions(+), 54 deletions(-)

diff --git a/theme/boost/scss/moodle/admin.scss b/theme/boost/scss/moodle/admin.scss
index 15de5edcd5e..54ec87299bc 100644
--- a/theme/boost/scss/moodle/admin.scss
+++ b/theme/boost/scss/moodle/admin.scss
@@ -16,18 +16,15 @@
 
 .environmenttable {
     .warn {
-        background-color: $state-warning-bg;
-        color: $warning;
+        @extend .alert-warning;
     }
 
     .error {
-        background-color: $state-danger-bg;
-        color: $danger;
+        @extend .alert-danger;
     }
 
     .ok {
-        background-color: $state-success-bg;
-        color: $success;
+        @extend .alert-success;
     }
 }
 
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index f38aa872b28..9a30390cb73 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -6009,13 +6009,13 @@ input[type="button"].btn-block {
   .alert-secondary .alert-link {
     color: #525557; }
 
-.alert-success {
+.alert-success, .environmenttable .ok {
   color: #1c3f1a;
   background-color: #d7e4d6;
   border-color: #c6dac6; }
-  .alert-success hr {
+  .alert-success hr, .environmenttable .ok hr {
     border-top-color: #b7d0b7; }
-  .alert-success .alert-link {
+  .alert-success .alert-link, .environmenttable .ok .alert-link {
     color: #0c1b0b; }
 
 .alert-info {
@@ -6027,22 +6027,22 @@ input[type="button"].btn-block {
   .alert-info .alert-link {
     color: #00171b; }
 
-.alert-warning {
+.alert-warning, .environmenttable .warn {
   color: #7d5a29;
   background-color: #fcefdc;
   border-color: #fbe8cd; }
-  .alert-warning hr {
+  .alert-warning hr, .environmenttable .warn hr {
     border-top-color: #f9ddb5; }
-  .alert-warning .alert-link {
+  .alert-warning .alert-link, .environmenttable .warn .alert-link {
     color: #573e1c; }
 
-.alert-danger {
+.alert-danger, .environmenttable .error {
   color: #691911;
   background-color: #f4d6d2;
   border-color: #f0c5c1; }
-  .alert-danger hr {
+  .alert-danger hr, .environmenttable .error hr {
     border-top-color: #ebb2ac; }
-  .alert-danger .alert-link {
+  .alert-danger .alert-link, .environmenttable .error .alert-link {
     color: #3d0f0a; }
 
 .alert-light {
@@ -11792,16 +11792,16 @@ input[disabled] {
 .alert-secondary a {
   color: #525557; }
 
-.alert-success a {
+.alert-success a, .environmenttable .ok a {
   color: #0c1b0b; }
 
 .alert-info a {
   color: #00171b; }
 
-.alert-warning a {
+.alert-warning a, .environmenttable .warn a {
   color: #573e1c; }
 
-.alert-danger a {
+.alert-danger a, .environmenttable .error a {
   color: #3d0f0a; }
 
 .alert-light a {
@@ -12055,18 +12055,6 @@ input[disabled] {
 .path-admin .admintable .leftalign {
   text-align: left; }
 
-.environmenttable .warn {
-  background-color: #fcefdc;
-  color: #f0ad4e; }
-
-.environmenttable .error {
-  background-color: #f4d6d2;
-  color: #ca3120; }
-
-.environmenttable .ok {
-  background-color: #d7e4d6;
-  color: #357a32; }
-
 .path-admin .admintable.environmenttable .name,
 .path-admin .admintable.environmenttable .info,
 .path-admin #assignrole .admintable .role,
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index cb187d05d0d..dec91274499 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -6168,13 +6168,13 @@ input[type="button"].btn-block {
   .alert-secondary .alert-link {
     color: #525557; }
 
-.alert-success {
+.alert-success, .environmenttable .ok {
   color: #1c3f1a;
   background-color: #d7e4d6;
   border-color: #c6dac6; }
-  .alert-success hr {
+  .alert-success hr, .environmenttable .ok hr {
     border-top-color: #b7d0b7; }
-  .alert-success .alert-link {
+  .alert-success .alert-link, .environmenttable .ok .alert-link {
     color: #0c1b0b; }
 
 .alert-info {
@@ -6186,22 +6186,22 @@ input[type="button"].btn-block {
   .alert-info .alert-link {
     color: #00171b; }
 
-.alert-warning {
+.alert-warning, .environmenttable .warn {
   color: #7d5a29;
   background-color: #fcefdc;
   border-color: #fbe8cd; }
-  .alert-warning hr {
+  .alert-warning hr, .environmenttable .warn hr {
     border-top-color: #f9ddb5; }
-  .alert-warning .alert-link {
+  .alert-warning .alert-link, .environmenttable .warn .alert-link {
     color: #573e1c; }
 
-.alert-danger {
+.alert-danger, .environmenttable .error {
   color: #691911;
   background-color: #f4d6d2;
   border-color: #f0c5c1; }
-  .alert-danger hr {
+  .alert-danger hr, .environmenttable .error hr {
     border-top-color: #ebb2ac; }
-  .alert-danger .alert-link {
+  .alert-danger .alert-link, .environmenttable .error .alert-link {
     color: #3d0f0a; }
 
 .alert-light {
@@ -12013,16 +12013,16 @@ input[disabled] {
 .alert-secondary a {
   color: #525557; }
 
-.alert-success a {
+.alert-success a, .environmenttable .ok a {
   color: #0c1b0b; }
 
 .alert-info a {
   color: #00171b; }
 
-.alert-warning a {
+.alert-warning a, .environmenttable .warn a {
   color: #573e1c; }
 
-.alert-danger a {
+.alert-danger a, .environmenttable .error a {
   color: #3d0f0a; }
 
 .alert-light a {
@@ -12276,18 +12276,6 @@ input[disabled] {
 .path-admin .admintable .leftalign {
   text-align: left; }
 
-.environmenttable .warn {
-  background-color: #fcefdc;
-  color: #f0ad4e; }
-
-.environmenttable .error {
-  background-color: #f4d6d2;
-  color: #ca3120; }
-
-.environmenttable .ok {
-  background-color: #d7e4d6;
-  color: #357a32; }
-
 .path-admin .admintable.environmenttable .name,
 .path-admin .admintable.environmenttable .info,
 .path-admin #assignrole .admintable .role,
-- 
2.11.4.GIT