From 9ba3b4f2d55209858ca9ed6f7f1a67aeaec2e1e8 Mon Sep 17 00:00:00 2001 From: David Cook Date: Tue, 11 Jun 2024 15:51:33 +1000 Subject: [PATCH] Fix up styles --- app/views/admin/column_preferences/_form.html.haml | 2 +- app/views/admin/products_v3/_sort.html.haml | 2 +- app/webpacker/css/admin/products_v3.scss | 10 +++++++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/views/admin/column_preferences/_form.html.haml b/app/views/admin/column_preferences/_form.html.haml index 969f4a3a9c..88ccd1a981 100644 --- a/app/views/admin/column_preferences/_form.html.haml +++ b/app/views/admin/column_preferences/_form.html.haml @@ -1,5 +1,5 @@ = form_with url: bulk_update_admin_column_preferences_path, method: :put, - id: :bulk_admin_column_preferences_form, + id: :bulk_admin_column_preferences_form, class: "column-preferences", html: { 'data-controller': "column-preferences" } do |f| = hidden_field_tag :action_name, action diff --git a/app/views/admin/products_v3/_sort.html.haml b/app/views/admin/products_v3/_sort.html.haml index f5d3d6329d..6749b3b07a 100644 --- a/app/views/admin/products_v3/_sort.html.haml +++ b/app/views/admin/products_v3/_sort.html.haml @@ -1,5 +1,5 @@ #sort - %div + %div.pagination-description - if pagy.present? = t(".pagination.total_html", total: pagy.count, from: pagy.from, to: pagy.to) diff --git a/app/webpacker/css/admin/products_v3.scss b/app/webpacker/css/admin/products_v3.scss index 2b277f0e33..646c2d074b 100644 --- a/app/webpacker/css/admin/products_v3.scss +++ b/app/webpacker/css/admin/products_v3.scss @@ -214,6 +214,10 @@ display: none; } + .pagination-description { + flex-grow: 1; // Grow to fill space + } + .with-dropdown { display: flex; justify-content: space-between; @@ -221,7 +225,11 @@ gap: 10px; } .per-page { - width: 10em; + width: 9em; + } + + .column-preferences .ofn-drop-down-label { + width: 13em; } }