diff --git a/la_chariotte/order/templates/order/grouped_order_detail.html b/la_chariotte/order/templates/order/grouped_order_detail.html index 6797abf..4656e42 100644 --- a/la_chariotte/order/templates/order/grouped_order_detail.html +++ b/la_chariotte/order/templates/order/grouped_order_detail.html @@ -23,10 +23,10 @@

{{ grouped_order.place }}

{% endif %}

- {{ grouped_order.deadline }} + Commandes avant le {{ grouped_order.deadline }}

- {{ grouped_order.delivery_date }} + Livraison le {{ grouped_order.delivery_date }}

{% if user == grouped_order.orga %} @@ -56,7 +56,9 @@ {% else %}

Commander

- + + +
@@ -81,6 +83,28 @@ {% endfor %}
Produit
+ + +
+ {% for item in grouped_order.item_set.all %} +
+
+

{{ item.name }}

+
+ +
+ {% endfor %} +
+ {% if error_message %}

{{ error_message }}

{% endif %}

Vos informations

diff --git a/la_chariotte/order/templates/order/grouped_order_overview.html b/la_chariotte/order/templates/order/grouped_order_overview.html index 09fdbd9..824b368 100644 --- a/la_chariotte/order/templates/order/grouped_order_overview.html +++ b/la_chariotte/order/templates/order/grouped_order_overview.html @@ -25,10 +25,10 @@

{{ grouped_order.place }}

{% endif %}

- {{ grouped_order.deadline }} + Commandes avant le {{ grouped_order.deadline }}

- {{ grouped_order.delivery_date }} + Livraison le {{ grouped_order.delivery_date }}

diff --git a/la_chariotte/static/css/app.css b/la_chariotte/static/css/app.css index 17828f5..ceee25d 100644 --- a/la_chariotte/static/css/app.css +++ b/la_chariotte/static/css/app.css @@ -10290,18 +10290,7 @@ a { color: #A52951; } -p.title { - font-weight: 300; - color: #A52951; -} - -p.mobile-content-title { - font-weight: 600; - text-align: center; - font-size: 1.5rem; -} - -.box.is-info { +.box.is-info, .card.is-info { border-bottom: 2px solid #e9b049; border-right: 1px solid #e9b049; } @@ -10400,3 +10389,23 @@ a.navbar-item:hover { white-space: nowrap; } } +.card-footer-item { + display: grid; +} + +p.title { + font-weight: 300; + color: #A52951; +} + +p.mobile-content-title { + font-weight: 600; + text-align: center; + font-size: 1.5rem; +} + +.mini-title { + color: #7a7a7a; + font-size: 0.8rem; + margin-bottom: 0px !important; +} diff --git a/la_chariotte/static/sass/base/_global.sass b/la_chariotte/static/sass/base/_global.sass index ac5ecd7..a10b439 100644 --- a/la_chariotte/static/sass/base/_global.sass +++ b/la_chariotte/static/sass/base/_global.sass @@ -5,16 +5,7 @@ body a color: $betterave -p.title - font-weight: 300 - color: $primary - -p.mobile-content-title - font-weight: 600 - text-align: center - font-size: 1.5rem - -.box.is-info +.box.is-info, .card.is-info border-bottom: 2px solid $beige border-right: 1px solid $beige diff --git a/la_chariotte/static/sass/base/_table.sass b/la_chariotte/static/sass/base/_table.sass index e61d083..36dbe2f 100644 --- a/la_chariotte/static/sass/base/_table.sass +++ b/la_chariotte/static/sass/base/_table.sass @@ -3,4 +3,8 @@ table display: block overflow-x: auto - white-space: nowrap \ No newline at end of file + white-space: nowrap + +// Table with cards +.card-footer-item + display: grid diff --git a/la_chariotte/static/sass/base/_titles.sass b/la_chariotte/static/sass/base/_titles.sass new file mode 100644 index 0000000..c82d803 --- /dev/null +++ b/la_chariotte/static/sass/base/_titles.sass @@ -0,0 +1,13 @@ +p.title + font-weight: 300 + color: $primary + +p.mobile-content-title + font-weight: 600 + text-align: center + font-size: 1.5rem + +.mini-title + color: $grey-text + font-size: 0.8rem + margin-bottom: 0px !important diff --git a/la_chariotte/static/sass/base/_variables.sass b/la_chariotte/static/sass/base/_variables.sass index 537cc9b..755ff1e 100644 --- a/la_chariotte/static/sass/base/_variables.sass +++ b/la_chariotte/static/sass/base/_variables.sass @@ -2,6 +2,7 @@ $betterave: #A52951 $beige: #e9b049 $bright-black: #280a13 +$grey-text: #7a7a7a $primary: $betterave $info: $beige diff --git a/la_chariotte/static/sass/style.sass b/la_chariotte/static/sass/style.sass index 433e870..f2f47e2 100644 --- a/la_chariotte/static/sass/style.sass +++ b/la_chariotte/static/sass/style.sass @@ -14,3 +14,4 @@ @import "./base/content" @import "./base/form" @import "./base/table" +@import "./base/titles"