From a6173147ca89349a08eeafb24c2986ec418b502f Mon Sep 17 00:00:00 2001 From: vincent Date: Tue, 4 Oct 2022 15:21:01 +0200 Subject: [PATCH] (ui) fix layout --- app/frontend/src/javascript/components/store/show-order.tsx | 2 +- app/frontend/src/stylesheets/modules/store/orders.scss | 4 ++++ app/frontend/src/stylesheets/modules/store/store.scss | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/frontend/src/javascript/components/store/show-order.tsx b/app/frontend/src/javascript/components/store/show-order.tsx index 4f34dec26..cb1ed9af6 100644 --- a/app/frontend/src/javascript/components/store/show-order.tsx +++ b/app/frontend/src/javascript/components/store/show-order.tsx @@ -128,7 +128,7 @@ export const ShowOrder: React.FC = ({ orderId, currentUser, onSu
-
+
{order.order_items_attributes.map(item => (
diff --git a/app/frontend/src/stylesheets/modules/store/orders.scss b/app/frontend/src/stylesheets/modules/store/orders.scss index 8f1471018..e69a69cbf 100644 --- a/app/frontend/src/stylesheets/modules/store/orders.scss +++ b/app/frontend/src/stylesheets/modules/store/orders.scss @@ -91,6 +91,10 @@ color: var(--gray-hard-light); } } + .actions { + grid-template-columns: auto; + grid-auto-flow: column; + } } .subgrid { diff --git a/app/frontend/src/stylesheets/modules/store/store.scss b/app/frontend/src/stylesheets/modules/store/store.scss index da8ec70ef..a2d60e9d9 100644 --- a/app/frontend/src/stylesheets/modules/store/store.scss +++ b/app/frontend/src/stylesheets/modules/store/store.scss @@ -164,6 +164,7 @@ } } aside { + justify-self: stretch; margin: 2.4rem 0; grid-row: 4 / 5; top: 4rem; @@ -198,7 +199,7 @@ grid-template-areas: "min min min" "minus input plus" "btn btn btn"; - grid-template-columns: repeat(4, minmax(0, min-content)); + grid-template-columns: min-content 1fr min-content; justify-content: center; gap: 1.6rem; border-top: 1px solid var(--gray-soft-dark);