projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 77886eb8c8c425b6708c6c2361b294e8ae5a677a..ee95e8ce456d4c0548aaad7c2d0885b015eaa2ba 100644
(file)
--- a/
css/civicrm.css
+++ b/
css/civicrm.css
@@
-297,6
+297,11
@@
input.crm-form-entityref {
color: #a9a9a9;
}
color: #a9a9a9;
}
+.crm-container .crm-form-time {
+ width: 5em;
+ margin-left: 1em;
+}
+
.crm-container .crm-form-submit {
margin: .25em 0.5em 0.25em 0;
}
.crm-container .crm-form-submit {
margin: .25em 0.5em 0.25em 0;
}
@@
-2380,7
+2385,7
@@
div.grippie {
/* civicrm admin menu */
#civicrm-menu .ui-autocomplete-input,
.crm-container .ui-autocomplete-input {
/* civicrm admin menu */
#civicrm-menu .ui-autocomplete-input,
.crm-container .ui-autocomplete-input {
- background: white url("../
packages/jquery/plugin
s/select2/select2.png") no-repeat scroll right -23px;
+ background: white url("../
bower_component
s/select2/select2.png") no-repeat scroll right -23px;
padding-right: 16px;
/* so that text doesn't flow on top of icon */
}
padding-right: 16px;
/* so that text doesn't flow on top of icon */
}
@@
-2583,7
+2588,8
@@
div a.helpicon:focus {
border: 0 none;
}
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;
}
div.crm-container form {
margin-bottom: 0;
}
@@
-2778,7
+2784,8
@@
div.crm-container form {
}
/* Date plugin */
}
/* 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 */
background: white url(../i/cal.gif) no-repeat scroll right center;
padding-right: 16px;
/* so that text doesn't flow on top of icon */
@@
-3100,7
+3107,7
@@
div.m ul#civicrm-menu,
}
/* Add arrow icon to multi-selects */
.crm-container .select2-container-multi .select2-choices:before {
}
/* Add arrow icon to multi-selects */
.crm-container .select2-container-multi .select2-choices:before {
- background: url("../
packages/jquery/plugin
s/select2/select2.png") no-repeat scroll 0 -4px;
+ background: url("../
bower_component
s/select2/select2.png") no-repeat scroll 0 -4px;
content: "";
display: block;
height: 15px;
content: "";
display: block;
height: 15px;
@@
-3246,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-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;
/* Restore this property otherwise our css overrides it */
.select2-search input {
box-sizing: border-box;