From 5651687a2517c63fbf71d43d8a4e5d84d8f57909 Mon Sep 17 00:00:00 2001 From: drummer83 Date: Sun, 16 Feb 2025 17:35:58 +0100 Subject: [PATCH 1/2] Align input fields correctly on orders page The margin-top is not needed here. It will be added where needed in a separate commit. --- app/webpacker/css/admin/orders.scss | 6 +++--- app/webpacker/css/admin_v3/shared/forms.scss | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/webpacker/css/admin/orders.scss b/app/webpacker/css/admin/orders.scss index 74531609f8..2e51e74936 100644 --- a/app/webpacker/css/admin/orders.scss +++ b/app/webpacker/css/admin/orders.scss @@ -1,7 +1,7 @@ .admin-orders-index-search { - .inline-checkbox { - // Ensure it lines up with other fields - min-height: 5.4em; + // Ensure all fields have same min. height so they align well + .field { + min-height: 6em; } } diff --git a/app/webpacker/css/admin_v3/shared/forms.scss b/app/webpacker/css/admin_v3/shared/forms.scss index 0ee5f16f68..8ec94a2389 100644 --- a/app/webpacker/css/admin_v3/shared/forms.scss +++ b/app/webpacker/css/admin_v3/shared/forms.scss @@ -316,7 +316,6 @@ select { .inline-checkbox { display: inline-flex; align-items: center; - margin-top: 3px; input, label { From 94f58d2f5e2cc51b3d7e0adb8b664fa3822c7b7a Mon Sep 17 00:00:00 2001 From: drummer83 Date: Sun, 16 Feb 2025 17:42:43 +0100 Subject: [PATCH 2/2] Adjust margin-top for checkboxes on the report pages Apply it only to the checkboxes on the report pages, not to one on the orders page. --- app/webpacker/css/admin_v3/shared/forms.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/webpacker/css/admin_v3/shared/forms.scss b/app/webpacker/css/admin_v3/shared/forms.scss index 8ec94a2389..cd2729fa8d 100644 --- a/app/webpacker/css/admin_v3/shared/forms.scss +++ b/app/webpacker/css/admin_v3/shared/forms.scss @@ -313,6 +313,12 @@ select { background-color: white; } +.rendering-options { + .inline-checkbox { + margin-top: 2px; + } +} + .inline-checkbox { display: inline-flex; align-items: center;