From 30bc5f49e8a385a2e27b2125d8a3886d4e80a4a3 Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Wed, 11 Sep 2024 14:15:26 +0200
Subject: [PATCH] Ajustement du rendu - Fix #130 - Fix #141

---
 src/agenda_culturel/static/style.scss         | 27 +++++++++++--------
 .../templates/agenda_culturel/page-month.html |  2 +-
 .../templates/agenda_culturel/page-week.html  |  7 ++++-
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/agenda_culturel/static/style.scss b/src/agenda_culturel/static/style.scss
index 3f83a62..4c817ef 100644
--- a/src/agenda_culturel/static/style.scss
+++ b/src/agenda_culturel/static/style.scss
@@ -22,6 +22,7 @@ $enable-responsive-typography: true;
 }
 
 :root {
+    --pico-font-size: 80%;
     --spacing: 0.4rem;
     
     h1 {
@@ -306,27 +307,31 @@ header .title {
     text-align: center;
 }
 
+.title.small h1 {
+    font-size: 150%;
+}
+
 .navigation {
-    @media only screen and (min-width: 992px) {
-        margin-top: -3.5em;
-    }
     margin: 1em 0;
+    height: 2.5em;
+    @media only screen and (min-width: 992px) {
+        margin: -3.4em 0 3.4em 0;
+        height: fit-content;
+    }
+    
     padding: 0;
-    display: flex;
-    flex-direction: row;
-    gap: 0.2em;
     div {
-        width: 0;
-        flex: 1 1 0px;
-        a {
-            width: 100%;
-        }
+        width: fit-content;
+        float: left;
         @media only screen and (min-width: 992px) {
             a {
                 width: 10em;
             }
         }
     }
+    div.right {
+        float: right;
+    }
     
 }
 
diff --git a/src/agenda_culturel/templates/agenda_culturel/page-month.html b/src/agenda_culturel/templates/agenda_culturel/page-month.html
index b0fd3d6..715a707 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page-month.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page-month.html
@@ -32,7 +32,7 @@
 
  <article>
     <header>
-        <div class="title"><h1>{{ calendar.firstdate | date:"F o" }}</h1></div>
+        <div class="title small"><h1>{{ calendar.firstdate | date:"F o" }}</h1></div>
         <div class="navigation">
             <div>
             {% if calendar.firstdate|shift_day:-1|not_before_first %}
diff --git a/src/agenda_culturel/templates/agenda_culturel/page-week.html b/src/agenda_culturel/templates/agenda_culturel/page-week.html
index 4bcd8c6..06b1b00 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page-week.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page-week.html
@@ -28,7 +28,12 @@
 
 <article>
     <header>
-        <div class="title"><h1>Semaine du {{ calendar.calendar_days_list.0.date |date|frdate }}</h1></div>
+        <div class="title small"><h1>
+            {% if calendar.today_in_calendar %}
+            Cette semaine
+            {% else %}
+            semaine du {{ calendar.calendar_days_list.0.date |date:"j F"|frdate }}
+            {% endif %}</h1></div>
         <div class="navigation">
             <div>
             {% if calendar.firstdate|shift_day:-1|not_before_first %}