Merge pull request #343 from ASUWebPlatforms/ws2-1371

WS2-1371: Keep all buttons the correct color
ASUWebPlatforms · Sep 29, 2022 · 030ed7a · 030ed7a
2 parents b5854d0 + effa4be
commit 030ed7a
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/assets/css/renovation.style.css b/assets/css/renovation.style.css
diff --git a/src/components/buttons/_buttons.scss b/src/components/buttons/_buttons.scss
@@ -1,3 +1,4 @@
+// NOTE: Need to adjust loading order since the extends file is still more specific
 @import '../../sass/extends/buttons';
 
 .btn-primary:not(:disabled):not(.disabled):active,
@@ -23,3 +24,29 @@
     color: $primary;
   }
 }
+
+.bg-light,
+.bg-secondary,
+.bg-white,
+.bg-dark,
+.bg-primary,
+.bg-black,
+.bg-gray-1,
+.bg-gray-2,
+.bg-gray-7 {
+  // Gold and Gray buttons text should always be black
+  .btn-gold,
+  .btn-gold:hover,
+  .btn-gray,
+  .btn-gray:hover {
+    color: $gray-900;
+  }
+
+  // Maroon and Black buttons text should always be white
+  .btn-maroon,
+  .btn-maroon:hover,
+  .btn-dark,
+  .btn-dark:hover {
+    color: $white;
+  }
+}