Compare commits

...

5 Commits

Author SHA1 Message Date
f23c68bcff Css + admin button 2025-03-31 10:46:44 +02:00
ac6a59abdb Merge remote-tracking branch 'origin/develop' into feature/Back
# Conflicts:
#	public/css/ControllerVues/list.css
#	public/js/GestionMenu/GestionMenu.js
#	templates/index/admin.html.twig
#	templates/user/list.html.twig
2025-03-31 10:34:52 +02:00
945f2e1a97 css index 2025-03-31 10:20:22 +02:00
de58b74eeb font-family 2025-03-24 14:50:57 +01:00
0dd438af9a Fix affichage index admin 2025-03-24 14:38:38 +01:00
7 changed files with 48 additions and 32 deletions

View File

@ -1,3 +1,7 @@
html{
font-family: "Quicksand Light"; !important;
}
#container_modal { #container_modal {
background-color: white; background-color: white;
margin-left: 20%; /* Centrage vertical */ margin-left: 20%; /* Centrage vertical */

View File

@ -1,3 +1,7 @@
html{
font-family: "Quicksand Light"; !important;
}
/* Style pour chaque élément d'information de l'utilisateur */ /* Style pour chaque élément d'information de l'utilisateur */
.user-info-item { .user-info-item {
display: flex; display: flex;

View File

@ -1,4 +1,6 @@
html{
font-family: "Quicksand Light"; !important;
}
/* Page container */ /* Page container */
.page-container { .page-container {
width: 100%; width: 100%;

View File

@ -1,4 +1,6 @@
html{
font-family: "Quicksand Light"; !important;
}
/* Page container */ /* Page container */
.page-container { .page-container {
width: 100%; width: 100%;

View File

@ -8,3 +8,6 @@
height: 100%; /* Hauteur du contenu de la modal */ height: 100%; /* Hauteur du contenu de la modal */
box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.2); box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.2);
} }
html{
font-family: "Quicksand Light"; !important;
}

View File

@ -1,3 +1,7 @@
html{
font-family: "Quicksand Light"; !important;
}
.top-bar { .top-bar {
background-color: #db5559; background-color: #db5559;
width: calc(100% - 18%); /*Calcule la totalité de l'écran - le left-background */ width: calc(100% - 18%); /*Calcule la totalité de l'écran - le left-background */
@ -10,21 +14,10 @@
align-items: center; align-items: center;
padding: 0 20px; padding: 0 20px;
color: white; color: white;
font-size: 18px; font-size: 16px;
box-sizing: border-box; /* Inclut le padding dans la largeur totale */ box-sizing: border-box; /* Inclut le padding dans la largeur totale */
} }
.user-role {
background-color: white;
color: black;
padding: 10px 15px;
font-weight: bold;
overflow: hidden;
}
.left-background { .left-background {
background-color: #db5559; background-color: #db5559;
width: 18%; width: 18%;
@ -34,7 +27,6 @@
left: 0; left: 0;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between;
} }
@ -57,12 +49,11 @@ li {
.btn-custom { .btn-custom {
background-color: #FFFFFF; background-color: #FFFFFF;
color: black; color: black;
padding: 15px 40px; padding: 15px;
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;
border-right: 5px solid #db5559; border-right: 5px solid #db5559;
border-left: 5px solid #db5559; border-left: 5px solid #db5559;
} }
@ -88,8 +79,6 @@ li {
.Information-perso { .Information-perso {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding: 20px;
margin-top: auto;
} }
.btn-info-compte, .btn-info-exit { .btn-info-compte, .btn-info-exit {
@ -104,12 +93,12 @@ li {
.btn-info-compte { .btn-info-compte {
width: 50%; width: 50%;
height: 30px; height: 20px;
} }
.btn-info-exit { .btn-info-exit {
width: 10%; width: 10%;
height: 30px; height: 20px;
} }
/* Style pour la modal (cachée par défaut) */ /* Style pour la modal (cachée par défaut) */

View File

@ -38,6 +38,17 @@
<div> <div>
Bonjour, {{ app.user.prenom }} Bonjour, {{ app.user.prenom }}
</div> </div>
<div class="Information-perso">
<a href="{{ path('update-user', { 'id': app.user.id }) }}" class="btn-info-compte icon-container">
<i class="icon-medium"> {{ ux_icon('ph:user-circle-fill') }}</i>
<span>Compte</span>
</a>
<div class="btn-info-exit icon-container">
<a href="{{ path('app_logout') }}" class="icon-medium">
{{ ux_icon('iconamoon:exit-bold') }}
</a>
</div>
</div>
</div> </div>
<!-- Left Menu --> <!-- Left Menu -->
@ -76,6 +87,18 @@
<span>Voir tendances</span> <span>Voir tendances</span>
</div> </div>
</li> </li>
<li>
<div class="btn-custom icon-container">
<i class="icon-medium"> {{ ux_icon('icon-park-outline:view-list') }}</i>
<span>Commandes</span>
</div>
</li>
<li>
<div class="btn-custom icon-container">
<i class="icon-medium"> {{ ux_icon('fluent-mdl2:reservation-orders') }}</i>
<span>Réservation</span>
</div>
</li>
</ul> </ul>
</div> </div>
{% elseif is_granted('ROLE_CUISINIER') %} {% elseif is_granted('ROLE_CUISINIER') %}
@ -117,17 +140,6 @@
</ul> </ul>
</div> </div>
{% endif %} {% endif %}
<div class="Information-perso">
<a href="{{ path('update-user', { 'id': app.user.id }) }}" class="btn-info-compte icon-container">
<i class="icon-medium"> {{ ux_icon('ph:user-circle-fill') }}</i>
<span>Compte</span>
</a>
<div class="btn-info-exit icon-container">
<a href="{{ path('app_logout') }}" class="icon-medium">
{{ ux_icon('iconamoon:exit-bold') }}
</a>
</div>
</div>
</div> </div>
{% block container_modal %} {% block container_modal %}