From dcdcdb4fc008266dbbe0d523b949cb0ab8aca0f3 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Fri, 12 May 2023 14:29:59 +0100
Subject: [PATCH] Align filter buttons centrally

---
 .../spree/admin/orders/_filters.html.haml     | 15 +++++----
 app/webpacker/css/admin/shared/layout.scss    | 32 +++++++++++++++----
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/app/views/spree/admin/orders/_filters.html.haml b/app/views/spree/admin/orders/_filters.html.haml
index 8a32ceb052..fcf14a4441 100644
--- a/app/views/spree/admin/orders/_filters.html.haml
+++ b/app/views/spree/admin/orders/_filters.html.haml
@@ -51,10 +51,11 @@
         options_for_select(OrderCycle.managed_by(spree_current_user).where('order_cycles.orders_close_at is not null').order('order_cycles.orders_close_at DESC').map {|oc| [oc.name, oc.id]}, params[:order_cycle_ids]),
         { class: "fullwidth", multiple: true, data: { controller: "tom-select", "tom-select-options-value": { plugins: ['remove_button'], maxItems: nil } }})
     .clearfix
-    .actions.filter-actions
-      %button{type: "submit", class: "button"}
-        %i.icon-search
-        = t(:filter_results)
-      %button{"id": "clear_filters_button", type: "button", "data-controller": "search", "data-action": "click->search#reset" }
-        =  t(:clear_filters)
-          
+    .actions.filter-actions{ style: "column-gap: 0" }
+      .eight.columns.alpha
+        %button.float-right.mr-0{type: "submit", class: "button"}
+          %i.icon-search
+          = t(:filter_results)
+      .eight.columns.omega
+        %button.float-left{"id": "clear_filters_button", type: "button", "data-controller": "search", "data-action": "click->search#reset" }
+          =  t(:clear_filters)
diff --git a/app/webpacker/css/admin/shared/layout.scss b/app/webpacker/css/admin/shared/layout.scss
index 099912c744..35d4c2613d 100644
--- a/app/webpacker/css/admin/shared/layout.scss
+++ b/app/webpacker/css/admin/shared/layout.scss
@@ -2,8 +2,8 @@
 //---------------------------------------------------
 * {
   -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
 }
 
 .admin {
@@ -68,6 +68,23 @@
 .hidden {
   display: none;
 }
+
+.float-right {
+  float: right;
+}
+
+.float-left {
+  float: left;
+}
+
+.mr-0 {
+  margin-right: 0 !important;
+}
+
+.ml-0 {
+  margin-left: 0 !important;
+}
+
 @media print {
   .print-hidden {
     display: none !important;
@@ -81,7 +98,9 @@
   padding: 5px 0;
 }
 
-#logo { height: 40px }
+#logo {
+  height: 40px;
+}
 
 .page-title {
   i {
@@ -108,7 +127,8 @@
 }
 
 @media print {
-  header, nav {
-    display:none;
+  header,
+  nav {
+    display: none;
   }
-}
\ No newline at end of file
+}