Browse Source

feat: update designs

pull/1768/head
natdeanlewissoftwire 3 years ago
parent
commit
ce3dedd993
  1. 2
      app/frontend/styles/_filter-layout.scss
  2. 4
      app/helpers/filters_helper.rb
  3. 16
      app/views/logs/_log_filters.html.erb

2
app/frontend/styles/_filter-layout.scss

@ -5,7 +5,7 @@
.app-filter-layout__filter {
@include govuk-media-query(wide) {
float: left;
min-width: govuk-grid-width("one-quarter");
width: govuk-grid-width("one-quarter");
}
}

4
app/helpers/filters_helper.rb

@ -49,7 +49,7 @@ module FiltersHelper
def filters_applied_text(filter_type)
applied_filters = JSON.parse(session[session_name_for(filter_type)])
applied_filters_count = filters_count(applied_filters)
applied_filters_count.zero? ? "No filters applied" : "#{pluralize(applied_filters_count, 'filter')} applied"
applied_filters_count.zero? ? "No filters applied" : "#{pluralize(88, 'filter')} applied"
end
def reset_filters_link(filter_type)
@ -58,7 +58,7 @@ module FiltersHelper
if applied_filters_count.positive?
#clear filters
govuk_link_to "Reset filters", request.path
govuk_link_to "Clear", request.path
end
end

16
app/views/logs/_log_filters.html.erb

@ -8,14 +8,14 @@
<%= form_with html: { method: :get } do |f| %>
<% all_or_yours = { "all": { label: "All" }, "yours": { label: "Yours" } } %>
<p class="govuk-body">
<%= filters_applied_text(@filter_type) %>
</p>
<p>
<%= reset_filters_link(@filter_type) %>
</p>
<div class="govuk-grid-row" style="white-space: nowrap">
<p class="govuk-grid-column-one-half">
<%= filters_applied_text(@filter_type) %>
</p>
<p class="govuk-!-text-align-right govuk-grid-column-one-half">
<%= reset_filters_link(@filter_type) %>
</p>
</div>
<% if bulk_upload_options(@bulk_upload).present? %>
<%= render partial: "filters/checkbox_filter",
locals: {

Loading…
Cancel
Save