Skip to content

Commit 33a49ed

Browse files
committed
fixed filter selects (empty option & lack of styling)
1 parent 72874ad commit 33a49ed

4 files changed

Lines changed: 34 additions & 3 deletions

File tree

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
document.addEventListener('DOMContentLoaded', () => {
2+
document.querySelectorAll('.js-log-type-select, .js-event-type-select').forEach((el) => {
3+
$(el).select2();
4+
});
5+
})
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
@import 'variables';
2+
3+
.audit-log-filters {
4+
.select2-container {
5+
height: 37px;
6+
margin: 4px 0px;
7+
8+
.selection {
9+
10+
.select2-selection {
11+
border-color: $muted-graphic;
12+
height: 100%;
13+
padding: 4px 0;
14+
}
15+
16+
.select2-selection__arrow {
17+
top: 50%;
18+
translate: 0 -50%;
19+
}
20+
}
21+
}
22+
}

app/assets/stylesheets/forms.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ select.form-element {
5555
z-index: 8999;
5656
}
5757

58+
.select2-results__option {
59+
min-height: 2em;
60+
}
61+
5862
@for $i from 1 through 25 {
5963
textarea.has-rows[rows="#{$i}"] {
6064
min-height: (1.2em * $i) + 1.2em;

app/views/admin/audit_log.html.erb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
<div>
44
<h3>Filters</h3>
5-
<%= form_tag audit_log_path, method: :get, class: 'form-inline' do %>
5+
<%= form_tag audit_log_path, method: :get, class: 'form-inline audit-log-filters' do %>
66
<div class="form-group-horizontal">
77
<div class="form-group">
88
<%= label_tag :log_type, 'Log category', class: 'form-element' %>
99
<%= select_tag :log_type, options_for_select(@log_types.map { |lt| [lt, lt] }, selected: params[:log_type]),
10-
include_blank: true, class: 'form-element' %>
10+
include_blank: true, class: 'form-element js-log-type-select' %>
1111
</div>
1212
<div class="form-group">
1313
<%= label_tag :event_type, 'Event', class: 'form-element' %>
1414
<%= select_tag :event_type, options_for_select(@event_types.map { |et| [et, et] },
1515
selected: params[:event_type]),
16-
include_blank: true, class: 'form-element' %>
16+
include_blank: true, class: 'form-element js-event-type-select' %>
1717
</div>
1818
<div class="form-group">
1919
<%= label_tag :from, 'From date', class: 'form-element' %>

0 commit comments

Comments
 (0)