Merge pull request #492 from civicrm/CPS-332-support-new-button-markup

CPS-480: Fix broken buttons
civicrm · Mar 16, 2021 · 225dfa3 · 225dfa3
2 parents 20584ee + ef0a299
commit 225dfa3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/scss/bootstrap/overrides/crm/_button.scss b/scss/bootstrap/overrides/crm/_button.scss
@@ -1,7 +1,5 @@
 // Makes next and upload buttons look like primary buttons:
-.crm-button-type-next,
-.crm-button-type-upload {
-
+.crm-button-type-next {
   @include button-outline-variant(white, $brand-primary);
 
   .crm-i { display: none; }

diff --git a/scss/civicrm/common/_buttons.scss b/scss/civicrm/common/_buttons.scss
@@ -61,6 +61,7 @@ $button-border-radius: 2px;
     border-color: $brand-primary;
     border-radius: $border-radius-base;
     box-sizing: content-box;
+    color: $crm-white;
     font-family: $font-family-base;
     margin-right: 0;
     padding: 8px 12px;
@@ -427,3 +428,14 @@ button {
     margin-top: 7px;
   }
 }
+
+// Ensure these components look well in conjunction with Bootstrap:
+#bootstrap-theme .crm-form-submit,
+#bootstrap-theme .crm-button {
+  color: $crm-white;
+  text-transform: uppercase;
+}
+
+#bootstrap-theme .crm-button:not(:last-child) {
+  margin-right: $crm-gap-small * 2;
+}