diff --git a/kaba/static/app.css b/kaba/static/app.css index db94693..9042c70 100644 --- a/kaba/static/app.css +++ b/kaba/static/app.css @@ -92,7 +92,7 @@ font-family: inherit; } *, ::after, ::before { - box-sizing: inherit; + box-sizing: border-box; } html { font-size: 20px; @@ -104,6 +104,8 @@ body { font-family: 'Work Sans', sans-serif; text-rendering: optimizeLegibility; background-color: var(--secondary-background-color); + padding: 0; + margin: 0; } h1, h2, @@ -136,9 +138,9 @@ a:hover { header { border-bottom: 1px solid #eee; - padding: 20px; + padding: 0 20px 20px 20px; } -header section { +header section.menu { display: grid; grid-template-columns: 2fr auto; } @@ -151,20 +153,12 @@ header h1 small { font-weight: 300; color: #666; } - -main a { - padding: 0 .1rem; - color: inherit; - text-decoration: none; - background-color: transparent; - border-bottom: 1px solid var(--primary-color); - transition: all .3s; +nav { + display: flex; + align-items: center; } -main a:hover { - padding-bottom: 1px; - color: var(--primary-color); - background-color: #e2eaf1; - border-bottom: 0; +main { + padding: 1rem; } button, @@ -295,6 +289,7 @@ td + td { border-left: 1px solid white; } th + td, +th + th, td + th { border-left: 1px solid #aaa; } @@ -317,6 +312,9 @@ th.price { th.amount { width: 5rem; } +th.ref { + width: 5rem; +} td.total, th.total { background-color: #bbb; @@ -372,12 +370,16 @@ hr { width: 100%; text-align: center; color: #f1f1f1; - line-height: : 3rem; + line-height: 3rem; + height: 3rem; vertical-align: middle; } .notification.success { background-color: #0f8796; } +.notification i { + font-size: 2rem; +} .toggle { display: none; } @@ -387,7 +389,7 @@ hr { } .toggle-container { display: none; - position: absolute; + position: fixed; top: calc(50% - 200px); left: calc(50% - 200px); height: 400px; @@ -395,12 +397,29 @@ hr { border: 1px solid #999; background: white; padding: 5px; + z-index: 100; + text-align: center; } +.toggle-background { + position: fixed; + width: 100%; + height: 100%; + top: 0; + bottom: 0; + left: 0; + right: 0; + z-index: 99; + background-color: black; + opacity: 0.4; + cursor: pointer; + display: none; +} +.toggle:checked ~ .toggle-background, .toggle:checked ~ .toggle-container { display: block; } ul.delivery { - padding: 10px + padding: 10px; } ul.delivery > li { list-style: none; diff --git a/kaba/templates/base.html b/kaba/templates/base.html index a5cd0e0..50ef126 100644 --- a/kaba/templates/base.html +++ b/kaba/templates/base.html @@ -14,16 +14,18 @@
{% if message %} -
{{ message[0] }}
+
{{ message[0] }}
{% endif %} -
+
+
{% block body %} {% endblock body %} +
diff --git a/kaba/templates/delivery.html b/kaba/templates/delivery.html index 504dd1e..9874c33 100644 --- a/kaba/templates/delivery.html +++ b/kaba/templates/delivery.html @@ -6,6 +6,7 @@ + {% for email, order in delivery.orders.items() %} @@ -15,6 +16,7 @@ {% for product in delivery.products %} + {% for email, order in delivery.orders.items() %} @@ -27,7 +29,7 @@ {% endfor %} - + {% for email, order in delivery.orders.items() %} {% endfor %} @@ -47,7 +49,7 @@ Rapport complet
  • - Liste d'émargement + Liste d'émargement
  • diff --git a/kaba/templates/includes/delivery_head.html b/kaba/templates/includes/delivery_head.html index 3392d1e..535b8ae 100644 --- a/kaba/templates/includes/delivery_head.html +++ b/kaba/templates/includes/delivery_head.html @@ -1,6 +1,6 @@ diff --git a/kaba/templates/place_order.html b/kaba/templates/place_order.html index 51cf25a..60bf948 100644 --- a/kaba/templates/place_order.html +++ b/kaba/templates/place_order.html @@ -10,17 +10,18 @@ {% for product in delivery.products %}
  • {% endfor %}
    Référence Produit Prix
    {{ product.ref }} {{ product.name }} {{ product.price }} €{{ delivery.product_wanted(product) }}
    Total
    Total{{ order.total(delivery.products) }} €
    {{ product.name }} + {% if product.description or product.img %} +

    {{ product.description }}

    {% if product.img %} - {% else %} - {% endif %}

    + {% endif %}

    {{ product.price }} €