From b01c8a383fdf323728876a7d6d542a3b1ac9b7ae Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Thu, 6 Aug 2020 18:00:58 -0400
Subject: [PATCH] Fix CSS for new buttons

---
 css/civicrm.css        | 62 +++++++++++++-----------------------------
 css/joomla.css         |  4 +--
 setup/res/template.css | 11 ++++----
 3 files changed, 26 insertions(+), 51 deletions(-)

diff --git a/css/civicrm.css b/css/civicrm.css
index cf61ef5a7d05..68162eb0a031 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -1173,7 +1173,7 @@ input.crm-form-entityref {
   cursor: pointer;
 }
 
-#crm-container input.submit-link {
+#crm-container button.submit-link {
   color: #285286;
   background: none transparent;
   border: none;
@@ -1833,17 +1833,6 @@ input.crm-form-entityref {
   margin-left: .5em;
 }
 
-.crm-container .crm-button input {
-  background: none;
-  border: medium none;
-  color: #FFF;
-  cursor: pointer;
-  font-size: 13px;
-  font-weight: normal;
-  margin: 0;
-  padding: 1px 8px 2px 4px;
-}
-
 .crm-container .crm-button-type-cancel,
 .crm-container .crm-button-type-back {
   margin-left: 20px;
@@ -1855,12 +1844,14 @@ input.crm-form-entityref {
   min-height: 0;
 }
 
+/* A few of these are redundant: pretty much all buttons have the crm-button
+class.  It can't hurt, though. */
 .crm-container a.button,
 .crm-container a.button:link,
 .crm-container a.button:visited,
-.crm-container input.crm-form-submit,
+.crm-container button.crm-form-submit,
 .crm-container .ui-dialog-buttonset .ui-button,
-.crm-container input[type=button],
+.crm-container button[type=button],
 .crm-container .crm-button {
   text-shadow: 0 1px 0 black;
   background: #696969;
@@ -1877,7 +1868,7 @@ input.crm-form-entityref {
 .crm-container a.button,
 .crm-container a.button:link,
 .crm-container a.button:visited,
-.crm-container span.crm-button {
+.crm-container .crm-button {
   display: block;
   float: left;
   overflow: hidden;
@@ -1897,23 +1888,11 @@ input.crm-form-entityref {
   margin-bottom: -4px;
 }
 
-.crm-container input.crm-form-submit,
-.crm-container input[type=button] {
-  padding: 2px 6px;
-}
-
-.crm-container .crm-button input[type=button],
-.crm-container .crm-button input.crm-form-submit {
-  padding: 0;
-  margin: 0;
-  background: none;
-  border: none;
-}
-
+/* Also redundant, see above */
 .crm-container .crm-button:hover,
 .crm-container .crm-button:focus,
-.crm-container input[type=submit]:hover,
-.crm-container input[type=button]:hover,
+.crm-container button[type=submit]:hover,
+.crm-container button[type=button]:hover,
 .crm-container .ui-dialog-buttonset .ui-button:hover,
 .crm-container .ui-dialog-buttonset .ui-button:focus,
 .crm-container a.button:hover,
@@ -1921,18 +1900,24 @@ input.crm-form-entityref {
   background: #3e3e3e;
 }
 
+/* Also redundant, see above */
 .crm-container .crm-button-disabled,
 .crm-container .crm-button.crm-button-disabled,
 .crm-container .ui-dialog-buttonset .ui-button[disabled],
-.crm-container input.crm-form-submit[disabled],
-.crm-container input[type=button][disabled],
+.crm-container button.crm-form-submit[disabled],
+.crm-container button[type=button][disabled],
 .crm-container .crm-button[disabled] {
   opacity: .6;
   cursor: default;
 }
 
-.crm-container .crm-button-disabled input[disabled] {
-  opacity: 1;
+/* Also redundant, see above */
+.crm-container .crm-button,
+.crm-container a.button,
+.crm-container a.button:link,
+.crm-container button.crm-form-submit,
+.crm-container button[type=button] {
+  border-radius: 3px;
 }
 
 .crm-container .ui-dialog-buttonpane {
@@ -2888,15 +2873,6 @@ tbody.scrollContent tr.alternateRow {
 }
 
 /* rounded corners */
-.crm-container .crm-button,
-.crm-container a.button,
-.crm-container a.button:link,
-.crm-container input.crm-form-submit,
-.crm-container input[type=button] {
-  border-radius: 3px;
-}
-
-
 .crm-container div.status,
 .crm-container #help,
 .crm-container .help,
diff --git a/css/joomla.css b/css/joomla.css
index a59b3a047ad5..80b9ad96f053 100644
--- a/css/joomla.css
+++ b/css/joomla.css
@@ -352,7 +352,7 @@ div#toolbar-box, div#toolbar-box div.m{
 .crm-container input {
   height: auto;
 }
-.crm-container input[type=submit] {
+.crm-container button[type=submit] {
   height: auto;
 }
 
@@ -377,7 +377,7 @@ div#toolbar-box, div#toolbar-box div.m{
 }
 
 /* Remove Joomla subhead toolbar & whitespace border */
-	
+
 body.admin.com_civicrm .subhead-collapse {
 	display:none;
 }
diff --git a/setup/res/template.css b/setup/res/template.css
index 5a2b3ea10608..a06f97a2b844 100644
--- a/setup/res/template.css
+++ b/setup/res/template.css
@@ -15,7 +15,7 @@ body {
   float: left;
   margin-left: 10%;
   margin-top: 50px;
-  margin-right: 20%; 
+  margin-right: 20%;
   display: inline-flex;
 }
 
@@ -39,7 +39,7 @@ body {
     100% { left: 0; color: #555;}
 }
 
-  
+
 .civicrm-setup-header hr{
   border-bottom: 2px solid #fff;
   border-top: 2px solid #ddd;
@@ -217,7 +217,7 @@ body {
   text-align: center;
   margin: 2em 0.5em;
 }
-.civicrm-setup-body input[type=submit] {
+.civicrm-setup-body button[type=submit] {
   padding:15px 25px;
   background:#82C459;
   color: white;
@@ -227,10 +227,10 @@ body {
   border-radius: 5px;
   font-size: 20px;
 }
-.civicrm-setup-body input[type=submit]:hover {
+.civicrm-setup-body button[type=submit]:hover {
   background: #60A237;
 }
-.civicrm-setup-body input[type=submit]:disabled {
+.civicrm-setup-body button[type=submit]:disabled {
   background: #888;
   cursor: not-allowed;
 }
@@ -267,4 +267,3 @@ body {
     width: 95%;
   }
 }
-