Bugfix disarranged time sheet filters

pull/7000/head
Inga Mai 6 years ago
parent af71e32d84
commit be800f5705
  1. 3
      app/assets/stylesheets/content/_advanced_filters.sass
  2. 18
      app/assets/stylesheets/content/_simple_filters.sass
  3. 4
      app/views/timelog/_date_range.html.erb

@ -120,9 +120,6 @@
&.hidden
display: none !important
fieldset#date-range p
margin: 2px 0 2px 0
@include breakpoint(680px down)
.advanced-filters--filters
.advanced-filters--filter

@ -91,6 +91,24 @@ $filters--border-color: $gray !default
@include text-shortener
margin: auto 0
fieldset#date-range
p
margin: 2px 0 2px 0
// Special case: simple filters with a radiobutton
.simple-filters--filter
grid-template-columns: 10% repeat(auto-fill, 45%)
grid-template-rows: 50% 50%
grid-gap: 10px 0
.simple-filters--filter-name.form--label
grid-column: 2
@include breakpoint(680px down)
.simple-filters--filter-value
grid-column: 1 / -1
fieldset#date-range
.simple-filters--filter-value
grid-column: unset

@ -29,7 +29,7 @@ See docs/COPYRIGHT.rdoc for more details.
<fieldset id="date-range" class="simple-filters--container">
<legend><%= l(:label_date_range) %></legend>
<ul class="simple-filters--filters">
<li class="simple-filters--filter -full-width">
<li class="simple-filters--filter">
<%= styled_label_tag "period_type_list", l(:description_date_range_list), class: "hidden-for-sighted simple-filters--filter-name" %>
<%= styled_radio_button_tag 'period_type', '1',
!@free_period,
@ -40,7 +40,7 @@ See docs/COPYRIGHT.rdoc for more details.
class: "-narrow" %>
</div>
</li>
<li class="simple-filters--filter -full-width">
<li class="simple-filters--filter">
<%= styled_label_tag "period_type_interval", l(:description_date_range_interval), class: "hidden-for-sighted simple-filters--filter-name" %>
<%= styled_radio_button_tag 'period_type', '2', @free_period, id: "period_type_interval" %>
<%= styled_label_tag("from", l(:label_date_from), class: 'simple-filters--filter-name') %>

Loading…
Cancel
Save