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 00dda45966b09496bef53c9cbbb1d3ebca7a0a86..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;
@@ -331,6 +339,14 @@ input.crm-form-entityref {
   background-image: linear-gradient(top, #eee 1%, #fff 15%);
 }
 
+.crm-container input.crm-form-text[disabled],
+.crm-container input.crm-form-text[readonly] {
+  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(1%, #ddd), color-stop(15%, #f2f2f2));
+  background-image: -webkit-linear-gradient(top, #ddd 1%, #f2f2f2 15%);
+  background-image: -moz-linear-gradient(top, #ddd 1%, #f2f2f2 15%);
+  background-image: linear-gradient(top, #ddd 1%, #f2f2f2 15%);
+}
+
 .crm-container .crm-form-submit {
   margin: .25em 0.5em 0.25em 0;
 }
@@ -406,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;
 }
@@ -1627,10 +1644,6 @@ editor specific classes
   cursor: pointer;
 }
 
-#crm-container table.nestedActivitySelector tr a {
-  color: #0066CC;
-}
-
 #crm-container #activities-selector tr:hover td,
 #crm-container #activities-selector tr:hover td.sorted,
 #crm-container #activities-selector tr.trOver td.sorted,
@@ -1709,8 +1722,9 @@ editor specific classes
   display: inline-block;
   white-space: nowrap;
   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;
@@ -1720,6 +1734,7 @@ editor specific classes
   font-size: .95em;
   padding: 3px 5px;
   opacity: 1;
+  color: #2786c2;
 }
 .crm-container .btn-slide .action-item {
   white-space: normal;
@@ -1738,7 +1753,6 @@ editor specific classes
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#cccccc', endColorstr = '#eeeeee', GradientType = 0);
   background-image: linear-gradient(top, #eee 0%, #ccc 100%);
   border: 1px solid #AAAAAA;
-  border-radius: 4px;
   opacity: 1;
   color: #2786C2;
 }
@@ -1761,11 +1775,7 @@ editor specific classes
   background-color: #2F2F2E;
 }
 
-.crm-container .panel li a {
-  color: #DFDFDF;
-}
-
-.crm-container .panel li a:hover,
+.crm-container .btn-slide .panel li a:hover,
 .crm-container .crm-participant-list-inner li a:hover,
 .crm-container .crm-event-links-list-inner li a:hover,
 .crm-container .crm-contribpage-links-list-inner li a:hover {
@@ -1830,11 +1840,12 @@ editor specific classes
   z-index: 1;
 }
 
-.crm-container .panel li a {
+.crm-container .btn-slide .panel li a {
   text-decoration: none;
   padding: 4px;
   display: block;
   cursor: pointer;
+  color: #DFDFDF;
 }
 
 /*class for CMS user name check used in profile*/
@@ -2113,11 +2124,6 @@ div.grippie {
   padding-top: 5px;
 }
 
-#crm-container a.crm-link-action {
-  cursor: pointer;
-  cursor: hand;
-}
-
 #crm-container span.crm-custom-greeting {
   font-size: 9px;
 }
@@ -2363,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 {
@@ -2371,7 +2378,7 @@ div.grippie {
   color: #FFF;
   font-size: 13px;
   font-weight: normal;
-  margin-right: 6px;
+  margin: 0 6px 0 0;
   padding: 2px 6px;
   text-decoration: none;
   cursor: pointer;
@@ -2438,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 {
@@ -2479,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;
@@ -2997,8 +3015,10 @@ div a.helpicon:focus {
 }
 #crm-container .crm-tooltip table,
 #crm-container .crm-tooltip table tr td {
+  background-color: #2f2f2e;
   border: none;
   color: #FFF;
+  word-wrap: break-word;
 }
 .crm-container .crm-tooltip .crm-summary-group {
   width: 700px;
@@ -3035,6 +3055,16 @@ div a.helpicon:focus {
   margin-left: 41%;
 }
 
+#crm-container .crm-tooltip table .crm-summary-col-1,
+.crm-container .crm-tooltip table .crm-summary-col-1 {
+  width: 350px;
+}
+
+#crm-container .crm-tooltip table .crm-summary-col-1 div,
+.crm-container .crm-tooltip table .crm-summary-col-1 div {
+  width: auto;
+}
+
 /* Class for tokens and helpicon */
 .crm-container .helpIcon {
   float: right;
@@ -3043,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;
 }
@@ -3066,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;
 }
 
@@ -3433,22 +3462,22 @@ tbody.scrollContent tr.alternateRow {
   text-decoration: none !important;
 }
 
-#crm-container table.selector td {
+.crm-container table.selector td {
   border-right: 1px dotted #DDDDDD;
 }
-#crm-container #customFields div.contact_panel td {
+.crm-container #customFields div.contact_panel td {
   border-bottom: 1px solid #FFFFFF;
   padding: 4px;
   vertical-align: top;
 }
 
-#crm-container div.contact_panel td,
+.crm-container div.contact_panel td,
 .crm-container table.crm-info-panel td {
   background-color: #f4f4ed;
 }
 
-#crm-container div.contact_panel td.label,
-#crm-container #customFields div.contact_panel td.label,
+.crm-container div.contact_panel td.label,
+.crm-container #customFields div.contact_panel td.label,
 .crm-container table.crm-info-panel td.label {
   background-color: #fafafa;
   width: 120px;
@@ -3459,21 +3488,21 @@ tbody.scrollContent tr.alternateRow {
   width: 150px;
 }
 
-#crm-container .form-layout td.label,
-#crm-container .form-layout-compressed td.label {
+.crm-container .form-layout td.label,
+.crm-container .form-layout-compressed td.label {
   width: 150px;
   text-align: right;
   color: #7a7a60;
 }
 
-#crm-container .form-layout td.label,
-#crm-container form table.report .label,
-#crm-container form table label,
-#crm-container form table.report label {
+.crm-container .form-layout td.label,
+.crm-container form table.report .label,
+.crm-container form table label,
+.crm-container form table.report label {
   color: #3e3e3e;
 }
 
-#crm-container div.contact_panel td.grouplabel {
+.crm-container div.contact_panel td.grouplabel {
   border-bottom: 2px solid #D7D7D0 !important;
 }
 
@@ -3616,11 +3645,8 @@ div.m ul#civicrm-menu,
 }
 
 /* select2 */
-.crm-select2 {
-  width: 15em;
-}
-.crm-container .select2-container {
-  min-width: 6em !important;
+.crm-container div.select2-container {
+  min-width: 6em;
   font-size: 11px;
 }
 /* Add arrow icon to multi-selects */
@@ -3639,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;
@@ -3668,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,
@@ -3757,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;
@@ -4212,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;
 }
@@ -4459,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;
 }