From daf06196ff37d076cebf50f94839c78f872c79c6 Mon Sep 17 00:00:00 2001 From: Laetitia Getti Date: Mon, 15 May 2023 17:58:25 +0200 Subject: [PATCH] front updates --- .../templates/order/grouped_order_detail.html | 2 +- .../order/grouped_order_overview.html | 6 ++--- .../order/templates/order/order_detail.html | 2 +- la_chariotte/static/css/app.css | 22 +++++++++++++++++++ la_chariotte/static/sass/base/_buttons.sass | 11 +++++++++- la_chariotte/static/sass/base/_global.sass | 8 +++++++ 6 files changed, 45 insertions(+), 6 deletions(-) diff --git a/la_chariotte/order/templates/order/grouped_order_detail.html b/la_chariotte/order/templates/order/grouped_order_detail.html index b9af304..d9d6b5e 100644 --- a/la_chariotte/order/templates/order/grouped_order_detail.html +++ b/la_chariotte/order/templates/order/grouped_order_detail.html @@ -5,7 +5,7 @@ {% block content_title %}{{ grouped_order }} : commander{% endblock %} {% block content %} -
+

{{ grouped_order }}

diff --git a/la_chariotte/order/templates/order/grouped_order_overview.html b/la_chariotte/order/templates/order/grouped_order_overview.html index 168cda4..6ebdeef 100644 --- a/la_chariotte/order/templates/order/grouped_order_overview.html +++ b/la_chariotte/order/templates/order/grouped_order_overview.html @@ -6,9 +6,9 @@ {% block content %} -
+

{{ grouped_order }}

@@ -20,7 +20,7 @@ {% endif %}

Date de livraison : {{ grouped_order.delivery_date }}

Date limite de commande : {{ grouped_order.deadline }}

- Retour à la page de commande + Retour à la page de commande
diff --git a/la_chariotte/order/templates/order/order_detail.html b/la_chariotte/order/templates/order/order_detail.html index c2384ce..48ec497 100644 --- a/la_chariotte/order/templates/order/order_detail.html +++ b/la_chariotte/order/templates/order/order_detail.html @@ -27,7 +27,7 @@
Retour à la page de commande {% if user == order.grouped_order.orga %} - Page de gestion de la commande + Page de gestion de la commande {% endif %}
diff --git a/la_chariotte/static/css/app.css b/la_chariotte/static/css/app.css index eb75d60..5b456be 100644 --- a/la_chariotte/static/css/app.css +++ b/la_chariotte/static/css/app.css @@ -10290,6 +10290,16 @@ a { color: #A52951; } +p.title { + font-weight: 300; + color: #A52951; +} + +.box.is-info { + border-bottom: 2px solid #e9b049; + border-right: 1px solid #e9b049; +} + @media screen and (min-width: 1024px) { .navbar.side-nav { right: inherit; @@ -10348,11 +10358,23 @@ a.navbar-item:hover { padding-top: 3.25rem; } } +.button { + white-space: normal; + height: auto; +} + .button.is-light, .buttons.is-light:hover, .buttons.is-light.is-hovered { border: #A52951 1px solid !important; color: #A52951 !important; } +.button.is-info, .button.is-info:hover { + color: #280a13 !important; +} +.button.is-info.is-light, .button.is-info:hover.is-light { + border: #e9b049 1px solid !important; +} + @media screen and (max-width: 1023px) { table { display: block; diff --git a/la_chariotte/static/sass/base/_buttons.sass b/la_chariotte/static/sass/base/_buttons.sass index bd7306f..1dd8641 100644 --- a/la_chariotte/static/sass/base/_buttons.sass +++ b/la_chariotte/static/sass/base/_buttons.sass @@ -1,3 +1,12 @@ +.button + white-space: normal + height: auto + .button.is-light, .buttons.is-light:hover, .buttons.is-light.is-hovered border: $betterave 1px solid !important - color: $betterave !important \ No newline at end of file + color: $betterave !important + +.button.is-info, .button.is-info:hover + color: $bright-black !important + &.is-light + border: $beige 1px solid !important \ No newline at end of file diff --git a/la_chariotte/static/sass/base/_global.sass b/la_chariotte/static/sass/base/_global.sass index 5948372..581b843 100644 --- a/la_chariotte/static/sass/base/_global.sass +++ b/la_chariotte/static/sass/base/_global.sass @@ -4,3 +4,11 @@ body a color: $betterave + +p.title + font-weight: 300 + color: $primary + +.box.is-info + border-bottom: 2px solid $beige + border-right: 1px solid $beige \ No newline at end of file