From a263350b56c556b34541dd4e2f23e2a302755062 Mon Sep 17 00:00:00 2001 From: sladecraven Date: Tue, 8 Dec 2020 21:41:00 +0100 Subject: [PATCH] #17 Gestion heure et calendrier --- fonts/{heures.ttf => heures_draconiques.ttf} | Bin styles/simple.css | 147 +++++++++++-------- system.json | 4 +- templates/calendar-editor-template.html | 58 ++++++++ templates/calendar-template.html | 35 +++-- templates/heures-select-option.html | 12 ++ 6 files changed, 177 insertions(+), 79 deletions(-) rename fonts/{heures.ttf => heures_draconiques.ttf} (100%) create mode 100644 templates/calendar-editor-template.html create mode 100644 templates/heures-select-option.html diff --git a/fonts/heures.ttf b/fonts/heures_draconiques.ttf similarity index 100% rename from fonts/heures.ttf rename to fonts/heures_draconiques.ttf diff --git a/styles/simple.css b/styles/simple.css index 753d3317..6c083eee 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -19,6 +19,10 @@ font-family: "CaslonAntique"; src: url('../fonts/CaslonAntique.ttf') format("truetype"); } + @font-face { + font-family: "heures Draconiques"; + src: url('../fonts/heures_draconiques.ttf') format("truetype"); + } :root { /* =================== 1. ACTOR SHEET FONT STYLES =========== */ @@ -878,23 +882,42 @@ ul, li { grid-row: 1; grid-column: 1; width: fit-content; - height: 75px; + height: 84px; margin: 0; padding: 0; border: 1px solid #000; border-radius: 3%; background: rgba(0, 0, 0, 0.5); + font-family: "GoudyAcc"; } #calendar-hdr{ - display: grid; + display: grid; font-size: 1rem; margin: 3px; padding: 4px; - text-align: center; height: 25px; width: fit-content; min-width: 200px; - border-bottom: 1px solid #111; + border-bottom: 1px solid #111; + color: #CCC; + float: left; +} +.calendar-date-rdd { + font-family: "GoudyAcc"; + color: #CCC; + font-weight: bold; + font-size: 1.10rem; + opacity: 90; +} +#calendar--move-handle { + font-family: "GoudyAcc"; + font-size: 13px; + line-height: 1; + text-align: center; + padding: 0; + margin: 0; + border: none; + flex: 1; } #calendar-date{ grid-row: 1; @@ -924,41 +947,18 @@ ul, li { opacity: 0; cursor: pointer; } - +#calendar-icone-heure { + font-family: "heures Draconiques"; + opacity: 90; + font-size: 1.25rem; + color: #CCC; +} #calendar-hdr:hover #calendar-date { opacity: 0; } #calendar-hdr:hover #calendar-date-num{ opacity: 1; } -#calendar-events{ - grid-row: 1; - grid-column: 1; - float: left; - margin-right: 5px; - width: 10%; - text-align: center; -} -#calendar-events:hover { - color: #FFF; - border: 0px solid #000; - cursor: pointer; -} - -#calendar-weather{ - grid-row: 1; - grid-column: 3; - float: inline-end; - margin-left: 5px; - width: 10%; - text-align: center; -} -#calendar-weather:hover { - color: #FFF; - border: 0px solid #000; - cursor: pointer; -} - .calendar-container{ padding-top: 3px; padding-bottom: 20px; @@ -968,7 +968,8 @@ ul, li { display: grid; float: left; margin: 2px; - grid-row-gap: 3px; + grid-row-gap: 3px; + color: rgba(0, 0, 0, 0.5); } .calendar-btn-container-right{ width: 20%; @@ -977,106 +978,125 @@ ul, li { margin: 2px; grid-row-gap: 3px; } -#calendar-btn-sec{ +#calendar-btn-edit{ grid-row: 1; grid-column: 1; margin: auto; color: rgba(0, 0, 0, 0.5); - cursor: not-allowed; } - -#calendar-btn-halfMin{ +#calendar-btn-edit:hover { + color: #FFF; + border: 0px solid #000; + cursor: pointer; +} +#calendar-btn-1min{ + grid-row: 1; + grid-column: 1; + margin: auto; + color: rgba(0, 0, 0, 0.7); +} +#calendar-btn-5min{ grid-row: 1; grid-column: 2; margin: auto; - color: rgba(0, 0, 0, 0.5); - cursor: not-allowed; + color: rgba(0, 0, 0, 0.7); } -#calendar-btn-min{ +#calendar-btn-10min{ grid-row: 2; grid-column: 1; margin-left: 10px; + color: rgba(0, 0, 0, 0.7); } -#calendar-btn-fiveMin{ +#calendar-btn-20min{ grid-row: 2; grid-column: 2; margin-left: 10px; + color: rgba(0, 0, 0, 0.7); } -#calendar-btn-night{ +#calendar-btn-lyre{ grid-row: 1; grid-column: 1; height: fit-content; text-align: center; vertical-align: center; + color: rgba(0, 0, 0, 0.7); } -#calendar-btn-day{ +#calendar-btn-vaisseau{ grid-row: 1; grid-column: 2; height: fit-content; text-align: center; vertical-align: center; + color: rgba(0, 0, 0, 0.7); } -#calendar-btn-quick{ +#calendar-btn-30min{ grid-row: 2; grid-column: 1; height: fit-content; text-align: center; vertical-align: center; + color: rgba(0, 0, 0, 0.7); } - -#calendar-btn-long{ +#calendar-btn-1heure{ grid-row: 2; grid-column: 2; height: fit-content; text-align: center; vertical-align: center; + color: rgba(0, 0, 0, 0.7); } - -#calendar-btn-sec:hover { +#calendar-btn-container-left:hover{ + color: #FFF; border: 0px solid #000; - cursor: not-allowed; + cursor: pointer; } - -#calendar-btn-halfMin:hover { - border: 0px solid #000; - cursor: not-allowed; -} - -#calendar-btn-min:hover { +#calendar-btn-1min:hover { color: #FFF; border: 0px solid #000; cursor: pointer; } -#calendar-btn-fiveMin:hover { +#calendar-btn-5min:hover { color: #FFF; border: 0px solid #000; cursor: pointer; } -#calendar-btn-quick:hover { +#calendar-btn-10min:hover { color: #FFF; border: 0px solid #000; cursor: pointer; } -#calendar-btn-long:hover { +#calendar-btn-20min:hover { color: #FFF; border: 0px solid #000; cursor: pointer; } -#calendar-btn-day:hover { +#calendar-btn-30min:hover { color: #FFF; border: 0px solid #000; cursor: pointer; } -#calendar-btn-night:hover{ +#calendar-btn-1heure:hover { + color: #FFF; + border: 0px solid #000; + cursor: pointer; +} + +#calendar-btn-vaisseau:hover { + color: #FFF; + border: 0px solid #000; + cursor: pointer; +} + +#calendar-btn-lyre:hover{ color: #FFF; border: 0px solid #000; cursor: pointer; @@ -1100,7 +1120,8 @@ ul, li { } .calendar-time{ grid-column: 1; - grid-row: 2; + grid-row: 2; + font-size: 1.10rem; text-align: center; margin: auto; cursor: pointer; diff --git a/system.json b/system.json index 69d3c3d9..555b554a 100644 --- a/system.json +++ b/system.json @@ -2,9 +2,9 @@ "name": "foundryvtt-reve-de-dragon", "title": "Rêve de Dragon", "description": "Rêve de Dragon RPG for FoundryVTT", - "version": "1.1.1", + "version": "1.1.2", "minimumCoreVersion": "0.7.5", - "compatibleCoreVersion": "0.7.7", + "compatibleCoreVersion": "0.7.8", "templateVersion": 58, "author": "LeRatierBretonnien", "esmodules": [ "module/rdd-main.js", "module/hook-renderChatLog.js" ], diff --git a/templates/calendar-editor-template.html b/templates/calendar-editor-template.html new file mode 100644 index 00000000..b455b862 --- /dev/null +++ b/templates/calendar-editor-template.html @@ -0,0 +1,58 @@ +
+
+
+

Edition du Calendrier

+
+
+ + {{!-- Sheet Body --}} +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
diff --git a/templates/calendar-template.html b/templates/calendar-template.html index c4f1e96f..e4b8496e 100644 --- a/templates/calendar-template.html +++ b/templates/calendar-template.html @@ -1,26 +1,33 @@
-

- DateDateNum - -

+ +
+

Jour {{jourMois}} de {{nomMois}} ({{nomSaison}})

+
+ {{#if isGM}}
- - - - + + + +
+ {{else}} +
+
+ {{/if}}
-

Day of the Week

-

Time

• +

H {{nomHeure}}

+

{{heuresRelative}}:{{minutesRelative}}

•
+ {{#if isGM}}
- - - - + + + +
+ {{/if}}
diff --git a/templates/heures-select-option.html b/templates/heures-select-option.html new file mode 100644 index 00000000..b92057be --- /dev/null +++ b/templates/heures-select-option.html @@ -0,0 +1,12 @@ + + + + + + + + + + + +