Merge branch 'MDL-72206-master' of git://github.com/junpataleta/moodle

NoelDeMartin · Aug 19, 2021 · 4275de7 · 4275de7
2 parents 735bd7f + 210e6fa
commit 4275de7
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 54 deletions.
diff --git 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
@@ -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 {
@@ -11801,16 +11801,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 {
@@ -12076,18 +12076,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
@@ -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 {
@@ -12022,16 +12022,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 {
@@ -12297,18 +12297,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,