From 6eafcde7507de2d0e321467bd2a6c1737105573a Mon Sep 17 00:00:00 2001 From: Arnaud Levy <contact@arnaudlevy.com> Date: Thu, 1 Dec 2022 18:57:47 +0100 Subject: [PATCH] filter --- app/assets/stylesheets/admin/pure/style.sass | 10 ++++++++++ app/views/admin/application/_filters.html.erb | 2 +- app/views/devise/registrations/edit.html.erb | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/admin/pure/style.sass b/app/assets/stylesheets/admin/pure/style.sass index 1eb25c7eb..c465d8950 100644 --- a/app/assets/stylesheets/admin/pure/style.sass +++ b/app/assets/stylesheets/admin/pure/style.sass @@ -45,6 +45,7 @@ main min-height: 70vh + position: relative .container-fluid padding-right: var(--bs-gutter-x) @@ -94,6 +95,15 @@ a right: 0 z-index: 100 +.filters + position: absolute + top: 0 + right: var(--bs-gutter-x) + margin-top: 0px !important + +#collapseFilters + padding-top: 50px + .table input[type=checkbox] margin-right: 10px diff --git a/app/views/admin/application/_filters.html.erb b/app/views/admin/application/_filters.html.erb index 562c3b78c..9e03627f7 100644 --- a/app/views/admin/application/_filters.html.erb +++ b/app/views/admin/application/_filters.html.erb @@ -5,7 +5,7 @@ filters.each { |filter| should_be_open = true if params.has_key?(filter[:scope_n %> <% if collapsable %> - <div class="text-end mt-n5"> + <div class="text-end filters mt-n5"> <a class="btn btn-outline-secondary btn-sm" data-bs-toggle="collapse" href="#collapseFilters" diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index 36cec0437..08194d186 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -1,4 +1,4 @@ -<h2 class="mb-4"><%= t(".title", resource: resource.model_name.human) %></h2> +<% content_for :title, resource %> <%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %> <%= f.error_notification %> -- GitLab