Merge branch '4.6' of https://github.com/civicrm/civicrm-core

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

diff --git a/css/civicrm.css b/css/civicrm.css
index 4f88734b1ac7fdcb02219f717fede1bfd1a4c790..4a097a73ab4d1bf323f5df4f95df783a94dba9a8 100644 (file)
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -1661,23 +1661,6 @@ input.crm-form-entityref {
   padding: 3px;
 }
 
-/* class for text area resizer jquery plugin*/
-div.grippie {
-  background: #EEEEEE url('../i/grippie.png') no-repeat scroll center 2px;
-  border-color: #DDDDDD;
-  border-style: solid;
-  border-width: 0pt 1px 1px;
-  cursor: s-resize;
-  height: 9px;
-  overflow: hidden;
-}
-.crm-container .resizable-textarea textarea {
-  display: block;
-  margin-bottom: 0pt;
-  width: 95%;
-  height: 20%;
-}
-
 .crm-container ul li.crm-tab-button {
   border-bottom: 0 none;
   float: left;
@@ -2078,9 +2061,10 @@ div.grippie {
   background-image: url("../i/icons/jquery-ui-FFFFFF.png");
 }
 
-/* No button styling for PayPal Express buttons */
-#crm-container input#_qf_Register_upload_express,
-#crm-container input#_qf_Main_upload_express {
+/* No crm-button styling for PayPal Express buttons */
+.crm-container input#_qf_Register_upload_express,
+.crm-container input#_qf_Payment_upload_express,
+.crm-container input#_qf_Main_upload_express {
   background: none;
   margin: 0;
   padding: 0;
@@ -2588,7 +2572,8 @@ div a.helpicon:focus {
   border: 0 none;
 }
 
-/* Override Drupal .2em margin-bottom on forms (we don't want to give up that space) */
+/* ID selector is needed to override Drupal 2em margin-bottom on forms (we don't want to give up that space) */
+div#crm-container form,
 div.crm-container form {
   margin-bottom: 0;
 }
@@ -2661,18 +2646,15 @@ div.crm-container form {
 
 .crm-container .dataTables_processing {
   position: absolute;
-  top: 50%;
-  left: 50%;
-  width: 250px;
-  height: 30px;
-  margin-left: -125px;
-  margin-top: -15px;
-  padding: 14px 0 2px 0;
-  border: 1px solid #ddd;
-  text-align: center;
-  color: #999;
-  font-size: 14px;
-  background-color: white;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  padding: 0;
+  background: url("../i/loading-overlay.gif") center center no-repeat white;
+  opacity: 0.6;
+  cursor: wait;
 }
 
 .crm-container .dataTables_length {
@@ -3252,6 +3234,9 @@ div.m ul#civicrm-menu,
 .crm-container .crm-action-menu.action-icon-token .select2-default span.select2-chosen:before {
   background-position: -144px 0;
 }
+.crm-container .crm-action-menu.action-icon-mail-closed .select2-default span.select2-chosen:before {
+  background-position: -80px -96px;
+}
 /* Restore this property otherwise our css overrides it */
 .select2-search input {
   box-sizing: border-box;