From 817fa8e62a67bff5680149f0b38dffc0b68f4e5a Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandeme@gmail.com>
Date: Sun, 22 Jun 2025 23:55:08 +0200
Subject: [PATCH] Boutons de l'horloge

---
 changelog.md                        |  6 ++---
 css/foundryvtt-reve-de-dragon.css   | 28 +++++++++------------
 less/foundryvtt-reve-de-dragon.less | 28 ++++++++++-----------
 templates/time/calendar.hbs         | 38 ++++++++++++++++++++---------
 4 files changed, 54 insertions(+), 46 deletions(-)

diff --git a/changelog.md b/changelog.md
index b9acd5cb..a6cb4a3a 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,9 +3,9 @@
 ## 13.0.4 - Le long discours d'Illysis
 
 - On peut de nouveau modifier les descriptions
-- Corrections mineures
-  - ne pas proposer l'export csv par défaut
-  
+- ne pas proposer l'export csv par défaut
+- Corrections d'affichage
+  - correction des boutons de l'horloge
 
 ## 13.0.3 - La dernière auberge d'Illysis
 
diff --git a/css/foundryvtt-reve-de-dragon.css b/css/foundryvtt-reve-de-dragon.css
index 0f3a9776..dd1391fb 100644
--- a/css/foundryvtt-reve-de-dragon.css
+++ b/css/foundryvtt-reve-de-dragon.css
@@ -2170,8 +2170,6 @@ select,
   display: grid;
   background: hsl(0, 0%, 20%);
   color: hsla(0, 0%, 80%, 0.8);
-  grid-row: 1;
-  grid-column: 10;
 }
 .system-foundryvtt-reve-de-dragon .calendar-boutons-heure .calendar-btn:is(.calendar-lyre,.calendar-vaisseau) img {
   color: hsla(0, 0%, 100%, 0.5);
@@ -2184,40 +2182,38 @@ select,
 .system-foundryvtt-reve-de-dragon .calendar-boutons-heure i {
   border: 1px solid rgba(0, 0, 0, 0);
 }
-.system-foundryvtt-reve-de-dragon .calendar-boutons-heure i:hover {
+.system-foundryvtt-reve-de-dragon .calendar-boutons-heure a:hover {
   color: var(--color-controls-hover);
   border: 1px solid var(--color-control-border-hover);
   cursor: pointer;
 }
 .system-foundryvtt-reve-de-dragon .calendar-1min {
-  grid-column: 1;
+  grid-column: 1/1;
 }
 .system-foundryvtt-reve-de-dragon .calendar-5min {
-  grid-column: 2;
+  grid-column: 2/2;
 }
 .system-foundryvtt-reve-de-dragon .calendar-15min {
-  grid-column: 3;
+  grid-column: 3/3;
 }
 .system-foundryvtt-reve-de-dragon .calendar-30min {
-  grid-column: 4;
+  grid-column: 4/4;
 }
 .system-foundryvtt-reve-de-dragon .calendar-60min {
-  grid-column: 5;
+  grid-column: 5/5;
 }
 .system-foundryvtt-reve-de-dragon .calendar-1heure {
-  grid-column: 6;
+  grid-column: 6/6;
 }
 .system-foundryvtt-reve-de-dragon .calendar-lyre {
-  grid-column: 7;
+  grid-column: 7/8;
 }
 .system-foundryvtt-reve-de-dragon .calendar-vaisseau {
-  grid-column: 8;
+  grid-column: 9/10;
 }
-.system-foundryvtt-reve-de-dragon .calendar-set-datetime {
-  grid-column: 9;
-}
-.system-foundryvtt-reve-de-dragon .calendar-astrologie {
-  grid-column: 10;
+.system-foundryvtt-reve-de-dragon :is(.calendar-lyre,.calendar-vaisseau) {
+  display: flex;
+  flex-direction: row;
 }
 .system-foundryvtt-reve-de-dragon div.horloge-analogique {
   border: none;
diff --git a/less/foundryvtt-reve-de-dragon.less b/less/foundryvtt-reve-de-dragon.less
index e57fb7ec..336efbdd 100644
--- a/less/foundryvtt-reve-de-dragon.less
+++ b/less/foundryvtt-reve-de-dragon.less
@@ -1766,9 +1766,6 @@
     display: grid;
     background: hsla(0, 0%, 20%, 1);
     color: hsla(0, 0%, 80%, 0.8);
-
-    grid-row: 1;
-    grid-column: 10;
   }
 
   .calendar-boutons-heure .calendar-btn:is(.calendar-lyre,.calendar-vaisseau) img {
@@ -1783,23 +1780,24 @@
   .calendar-boutons-heure i {
     border: 1px solid rgba(0, 0, 0, 0);
   }
-  .calendar-boutons-heure i:hover {
+  .calendar-boutons-heure a:hover {
     color: var(--color-controls-hover);
     border: 1px solid var(--color-control-border-hover);
     cursor: pointer;
   }
 
-  .calendar-1min     { grid-column: 1;}
-  .calendar-5min     { grid-column: 2;}
-  .calendar-15min    { grid-column: 3;}
-  .calendar-30min    { grid-column: 4;}
-  .calendar-60min    { grid-column: 5;}
-  .calendar-1heure   { grid-column: 6;}
-  .calendar-lyre     { grid-column: 7;}
-  .calendar-vaisseau { grid-column: 8;}
-  .calendar-set-datetime { grid-column: 9;}
-  .calendar-astrologie   { grid-column: 10;}
-
+  .calendar-1min     { grid-column: 1/1; }
+  .calendar-5min     { grid-column: 2/2; }
+  .calendar-15min    { grid-column: 3/3; }
+  .calendar-30min    { grid-column: 4/4; }
+  .calendar-60min    { grid-column: 5/5; }
+  .calendar-1heure   { grid-column: 6/6; }
+  .calendar-lyre     { grid-column: 7/8; }
+  .calendar-vaisseau { grid-column: 9/10; }
+  :is(.calendar-lyre,.calendar-vaisseau) {
+    display: flex;
+    flex-direction: row;
+  }
   div.horloge-analogique {
     border: none;
     margin: 0;
diff --git a/templates/time/calendar.hbs b/templates/time/calendar.hbs
index 321d4d5e..456ce2a7 100644
--- a/templates/time/calendar.hbs
+++ b/templates/time/calendar.hbs
@@ -1,18 +1,32 @@
 <div class="calendar-horloge">
 	{{#if isGM}}
 		<div class="calendar-boutons-heure">
-			<i class="calendar-btn calendar-1min" data-calendar-avance="1" data-tooltip="Avancer de 1 minute">+1</i>
-			<i class="calendar-btn calendar-5min" data-calendar-avance="5" data-tooltip="Avancer de 5 minutes">+5</i>
-			<i class="calendar-btn calendar-15min" data-calendar-avance="15" data-tooltip="Avancer de 15 minutes">+15</i>
-			<i class="calendar-btn calendar-30min" data-calendar-avance="30" data-tooltip="Avancer de 30 minutes">+30</i>
-			<i class="calendar-btn calendar-60min" data-calendar-avance="60" data-tooltip="Avancer de 60 minutes" >+60</i>
-			<i class="calendar-btn calendar-1heure" data-calendar-avance="120" data-tooltip="Avancer d'1 heure" >+1h</i>
-			<i class="calendar-btn calendar-lyre fas fa-forward" data-calendar-set="6" data-tooltip="Avancer à Lyre">
-				<img src="systems/foundryvtt-reve-de-dragon/icons/heures/hd07.svg" data-tooltip="Avancer à Lyre"/>
-			</i>
-			<i class="calendar-btn calendar-vaisseau fas fa-forward" data-calendar-set="0" data-tooltip="Avancer au Vaisseau">
-				<img src="systems/foundryvtt-reve-de-dragon/icons/heures/hd01.svg" data-tooltip="Avancer au Vaisseau"/>
-			</i>
+			<a class="calendar-btn calendar-1min" data-calendar-avance="1" data-tooltip="Avancer de 1 minute">
+				<i>+1</i>
+			</a>
+			<a class="calendar-btn calendar-5min" data-calendar-avance="5" data-tooltip="Avancer de 5 minutes">
+				<i>+5</i>
+			</a>
+			<a class="calendar-btn calendar-15min" data-calendar-avance="15" data-tooltip="Avancer de 15 minutes">
+				<i>+15</i>
+			</a>
+			<a class="calendar-btn calendar-30min" data-calendar-avance="30" data-tooltip="Avancer de 30 minutes">
+				<i>+30</i>
+			</a>
+			<a class="calendar-btn calendar-60min" data-calendar-avance="60" data-tooltip="Avancer de 60 minutes">
+				<i>+60</i>
+			</a>
+			<a class="calendar-btn calendar-1heure" data-calendar-avance="120" data-tooltip="Avancer d'1 heure">
+				<i>+1h</i>
+			</a>
+			<a class="calendar-btn calendar-lyre" data-calendar-set="6" data-tooltip="Avancer à Lyre">
+				<i class="fas fa-forward"></i>
+				<img src="systems/foundryvtt-reve-de-dragon/icons/heures/hd07.svg"/>
+			</a>
+			<a class="calendar-btn calendar-vaisseau" data-calendar-set="0" data-tooltip="Avancer au Vaisseau">
+				<i class="fas fa-forward"></i>
+				<img src="systems/foundryvtt-reve-de-dragon/icons/heures/hd01.svg"/>
+			</a>
 		</div>
 	{{/if}}
 	<div class="horloge-digitale">