Merge branch '4.4' of https://github.com/civicrm/civicrm-core into 4.5

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

diff --git a/css/civicrm.css b/css/civicrm.css
index 4a3e142c0dd5e6b2be0d006b09e41abce46027c5..121be14f4d557bb160e4e4de8ff76080b7b7ee2b 100644 (file)
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -53,6 +53,10 @@ div.crm-container fieldset label{
   font-size: 13px;
 }
 
+.crm-container tr {
+  background: none transparent;
+}
+
 .crm-container table.criteria-group {
   margin-bottom: .1em;
 }
@@ -132,6 +136,9 @@ div.crm-container fieldset label{
 ** Size input fields in crm-container by class. Classes are assigned by the
 ** module in relation to the data object max size.
 */
+.crm-container .crm-select2 {
+  width: 15em;
+}
 .crm-container .two {
   width: 2em;
 }
@@ -303,7 +310,8 @@ input.crm-form-entityref {
 }
 
 /* Style civi form inputs to match select2 */
-.crm-container select.crm-form-select {
+.crm-container select.crm-form-select,
+.crm-container select.crm-form-date {
   border: 1px solid #aaa;
   color: #444;
   height: 2.2em;
@@ -414,6 +422,7 @@ input.crm-form-entityref {
 }
 
 .crm-container .crm-section,
+.crm-container div.crm-field-wrapper,
 .crm-container-snippet .crm-section {
   margin-bottom: 1em;
 }
@@ -1715,7 +1724,7 @@ editor specific classes
   border: 1px solid transparent;
   border-radius: 4px;
   text-decoration: none;
-  font-size: .8em;
+  font-size: .9em;
   color: #000;
   padding: 1px 2px 1px 0;
   opacity: .7;
@@ -2360,6 +2369,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 {
@@ -2435,11 +2445,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 {
@@ -2476,9 +2500,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;
@@ -3052,7 +3073,6 @@ div a.helpicon:focus {
   margin-right: 45px;
 }
 
-#crm-container ul.token-input-list-facebook, ul.token-input-list-facebook li.leaf,
 #crm-container ul li {
   list-style-image: none;
 }
@@ -3075,7 +3095,7 @@ div a.helpicon:focus {
 }
 
 /* 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: 0em;
 }
 
@@ -3625,9 +3645,6 @@ div.m ul#civicrm-menu,
 }
 
 /* select2 */
-.crm-select2 {
-  width: 15em;
-}
 .crm-container div.select2-container {
   min-width: 6em;
   font-size: 11px;
@@ -3648,6 +3665,10 @@ div.m ul#civicrm-menu,
 .crm-container .select2-container-multi.crm-ajax-select .select2-choices:before {
   background-position: right -26px;
 }
+.crm-container .select2-container-multi.loading .select2-choices:before,
+.crm-container .select2-container.loading .select2-choice .select2-arrow b {
+  background: url('../i/loading.gif') no-repeat center center;
+}
 /* Reduce select2 size to match other inputs */
 .crm-container .select2-container-multi .select2-choices {
   min-height: 25px;
@@ -3677,7 +3698,9 @@ div.m ul#civicrm-menu,
 }
 /* Style autocomplete results */
 .crm-container .select2-results {
+  font-size: 12px;
   padding: 0;
+  text-align: left;
 }
 .crm-container .select2-results li,
 .crm-container .select2-results .crm-select2-row,
@@ -3766,7 +3789,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;
@@ -4221,17 +4244,44 @@ 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: 2px;
+  border-radius: 3px;
   vertical-align: middle;
+  max-width: 100%;
 }
 
 #crm-container.crm-public .label {
   padding-top: 6px;
 }
 
+.crm-container.crm-public .select2-container,
+.crm-container.crm-public .select2-results {
+  font-size: 14px;
+}
+.crm-container.crm-public .select2-container .select2-choice {
+  padding: 5px 5px 5px 8px;
+}
+.crm-container.crm-public .select2-container-multi .select2-choices {
+  padding: 4px;
+}
+.crm-public .select2-container .select2-choice .select2-arrow {
+  width: 20px;
+}
+.crm-public .select2-container .select2-choice .select2-arrow b {
+  position: relative;
+  top: 2px;
+  left: 2px;
+}
+.crm-container.crm-public .select2-container-multi .select2-choices .select2-search-choice {
+  padding: 3px 3px 3px 20px;
+}
+.crm-container.crm-public .select2-container-multi .select2-choices:before {
+  top: 9px;
+}
+
 .crm-public .crm-profile-view .content {
   padding-top: 6px;
 }
@@ -4468,5 +4518,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;
 }