almet/la-chariotte
1
0
Fork 0
mirror of https://framagit.org/la-chariotte/la-chariotte.git synced 2025-05-01 11:22:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

front updates

Browse source
This commit is contained in:
Laetitia Getti 2023-05-15 17:58:25 +02:00
parent 0f337fc629
commit daf06196ff
6 changed files with 45 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
la_chariotte/order/templates/order/grouped_order_detail.html
View file

@ -5,7 +5,7 @@
{% block content_title %}{{ grouped_order }} : commander{% endblock %} {% block content_title %}{{ grouped_order }} : commander{% endblock %}
{% block content %} {% block content %}
<div class="box"> <div class="box is-info">
<div class="columns"> <div class="columns">
<div class="column is-8"> <div class="column is-8">
<p class="title">{{ grouped_order }}</p> <p class="title">{{ grouped_order }}</p>

6
la_chariotte/order/templates/order/grouped_order_overview.html
View file

@ -6,9 +6,9 @@
{% block content %} {% block content %}
<div class="buttons"> <div class="buttons">
<a class="button is-primary is-light" href={% url 'order:grouped_order_detail' grouped_order.id %}>Retour à la page de commande</a> <a class="button is-light" href={% url 'order:grouped_order_detail' grouped_order.id %}>Retour à la page de commande</a>
</div> </div>
<div class="box"> <div class="box is-info">
<div class="columns"> <div class="columns">
<div class="column is-8"> <div class="column is-8">
<p class="title">{{ grouped_order }}</p> <p class="title">{{ grouped_order }}</p>
@ -20,7 +20,7 @@
{% endif %} {% endif %}
<p>Date de livraison : {{ grouped_order.delivery_date }}</p> <p>Date de livraison : {{ grouped_order.delivery_date }}</p>
<p>Date limite de commande : {{ grouped_order.deadline }}</p> <p>Date limite de commande : {{ grouped_order.deadline }}</p>
<a class="button is-primary is-light" href={% url 'order:grouped_order_detail' grouped_order.id %}>Retour à la page de commande</a> <a class="button is-light" href={% url 'order:grouped_order_detail' grouped_order.id %}>Retour à la page de commande</a>
</div> </div>
</div> </div>
</div> </div>

2
la_chariotte/order/templates/order/order_detail.html
View file

@ -27,7 +27,7 @@
<div class="buttons"> <div class="buttons">
<a class="button is-primary" href="{% url 'order:grouped_order_detail' order.grouped_order.pk %}">Retour à la page de commande</a> <a class="button is-primary" href="{% url 'order:grouped_order_detail' order.grouped_order.pk %}">Retour à la page de commande</a>
{% if user == order.grouped_order.orga %} {% if user == order.grouped_order.orga %}
<a class="button is-primary is-light" href="{% url 'order:grouped_order_overview' order.grouped_order.pk %}">Page de gestion de la commande</a> <a class="button is-light" href="{% url 'order:grouped_order_overview' order.grouped_order.pk %}">Page de gestion de la commande</a>
{% endif %} {% endif %}
</div> </div>
</div> </div>

22
la_chariotte/static/css/app.css
View file

@ -10290,6 +10290,16 @@ a {
color: #A52951; 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) { @media screen and (min-width: 1024px) {
.navbar.side-nav { .navbar.side-nav {
right: inherit; right: inherit;
@ -10348,11 +10358,23 @@ a.navbar-item:hover {
padding-top: 3.25rem; padding-top: 3.25rem;
} }
} }
.button {
white-space: normal;
height: auto;
}
.button.is-light, .buttons.is-light:hover, .buttons.is-light.is-hovered { .button.is-light, .buttons.is-light:hover, .buttons.is-light.is-hovered {
border: #A52951 1px solid !important; border: #A52951 1px solid !important;
color: #A52951 !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) { @media screen and (max-width: 1023px) {
table { table {
display: block; display: block;

9
la_chariotte/static/sass/base/_buttons.sass
View file

@ -1,3 +1,12 @@
.button
white-space: normal
height: auto
.button.is-light, .buttons.is-light:hover, .buttons.is-light.is-hovered .button.is-light, .buttons.is-light:hover, .buttons.is-light.is-hovered
border: $betterave 1px solid !important border: $betterave 1px solid !important
color: $betterave !important color: $betterave !important
.button.is-info, .button.is-info:hover
color: $bright-black !important
&.is-light
border: $beige 1px solid !important

8
la_chariotte/static/sass/base/_global.sass
View file

@ -4,3 +4,11 @@ body
a a
color: $betterave color: $betterave
p.title
font-weight: 300
color: $primary
.box.is-info
border-bottom: 2px solid $beige
border-right: 1px solid $beige