Merge pull request #17641 from MegaphoneJon/core-1590

[civicrm-core.git] / css / civicrm.css

diff --git a/css/civicrm.css b/css/civicrm.css
index 996ae6f7f0d3888371766cf9b8b252d57a457ce9..a3264938b0ae2fb905b3f196bd04c03c89622f36 100644 (file)
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -1850,9 +1850,6 @@ input.crm-form-entityref {
 .crm-container .crm-button-type-back {
   margin-left: 20px;
 }
-.crm-container .crm-button-type-cancel input {
-  color: #E6E6DC!important;
-}
 
 .crm-container a.button,
 .crm-container a.button:link,
@@ -1862,7 +1859,7 @@ input.crm-form-entityref {
 .crm-container input[type=button],
 .crm-container .crm-button {
   text-shadow: 0 1px 0 black;
-  background: #70716B url(../i/crm-button-bg.gif) repeat-x top left;
+  background: #696969;
   color: #FFF;
   font-size: 13px;
   font-weight: normal;
@@ -1919,7 +1916,7 @@ input.crm-form-entityref {
 .crm-container .ui-dialog-buttonset .ui-button:focus,
 .crm-container a.button:hover,
 .crm-container a.button:focus {
-  background-position: 0 -25px;
+  background: #3e3e3e;
 }
 
 .crm-container .crm-button-disabled,
@@ -1930,7 +1927,6 @@ input.crm-form-entityref {
 .crm-container .crm-button[disabled] {
   opacity: .6;
   cursor: default;
-  background-position: top left;
 }
 
 .crm-container .crm-button-disabled input[disabled] {
@@ -2050,6 +2046,14 @@ input.crm-form-entityref {
   margin-left: 3px;
 }
 
+.crm-container .crm-button.crm-icon-button {
+  padding: 2px 2px 1px 4px;
+}
+
+.crm-container .crm-button.crm-icon-button input {
+  padding-left: 18px;
+}
+
 .crm-container .crm-button.button-crm-i {
   padding: 2px 0 1px 5px;
 }
@@ -2058,6 +2062,15 @@ input.crm-form-entityref {
   padding-left: 0;
 }
 
+.crm-container .crm-button-icon {
+  background-image: url("../i/icons/jquery-ui-FFFFFF.png");
+  height: 16px;
+  width: 16px;
+  display: block;
+  position: absolute;
+  pointer-events: none;
+}
+
 .crm-container .delete-icon {
   background-position: -176px -96px;
 }
@@ -2104,13 +2117,20 @@ a.crm-i:hover {
   color: #86c661;
 }
 
-.crm-button>.crm-i {
-  padding-left: 5px;
+.crm-i-button {
+  position: relative;
 }
 
-.crm-container .crm-button .crm-i + input[type="button"],
-.crm-container .crm-button .crm-i + input.crm-form-submit {
-  padding-left: 0;
+.crm-i-button>.crm-i {
+  position: absolute;
+  pointer-events: none;
+  top: .4em;
+  left: .4em;
+}
+
+.crm-container .crm-button.crm-i-button input[type="button"],
+.crm-container .crm-button.crm-i-button input.crm-form-submit {
+  padding-left: 1.6em;
 }
 
 .crm-container a.helpicon {
@@ -2300,6 +2320,7 @@ div.crm-master-accordion-header a.helpicon {
 .crm-container span.expanded:before,
 .crm-container a.expanded:before,
 .crm-container .crm-expand-row.expanded:before {
+  font-family: "FontAwesome";
   content: "\f0d7";
 }
 
@@ -3172,7 +3193,7 @@ span.crm-select-item-color {
   right: 0;
 }
 .crm-container .ui-dialog-titlebar.ui-widget-header {
-  background: url("../i/crm-button-bg.gif") repeat-x scroll left center #70716B;
+  background: #5D677B;
   color: #F5F6F1;
 }
 .crm-container .ui-dialog-title {