app/assets/stylesheets/active_admin/_forms.scss in activeadmin-1.0.0 vs app/assets/stylesheets/active_admin/_forms.scss in activeadmin-1.1.0
- old
+ new
@@ -1,6 +1,5 @@
-//= depend_on_asset "active_admin/datepicker/datepicker-input-icon.png"
// -------------------------------------- Active Admin Forms
form {
/* Reset margins & Padding */
ul, ol, li, fieldset, legend, input, textarea, select, p { margin:0; padding:0; }
ol, ul { list-style: none }
@@ -289,13 +288,11 @@
$filter-field-seperator-width: 12px;
$side-by-side-filter-input-width: ($sidebar-inner-content-width / 2) - ($text-input-horizontal-padding * 2) - $filter-field-seperator-width;
$side-by-side-filter-select-width: ($sidebar-inner-content-width / 2) - $filter-field-seperator-width;
-$date-range-filter-input-right-padding: 27px;
-$date-range-filter-input-horizontal-padding: $date-range-filter-input-right-padding + $text-input-horizontal-padding;
-$date-range-filter-input-width: ($sidebar-inner-content-width / 2) - $filter-field-seperator-width - $date-range-filter-input-horizontal-padding;
+$date-range-filter-input-width: ($sidebar-inner-content-width / 2) - ($filter-field-seperator-width / 2);
form.filter_form {
.filter_form_field {
margin-bottom: 10px;
clear: both;
@@ -324,19 +321,16 @@
input { vertical-align: baseline; }
}
}
&.filter_date_range {
- .seperator {
- display: inline-block;
- text-align: center;
- width: $filter-field-seperator-width;
- }
-
input[type=text] {
- background: #fff image-url('active_admin/datepicker/datepicker-input-icon.png') no-repeat 100% 7px;
- padding-right: $date-range-filter-input-right-padding;
+ box-sizing: border-box;
width: $date-range-filter-input-width;
+
+ + input {
+ margin-left: 6px;
+ }
}
}
}
a.clear_filters_btn { @include light-button; }
}