More radical cleanup of button CSS

diff --git a/css/civicrm.css b/css/civicrm.css
index 68162eb0a031727d4241f9e1404ec432ee4e7ebf..a2d6695b68f1fcec95dad5298b28baeb1b6dda36 100644 (file)
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -1844,14 +1844,10 @@ 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 button.crm-form-submit,
 .crm-container .ui-dialog-buttonset .ui-button,
-.crm-container button[type=button],
 .crm-container .crm-button {
   text-shadow: 0 1px 0 black;
   background: #696969;
@@ -1863,36 +1859,15 @@ class.  It can't hurt, though. */
   text-decoration: none;
   cursor: pointer;
   border: 1px solid #3e3e3e;
-}
-
-.crm-container a.button,
-.crm-container a.button:link,
-.crm-container a.button:visited,
-.crm-container .crm-button {
   display: block;
   float: left;
   overflow: hidden;
   line-height: 135%;
+  border-radius: 3px;
 }
 
-/* Preserving the important but not sure why */
-.crm-container span.crm-button {
-  float: left !important;
-}
-
-.crm-container button.crm-button {
-  padding: 3px 6px;
-}
-
-.crm-container button.crm-button .icon {
-  margin-bottom: -4px;
-}
-
-/* Also redundant, see above */
 .crm-container .crm-button:hover,
 .crm-container .crm-button:focus,
-.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,
@@ -1900,37 +1875,27 @@ class.  It can't hurt, though. */
   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 button.crm-form-submit[disabled],
-.crm-container button[type=button][disabled],
 .crm-container .crm-button[disabled] {
   opacity: .6;
   cursor: default;
 }
 
-/* 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 {
   background: linear-gradient(to bottom, #f2f2f2 0%,#ffffff 35%);
 }
 
-.crm-container .ui-dialog-buttonset .ui-button {
-  padding: 0;
-}
 .crm-container .ui-dialog-buttonset .ui-button .ui-icon {
   background-image: url("../i/icons/jquery-ui-FFFFFF.png");
 }
 
+/* Override of a line in crm-i.css that may not be important anymore */
+.crm-container .ui-dialog-buttonset .ui-button .ui-icon[class*=" fa-"] {
+  margin-top: 0;
+}
+
 /* No crm-button styling for PayPal Express buttons */
 .crm-container input#_qf_Register_upload_express,
 .crm-container input#_qf_Payment_upload_express,