From 82bc55ff3940f2d118413ded48baf2ca0ad2ead6 Mon Sep 17 00:00:00 2001 From: Laetitia Getti Date: Wed, 16 Aug 2023 11:28:30 +0200 Subject: [PATCH] mode dashboard out of order app and give box same height --- la_chariotte/order/views/grouped_order.py | 2 +- la_chariotte/static/css/app.css | 7 +++++-- la_chariotte/static/sass/base/_global.sass | 3 +++ .../{order/templates/order => templates}/dashboard.html | 0 la_chariotte/urls.py | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) rename la_chariotte/{order/templates/order => templates}/dashboard.html (100%) diff --git a/la_chariotte/order/views/grouped_order.py b/la_chariotte/order/views/grouped_order.py index 88bb171..bf95d2e 100644 --- a/la_chariotte/order/views/grouped_order.py +++ b/la_chariotte/order/views/grouped_order.py @@ -54,7 +54,7 @@ class IndexView(LoginRequiredMixin, generic.ListView): class JoinGroupedOrderView(generic.FormView, generic.RedirectView, LoginRequiredMixin): form_class = JoinGroupedOrderForm - template_name = "order/dashboard.html" + template_name = "dashboard.html" def form_valid(self, form): return redirect( diff --git a/la_chariotte/static/css/app.css b/la_chariotte/static/css/app.css index 3831ae5..6eac668 100644 --- a/la_chariotte/static/css/app.css +++ b/la_chariotte/static/css/app.css @@ -214,8 +214,7 @@ fieldset[disabled] .file-name, fieldset[disabled] .select select, .select fields padding: 0; } -/* Bulma Base */ -/*! minireset.css v0.0.6 | MIT License | github.com/jgthms/minireset.css */ +/* Bulma Base */ /*! minireset.css v0.0.6 | MIT License | github.com/jgthms/minireset.css */ html, body, p, @@ -10303,6 +10302,10 @@ main { border-right: 1px solid #e9b049; } +.box { + height: 100%; +} + .footer { padding: 0; font-size: 0.7rem; diff --git a/la_chariotte/static/sass/base/_global.sass b/la_chariotte/static/sass/base/_global.sass index 6bc91e6..2912694 100644 --- a/la_chariotte/static/sass/base/_global.sass +++ b/la_chariotte/static/sass/base/_global.sass @@ -15,6 +15,9 @@ main border-bottom: 2px solid $beige border-right: 1px solid $beige +.box + height: 100% + .footer padding: 0 font-size: 0.7rem diff --git a/la_chariotte/order/templates/order/dashboard.html b/la_chariotte/templates/dashboard.html similarity index 100% rename from la_chariotte/order/templates/order/dashboard.html rename to la_chariotte/templates/dashboard.html diff --git a/la_chariotte/urls.py b/la_chariotte/urls.py index 6f7a218..31135a0 100644 --- a/la_chariotte/urls.py +++ b/la_chariotte/urls.py @@ -53,7 +53,7 @@ urlpatterns = [ ), path( "", - JoinGroupedOrderView.as_view(template_name="order/dashboard.html"), + JoinGroupedOrderView.as_view(template_name="dashboard.html"), name="dashboard", ), path(