Merge pull request #4440 from colemanw/CRM-15524

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

diff --git a/css/civicrm.css b/css/civicrm.css
index d05160db2e1820bc2f97cc6f1ba9c4e1c7708db4..6b0b41044a10ff7f5765e8cebaf545aca90af020 100644 (file)
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -422,13 +422,11 @@ input.crm-form-entityref {
 }
 
 .crm-container .crm-section,
-.crm-container div.crm-field-wrapper,
-.crm-container-snippet .crm-section {
+.crm-container div.crm-field-wrapper {
   margin-bottom: 1em;
 }
 
-.crm-container .crm-section .label,
-.crm-container-snippet .crm-section .label {
+.crm-container .crm-section .label {
   float: left;
   width: 17%;
   text-align: right;
@@ -438,8 +436,7 @@ input.crm-form-entityref {
   text-align: left;
 }
 
-.crm-container .crm-section .content,
-.crm-container-snippet .crm-section .content {
+.crm-container .crm-section .content {
   margin-left: 19%;
 }
 
@@ -702,8 +699,7 @@ input.crm-form-entityref {
   color: #000080;
 }
 
-.crm-container .crm-marker,
-.crm-container-snippet .crm-marker {
+.crm-container .crm-marker{
   color: #8A1F11;
   font-weight: bold;
   margin-right: 5px;
@@ -2369,6 +2365,7 @@ div.grippie {
 .crm-container a.button:visited,
 .crm-container input.crm-form-submit,
 .crm-container .crm-button,
+.crm-container .ui-dialog-buttonset .ui-button,
 #crm-container input[type=button],
 #crm-container input.crm-form-submit-inline,
 #crm-container .crm-button {
@@ -2444,11 +2441,25 @@ div.grippie {
 .crm-container .crm-button:focus,
 .crm-container input[type=submit]:hover,
 .crm-container input[type=button]:hover,
+.crm-container .ui-dialog-buttonset .ui-button:hover,
+.crm-container .ui-dialog-buttonset .ui-button:focus,
 .crm-container a.button:hover,
 .crm-container a.button:focus {
   background-position: 0px -25px;
 }
 
+.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,
+#crm-contact-actions-list .icon {
+  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 {
@@ -2485,9 +2496,6 @@ div.grippie {
 #crm-create-new-list {
   width: 160px;
 }
-#crm-contact-actions-list .icon {
-  background-image: url("../i/icons/jquery-ui-FFFFFF.png");
-}
 
 #crm-contact-actions-list .crm-contact_activities-list select {
   margin-top: 4px;
@@ -3250,6 +3258,10 @@ div.crm-container form {
 .crm-container table.display td.center {
   text-align: center;
 }
+/* Fix weird color added to some datatables' sort column */
+.crm-container table.dataTable.display tbody tr > td.sorting_1 {
+  background-color: transparent;
+}
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Datatables misc
@@ -3338,6 +3350,7 @@ div.crm-container form {
 /* skin */
 
 #crm-container .crm-title {
+  line-height: 1.1;
   margin-bottom: 8px;
 }
 
@@ -3777,7 +3790,7 @@ div.m ul#civicrm-menu,
 .crm-container.ui-dialog {
   box-shadow: 0 0 10px rgba(0, 0, 0, 0.6);
 }
-.crm-container.ui-dialog.ui-draggable:before {
+.crm-container.ui-dialog.ui-resizable:before {
   display:block;
   content: " ";
   width: 16px;
@@ -4223,6 +4236,9 @@ div.m ul#civicrm-menu,
 .crm-status-icon.error {
   background-position: -72px 0px;
 }
+.crm-container div.ui-notify-message.none div.icon {
+  display: none;
+}
 
 span.crm-status-icon {
   display: inline-block;
@@ -4232,11 +4248,13 @@ span.crm-status-icon {
 
 #crm-container.crm-public input[type="text"],
 #crm-container.crm-public input[type="password"],
+#crm-container.crm-public input[type="email"],
 #crm-container.crm-public select {
   font-size: 15px;
   padding: 5px;
   border-radius: 3px;
   vertical-align: middle;
+  max-width: 100%;
 }
 
 #crm-container.crm-public .label {
@@ -4483,7 +4501,6 @@ span.crm-status-icon {
   background-position: -101px -222px;background-image: url("../i/icons/jquery-ui-3E3E3E.gif");
 }
 
-.crm-container .survey-completed,
 .crm-container .strikethrough {
   text-decoration: line-through;
 }
@@ -4504,5 +4521,5 @@ span.crm-status-icon {
 
 /* block-ui */
 .crm-container .blockUI.blockOverlay {
-  background: url("../i/loading-overlay.gif") center center no-repeat black;
+  background: url("../i/loading-overlay.gif") center center no-repeat white !important;
 }