From c0e75c50352da05594eb751fcaac799bc94ebcee Mon Sep 17 00:00:00 2001 From: tleno Date: Sun, 15 Dec 2024 17:00:02 +0100 Subject: [PATCH] Fix broken images, add missing Valet profile, add textareas for Fencing/Occultism skill notes and improves ticks visibility in the swordbar --- Lames du Cardinal v2/lames_cardinal.css | 45 ++++++++++++++----- Lames du Cardinal v2/lames_cardinal.html | 28 +++++++----- .../src/abstracts/variables.sass | 3 +- .../src/components/nstatebox/nstatebox.pug | 4 +- .../src/components/nstatebox/nstatebox.sass | 12 +++++ .../src/components/profile/profile.pug | 1 + .../src/components/widgets/widgets.pug | 2 +- .../src/components/widgets/widgets.sass | 7 ++- .../src/modules/1-personnage/personnage.pug | 4 +- .../src/modules/1-personnage/personnage.sass | 6 +-- .../src/modules/2-competences/competences.pug | 3 +- .../modules/2-competences/competences.sass | 9 +++- 12 files changed, 88 insertions(+), 36 deletions(-) diff --git a/Lames du Cardinal v2/lames_cardinal.css b/Lames du Cardinal v2/lames_cardinal.css index 85ee05bb8f0..cddc54b1881 100644 --- a/Lames du Cardinal v2/lames_cardinal.css +++ b/Lames du Cardinal v2/lames_cardinal.css @@ -52,10 +52,10 @@ display: flex; } .charsheet input[name=attr_page][value=personnage] ~ main, .charsheet input[name=attr_page][value=competences] ~ main { - background-image: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/lames-cardinal-v2/assets/dragonrouge.jpg"); + background-image: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Lames du Cardinal v2/assets/dragonrouge.jpg"); } .charsheet input[name=attr_page][value=escrime] ~ main, .charsheet input[name=attr_page][value=ressources] ~ main { - background-image: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/lames-cardinal-v2/assets/dragonnoir.jpg"); + background-image: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Lames du Cardinal v2/assets/dragonnoir.jpg"); } .charsheet h3, .charsheet h4 { @@ -171,12 +171,16 @@ font-weight: bold; width: 20%; } -.charsheet label.textLabelled > input[type=text] { +.charsheet label.textLabelled > input[type=text], .charsheet label.textLabelled > input[type=number] { border: none; background: none; width: calc(80% - 10px); margin-left: 10px; } +.charsheet label.textLabelled > input[type=number] { + width: calc(70% - 10px); + text-align: right; +} .charsheet label > input[type=checkbox][name=attr_expand] { position: absolute; width: 10px; @@ -225,6 +229,16 @@ .charsheet .nstate.healthbox > input[type=hidden][value="1"] ~ span.nstateopt.health_tenacity, .charsheet .nstate.healthbox > input[type=hidden][value="2"] ~ span.nstateopt.health_longTenacity, .charsheet .nstate.healthbox > input[type=hidden][value="3"] ~ span.nstateopt.health_wound { display: flex; } +.charsheet .nstate.healthbox > span.nstateopt { + font-size: 1.8em; +} +.charsheet .nstate.healthbox > span.nstateopt.health_tenacity, .charsheet .nstate.healthbox > span.nstateopt.health_longTenacity { + margin-left: -18px; + margin-top: -3px; +} +.charsheet .nstate.healthbox > span.nstateopt.health_wound { + margin-left: -15px; +} .charsheet .fillLeft > input[type=hidden][value="8"] ~ label:nth-of-type(9) > span::before, .charsheet .fillLeft > input[type=hidden][value="8"] ~ label:nth-of-type(8) > span::before, .charsheet .fillLeft > input[type=hidden][value="8"] ~ label:nth-of-type(7) > span::before, .charsheet .fillLeft > input[type=hidden][value="8"] ~ label:nth-of-type(6) > span::before, .charsheet .fillLeft > input[type=hidden][value="8"] ~ label:nth-of-type(5) > span::before, .charsheet .fillLeft > input[type=hidden][value="8"] ~ label:nth-of-type(4) > span::before, .charsheet .fillLeft > input[type=hidden][value="8"] ~ label:nth-of-type(3) > span::before, .charsheet .fillLeft > input[type=hidden][value="8"] ~ label:nth-of-type(2) > span::before, .charsheet .fillLeft > input[type=hidden][value="8"] ~ label:nth-of-type(1) > span::before, .charsheet .fillLeft > input[type=hidden][value="7"] ~ label:nth-of-type(8) > span::before, .charsheet .fillLeft > input[type=hidden][value="7"] ~ label:nth-of-type(7) > span::before, .charsheet .fillLeft > input[type=hidden][value="7"] ~ label:nth-of-type(6) > span::before, .charsheet .fillLeft > input[type=hidden][value="7"] ~ label:nth-of-type(5) > span::before, .charsheet .fillLeft > input[type=hidden][value="7"] ~ label:nth-of-type(4) > span::before, .charsheet .fillLeft > input[type=hidden][value="7"] ~ label:nth-of-type(3) > span::before, .charsheet .fillLeft > input[type=hidden][value="7"] ~ label:nth-of-type(2) > span::before, .charsheet .fillLeft > input[type=hidden][value="7"] ~ label:nth-of-type(1) > span::before, .charsheet .fillLeft > input[type=hidden][value="6"] ~ label:nth-of-type(7) > span::before, .charsheet .fillLeft > input[type=hidden][value="6"] ~ label:nth-of-type(6) > span::before, .charsheet .fillLeft > input[type=hidden][value="6"] ~ label:nth-of-type(5) > span::before, .charsheet .fillLeft > input[type=hidden][value="6"] ~ label:nth-of-type(4) > span::before, .charsheet .fillLeft > input[type=hidden][value="6"] ~ label:nth-of-type(3) > span::before, .charsheet .fillLeft > input[type=hidden][value="6"] ~ label:nth-of-type(2) > span::before, .charsheet .fillLeft > input[type=hidden][value="6"] ~ label:nth-of-type(1) > span::before, .charsheet .fillLeft > input[type=hidden][value="5"] ~ label:nth-of-type(6) > span::before, .charsheet .fillLeft > input[type=hidden][value="5"] ~ label:nth-of-type(5) > span::before, .charsheet .fillLeft > input[type=hidden][value="5"] ~ label:nth-of-type(4) > span::before, .charsheet .fillLeft > input[type=hidden][value="5"] ~ label:nth-of-type(3) > span::before, .charsheet .fillLeft > input[type=hidden][value="5"] ~ label:nth-of-type(2) > span::before, .charsheet .fillLeft > input[type=hidden][value="5"] ~ label:nth-of-type(1) > span::before, .charsheet .fillLeft > input[type=hidden][value="4"] ~ label:nth-of-type(5) > span::before, .charsheet .fillLeft > input[type=hidden][value="4"] ~ label:nth-of-type(4) > span::before, .charsheet .fillLeft > input[type=hidden][value="4"] ~ label:nth-of-type(3) > span::before, .charsheet .fillLeft > input[type=hidden][value="4"] ~ label:nth-of-type(2) > span::before, .charsheet .fillLeft > input[type=hidden][value="4"] ~ label:nth-of-type(1) > span::before, .charsheet .fillLeft > input[type=hidden][value="3"] ~ label:nth-of-type(4) > span::before, .charsheet .fillLeft > input[type=hidden][value="3"] ~ label:nth-of-type(3) > span::before, .charsheet .fillLeft > input[type=hidden][value="3"] ~ label:nth-of-type(2) > span::before, .charsheet .fillLeft > input[type=hidden][value="3"] ~ label:nth-of-type(1) > span::before, .charsheet .fillLeft > input[type=hidden][value="2"] ~ label:nth-of-type(3) > span::before, .charsheet .fillLeft > input[type=hidden][value="2"] ~ label:nth-of-type(2) > span::before, .charsheet .fillLeft > input[type=hidden][value="2"] ~ label:nth-of-type(1) > span::before, .charsheet .fillLeft > input[type=hidden][value="1"] ~ label:nth-of-type(2) > span::before, .charsheet .fillLeft > input[type=hidden][value="1"] ~ label:nth-of-type(1) > span::before, .charsheet .fillLeft > input[type=hidden][value="0"] ~ label:nth-of-type(1) > span::before { content: "X"; @@ -320,7 +334,7 @@ padding: 10px 41px; padding-top: 105px; border-right: dotted 1px #395b63; - background-image: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/lames-cardinal-v2/assets/epee.png"); + background-image: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Lames du Cardinal v2/assets/epee.png"); background-size: 100px 395px; background-repeat: no-repeat; flex-basis: content; @@ -459,10 +473,6 @@ flex-wrap: wrap; align-content: flex-start; } -.charsheet section#page-personnage > #name { - width: 50%; - height: 30px; -} .charsheet section#page-personnage > #arcanes { padding-top: 12px; width: 100%; @@ -511,16 +521,16 @@ margin-left: calc(50% - 40px); } .charsheet section#page-competences > div#caracs > div.skillblock#griffe > .carac > .icon { - background-image: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/lames-cardinal-v2/assets/griffe.png"); + background-image: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Lames du Cardinal v2/assets/griffe.png"); } .charsheet section#page-competences > div#caracs > div.skillblock#souffle > .carac > .icon { - background-image: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/lames-cardinal-v2/assets/souffle.png"); + background-image: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Lames du Cardinal v2/assets/souffle.png"); } .charsheet section#page-competences > div#caracs > div.skillblock#sang > .carac > .icon { - background-image: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/lames-cardinal-v2/assets/sang.png"); + background-image: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Lames du Cardinal v2/assets/sang.png"); } .charsheet section#page-competences > div#caracs > div.skillblock#ecaille > .carac > .icon { - background-image: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/lames-cardinal-v2/assets/ecaille.png"); + background-image: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Lames du Cardinal v2/assets/ecaille.png"); } .charsheet section#page-competences > div#freeskills { margin-top: 15px; @@ -535,6 +545,17 @@ border-radius: 0; width: 100%; } +.charsheet section#page-competences > div#freeskills textarea { + line-height: 24px; + padding-block: 0; + padding-left: 5px; + padding-right: 5px; + background: repeating-linear-gradient(to bottom, transparent 0 22px, lightgray 22px 23px, transparent 23px 24px) 50% 0/calc(100% - 48px) 100% no-repeat; + font-family: "Shadows Into Light"; + font-style: italic; + font-size: 16px; + width: 97%; +} .charsheet section#page-escrime { margin-top: 15px; diff --git a/Lames du Cardinal v2/lames_cardinal.html b/Lames du Cardinal v2/lames_cardinal.html index d1f735488f0..01e56ff0cb8 100644 --- a/Lames du Cardinal v2/lames_cardinal.html +++ b/Lames du Cardinal v2/lames_cardinal.html @@ -20,59 +20,57 @@
-
+
-
-
@@ -81,6 +79,9 @@
+ +
- +
diff --git a/Lames du Cardinal v2/src/abstracts/variables.sass b/Lames du Cardinal v2/src/abstracts/variables.sass index f60e68f4881..f2fee0da1fa 100644 --- a/Lames du Cardinal v2/src/abstracts/variables.sass +++ b/Lames du Cardinal v2/src/abstracts/variables.sass @@ -2,4 +2,5 @@ $emgrey:#446469 $emblue:#395b63 $emred:#672418 -$IMAGES_ROOT: 'https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/lames-cardinal-v2/assets/' \ No newline at end of file +//$IMAGES_ROOT: 'https://raw.githubusercontent.com/Calmacil/lames-cardinal-v2/main/assets/' +$IMAGES_ROOT: 'https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Lames du Cardinal v2/assets/' \ No newline at end of file diff --git a/Lames du Cardinal v2/src/components/nstatebox/nstatebox.pug b/Lames du Cardinal v2/src/components/nstatebox/nstatebox.pug index 1b26b743e37..66a54c93162 100644 --- a/Lames du Cardinal v2/src/components/nstatebox/nstatebox.pug +++ b/Lames du Cardinal v2/src/components/nstatebox/nstatebox.pug @@ -26,8 +26,8 @@ mixin healthBox(name, letter=none) label.healthboxwrapper +nstateBox(name).healthbox +nstateOption(' ').health_ok - +nstateOption('/').health_tenacity + +nstateOption('⟋').health_tenacity +nstateOption('X').health_wound - +nstateOption('\\').health_longTenacity + +nstateOption('⟍').health_longTenacity if letter != none span!= letter \ No newline at end of file diff --git a/Lames du Cardinal v2/src/components/nstatebox/nstatebox.sass b/Lames du Cardinal v2/src/components/nstatebox/nstatebox.sass index 2bd3e46b42a..4f9705104ab 100644 --- a/Lames du Cardinal v2/src/components/nstatebox/nstatebox.sass +++ b/Lames du Cardinal v2/src/components/nstatebox/nstatebox.sass @@ -27,3 +27,15 @@ &[value="2"] ~ span.nstateopt.health_longTenacity, &[value="3"] ~ span.nstateopt.health_wound display: flex + + &> span.nstateopt + font-size: 1.8em + + &.health_tenacity, + &.health_longTenacity + margin-left: -18px + margin-top: -3px + + &.health_wound + margin-left: -15px + diff --git a/Lames du Cardinal v2/src/components/profile/profile.pug b/Lames du Cardinal v2/src/components/profile/profile.pug index 2004c710b91..cf4a9c98284 100644 --- a/Lames du Cardinal v2/src/components/profile/profile.pug +++ b/Lames du Cardinal v2/src/components/profile/profile.pug @@ -7,6 +7,7 @@ mixin profile(name) option(value='aventurier') Aventurier option(value='commercant') Commerçant option(value='saltimbanque') Saltimbanque + option(value='valet') Valet +optgroup('Lettrés') option(value='artiste') Artiste option(value='erudit') Érudit diff --git a/Lames du Cardinal v2/src/components/widgets/widgets.pug b/Lames du Cardinal v2/src/components/widgets/widgets.pug index 0f1fdbea57d..73c1a38e2e6 100644 --- a/Lames du Cardinal v2/src/components/widgets/widgets.pug +++ b/Lames du Cardinal v2/src/components/widgets/widgets.pug @@ -38,7 +38,7 @@ mixin numberInput(name, value='') - {string} id - The `id` inpu attribute (and the `for` label attribute) - {string} value - The default value mixin numberLabelled(name, label, id, value='') - label(for=id)&attributes(attributes) + label(for=id)&attributes(attributes).textLabelled span!= label +numberInput(name, value)(id=id) diff --git a/Lames du Cardinal v2/src/components/widgets/widgets.sass b/Lames du Cardinal v2/src/components/widgets/widgets.sass index 8d270ae07c0..5e57774052d 100644 --- a/Lames du Cardinal v2/src/components/widgets/widgets.sass +++ b/Lames du Cardinal v2/src/components/widgets/widgets.sass @@ -54,12 +54,17 @@ font-weight: bold width: 20% - &> input[type=text] + &> input[type=text], + &> input[type=number] border: none background: none width: calc(80% - 10px) margin-left: 10px + &> input[type=number] + width: calc(70% - 10px) + text-align: right + /** Expand switches */ label &> input[type=checkbox][name='attr_expand'] diff --git a/Lames du Cardinal v2/src/modules/1-personnage/personnage.pug b/Lames du Cardinal v2/src/modules/1-personnage/personnage.pug index 00d5ec805ee..6a495058c91 100644 --- a/Lames du Cardinal v2/src/modules/1-personnage/personnage.pug +++ b/Lames du Cardinal v2/src/modules/1-personnage/personnage.pug @@ -1,10 +1,10 @@ section.page#page-personnage - div#name - +textLabelled('nom', 'Nom', 'name') div.col.col-2 + +textLabelled('nom', 'Nom', 'name') +textLabelled('age', 'Âge') +textLabelled('sex', 'Sexe') div.col.col-2 + +numberLabelled('pex', 'Points d’exp.', 'pex', 0) +profile('profile-1') +profile('profile-2') div#arcanes diff --git a/Lames du Cardinal v2/src/modules/1-personnage/personnage.sass b/Lames du Cardinal v2/src/modules/1-personnage/personnage.sass index cda52f0f85d..d7c75a981c0 100644 --- a/Lames du Cardinal v2/src/modules/1-personnage/personnage.sass +++ b/Lames du Cardinal v2/src/modules/1-personnage/personnage.sass @@ -2,9 +2,9 @@ flex-direction: row flex-wrap: wrap align-content: flex-start - &> #name - width: 50% - height: 30px + // &> #name + // width: 50% + // height: 30px &> #arcanes padding-top: 12px width: 100% diff --git a/Lames du Cardinal v2/src/modules/2-competences/competences.pug b/Lames du Cardinal v2/src/modules/2-competences/competences.pug index 6dfc8bdc323..d132eb569d2 100644 --- a/Lames du Cardinal v2/src/modules/2-competences/competences.pug +++ b/Lames du Cardinal v2/src/modules/2-competences/competences.pug @@ -35,6 +35,7 @@ section.page#page-competences div#freeskills div#escrime.col.col-2 +headerSkill('escrime', 'Escrime', 4).blue + +textareaInput('escrime_notes') div#occultisme.col.col-2 +headerSkill('occultisme', 'Occultisme', 0).red - +textInput('occultisme_notes', '') \ No newline at end of file + +textareaInput('occultisme_notes', '') \ No newline at end of file diff --git a/Lames du Cardinal v2/src/modules/2-competences/competences.sass b/Lames du Cardinal v2/src/modules/2-competences/competences.sass index 05ea6daf46a..f3b6f08b918 100644 --- a/Lames du Cardinal v2/src/modules/2-competences/competences.sass +++ b/Lames du Cardinal v2/src/modules/2-competences/competences.sass @@ -36,4 +36,11 @@ border: none border-bottom: dotted black 1px border-radius: 0 - width: 100% \ No newline at end of file + width: 100% + + & textarea + @include textareaLined(24px, 22px) + font-family: 'Shadows Into Light' + font-style: italic + font-size: 16px + width: 97% \ No newline at end of file