Merge pull request #5723 from civicrm/4.6

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

diff --git a/css/civicrm.css b/css/civicrm.css
index 2fa64257dbe9181725dc9a6f2937e13f8d9f468e..ee95e8ce456d4c0548aaad7c2d0885b015eaa2ba 100644 (file)
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -109,13 +109,6 @@ div.crm-container fieldset label{
   vertical-align: top;
 }
 
-.crm-container tr.even-row td,
-.crm-container tr.odd-row td,
-.crm-container table.display td,
-.crm-container table.pagerDisplay td {
-  border-collapse: collapse;
-}
-
 .crm-container .crm-row-child {
   margin: 0;
   padding: 3px 0 3px 0;
@@ -289,6 +282,8 @@ input.crm-form-entityref {
 }
 
 .crm-container input.crm-form-text[disabled],
+.crm-container input.dateplugin[disabled],
+.crm-container select.crm-form-select[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%);
@@ -296,6 +291,17 @@ input.crm-form-entityref {
   background-image: linear-gradient(top, #ddd 1%, #f2f2f2 15%);
 }
 
+.crm-container input.crm-form-text[disabled],
+.crm-container input.dateplugin[disabled],
+.crm-container select.crm-form-select[disabled] {
+  color: #a9a9a9;
+}
+
+.crm-container .crm-form-time {
+  width: 5em;
+  margin-left: 1em;
+}
+
 .crm-container .crm-form-submit {
   margin: .25em 0.5em 0.25em 0;
 }
@@ -532,10 +538,6 @@ input.crm-form-entityref {
   vertical-align: top;
 }
 
-.crm-container table.selector td {
-  border-right: 1px solid #dddddd;
-}
-
 .crm-container .form-layout td.view-value,
 .crm-container .form-layout-compressed td.view-value {
   text-align: left;
@@ -577,7 +579,7 @@ input.crm-form-entityref {
 
 /* messages and status */
 .crm-container .messages {
-  margin: 1.0 0 1.0;
+  margin: 1em 0 1em;
   border: none;
   font-weight: normal;
 }
@@ -701,7 +703,7 @@ input.crm-form-entityref {
 
 .crm-container div.display-block {
   font-weight: normal;
-  margin: 1.0 2.0 1.0 2.0;
+  margin: 1em 2em 1em 2em;
 }
 
 /* Data display layouts */
@@ -984,7 +986,7 @@ input.crm-form-entityref {
 .crm-container #search-status ul li,
 #crm-container ul.left-alignment li {
   display: list-item;
-  margin-left: 2.0;
+  margin-left: 2em;
   list-style-position: inside;
 }
 
@@ -1074,8 +1076,6 @@ input.crm-form-entityref {
 #crm-recently-viewed ul {
   list-style-image: none;
   font-size: .9em;
-  margin: 0;
-  padding: 0;
 }
 
 #crm-recently-viewed li.crm-recently-viewed {
@@ -1192,7 +1192,7 @@ input.crm-form-entityref {
 
 /* To allow for taller boxes of groups/tags. */
 .crm-container .listing-box-tall {
-  margin: 0.25em 2.0 0.5em 0;
+  margin: .25em 2em .5em 0;
   height: 15em;
 }
 
@@ -1225,20 +1225,6 @@ input.crm-form-entityref {
   content: "\00BB";
 }
 
-.crm-container div#searchForm {
-  height: auto;
-  width: 100%;
-}
-
-.crm-container div#searchForm table.form-layout {
-  border-spacing: 0;
-}
-
-.crm-container div#searchForm table.form-layout td {
-  padding: 4px;
-  border: 1px solid #DDDDDD;
-}
-
 /* editor specific classes */
 #crm-container dd.editor {
   margin-top: 0.7em;
@@ -1406,11 +1392,6 @@ input.crm-form-entityref {
   border-bottom: 1px solid #999999;
 }
 
-#crm-container table.caseSelector td.status-urgent {
-  font-weight: bold;
-  text-transform: uppercase;
-}
-
 #crm-container table.caseSelector td {
   border-right: 0;
   padding: 4px;
@@ -2404,7 +2385,7 @@ div.grippie {
 /* civicrm admin menu */
 #civicrm-menu .ui-autocomplete-input,
 .crm-container .ui-autocomplete-input {
-  background: white url("../packages/jquery/plugins/select2/select2.png") no-repeat scroll right -23px;
+  background: white url("../bower_components/select2/select2.png") no-repeat scroll right -23px;
   padding-right: 16px;
   /* so that text doesn't flow on top of icon */
 }
@@ -2607,7 +2588,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;
 }
@@ -2802,7 +2784,8 @@ div.crm-container form {
 }
 
 /* Date plugin */
-.crm-container input.dateplugin {
+.crm-container input.dateplugin,
+.crm-container input.crm-form-date {
   background: white url(../i/cal.gif) no-repeat scroll right center;
   padding-right: 16px;
   /* so that text doesn't flow on top of icon */
@@ -2858,6 +2841,7 @@ div.crm-container form {
 .crm-container table.pagerDisplay td {
   border-color: #efefef;
   border-right: 1px solid #efefef;
+  border-collapse: collapse;
 }
 .crm-container .odd-row,
 .crm-container .odd,
@@ -3017,6 +3001,7 @@ tbody.scrollContent tr.alternateRow {
 .crm-container .status-fatal,
 .crm-container .status-hold,
 .crm-container .status-past,
+.crm-contact-deceased,
 .crm-container .status-warning {
   color: #E43D2B !important;
 }
@@ -3122,7 +3107,7 @@ div.m ul#civicrm-menu,
 }
 /* Add arrow icon to multi-selects */
 .crm-container .select2-container-multi .select2-choices:before {
-  background: url("../packages/jquery/plugins/select2/select2.png") no-repeat scroll 0 -4px;
+  background: url("../bower_components/select2/select2.png") no-repeat scroll 0 -4px;
   content: "";
   display: block;
   height: 15px;
@@ -3268,6 +3253,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;
@@ -3296,7 +3284,7 @@ div.m ul#civicrm-menu,
   color: #F5F6F1;
 }
 .crm-container .ui-dialog-title {
-  background: url("../i/logo16px.png") no-repeat scroll 0 center;
+  background: url("../i/item_sprites.png") no-repeat scroll -79px -47px;
   margin-left: -5px;
   padding-left: 25px;
 }
@@ -3320,6 +3308,13 @@ div.m ul#civicrm-menu,
   background: none repeat scroll 0 0 transparent;
 }
 
+/* unset the styling for the li in jstree */
+#tagtree ul {
+  list-style: none;
+  margin: 0px;
+  padding: 0px;
+}
+
 /* Class for successful upgrade */
 .crm-container .upgrade-success {
   background-color: #00CC00;
@@ -4026,29 +4021,6 @@ span.crm-status-icon {
   background: url("../i/loading-overlay.gif") center center no-repeat white !important;
 }
 
-/* Recurring Dialog */
-.crm-container .recurring-dialog-inner-wrapper {
-  display: inline-block;
-  width: 100%;
-}
-.crm-container .recurring-dialog-inner-left{
-  width: 30%;
-  float: left;
-}
-.crm-container .recurring-dialog-inner-right{
-  width: 70%;
-  float: left;
-}
-.crm-container .recurring-dialog-button{
-  background: #f5f5f5;
-  background-image: -webkit-linear-gradient(top,#f5f5f5,#f1f1f1);
-  border: 1px solid rgba(0,0,0,0.1);
-  padding: 5px 8px;
-  text-align: center;
-  border-radius: 2px;
-  cursor: pointer;
-  font-size: 11px !important;
-}
 .crm-container table.mergecontact thead th {
   width:30%;
 }