diff --git a/styles/simple.css b/styles/simple.css index 32072afd..790396eb 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -353,10 +353,10 @@ table {border: 1px solid #7a7971;} flex: 'flex-shrink' ; } :is(.flex-grow, .flex-grow-3) { - flex-grow : 3; + flex-grow: 3; } .flex-grow-2 { - flex-grow : 2; + flex-grow: 2; } /* Styles limited to foundryvtt-reve-de-dragon sheets */ .equipement-nom { @@ -538,24 +538,40 @@ input:is(.blessure-premiers_soins, .blessure-soins_complets) { width: max-content; } -.rdd.sheet .window-content .sheet-body .carac-list .caracteristique > .carac-label { - flex-basis: 50%; -} -.rdd.sheet .window-content .sheet-body .carac-list .caracteristique > .attribut-label { - flex-basis: 50%; -} -.rdd.sheet .window-content .sheet-body .carac-list .caracteristique > .competence-value.total { - flex-grow: 1; - text-align: right; +.carac-label { + flex-basis: 40%; } .rdd.sheet .window-content .sheet-body .carac-list .caracteristique > .utiliser-attribut { flex-basis: available; flex-grow: 1; } -.rdd.sheet .window-content .sheet-body .carac-list .caracteristique > * { +.rdd.sheet .window-content .sheet-body .carac-list .caracteristique .carac-value { + flex-basis: 15%; + flex-grow: 0; +} +.rdd.sheet .window-content .sheet-body .carac-list .caracteristique .carac-xp { flex-basis: 13%; flex-grow: 0; } +.rdd.sheet .window-content .sheet-body .carac-list .caracteristique .derivee-label { + flex-grow: 1; +} +.rdd.sheet .window-content .sheet-body .carac-list .caracteristique .derivee-value { + flex-grow: 0; + flex-basis: 15%; + margin-right: 0.2rem; + margin-left: 0.2rem; +} +.rdd.sheet .window-content .sheet-body .carac-list .caracteristique .flex-grow-1 { + flex-grow: 1; +} +.rdd.sheet .window-content .sheet-body .carac-list .caracteristique .flex-grow-2 { + flex-grow: 2; +} +.rdd.sheet .window-content .sheet-body .carac-list .caracteristique .flex-grow-3 { + flex-grow: 3; +} + .editor { border: 2; @@ -1080,12 +1096,6 @@ div.competence-column div.categorie-competence{ margin-right: 0.2rem; margin-left: 0.2rem; } -.description-value { - flex-grow: 0; - flex-basis: 4rem; - margin-right: 0.2rem; - margin-left: 0.2rem; -} .competence-xp { flex-grow: 0; flex-basis: 2rem; diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index 5fd0ca0b..87e5b906 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -28,10 +28,8 @@ Équipement Description - {{!-- Sheet Body --}}
- {{!-- Carac Tab --}}
diff --git a/templates/actor/carac-derivee.html b/templates/actor/carac-derivee.html index 2820153b..fcfeb17c 100644 --- a/templates/actor/carac-derivee.html +++ b/templates/actor/carac-derivee.html @@ -1,55 +1,86 @@ -
    -
  • - Beauté : - -
  • - {{#each system.attributs as |attr key|}} - {{#unless (eq key 'hautrevant')}} -
  • - {{attr.label}} : - {{#if (eq key 'protection')}} - - {{else}} - - {{/if}} -
  • - {{/unless}} - {{/each}} -
  • - Chance actuelle - + + +
  • - {{#each system.compteurs as |compteur key|}} - {{#if (eq compteur.label 'Chance')}} - {{else if (eq compteur.label 'Experience')}} - {{else if compteur.isInput}} -
  • - {{compteur.label}} - {{#if (eq compteur.label 'Ethylisme')}} - - {{else}} - - {{/if}} - - {{#if compteur.isStress}} - Transformer - {{else if (eq compteur.label 'Moral')}} - Jet de moral situation malheureuse - Jet de moral situation neutre - Jet de moral situation heureuse - {{else}} - - {{/if}} - -
  • - {{/if}} - {{/each}} +
    +
  • + + +
  • +
  • + + +
  • +
  • + + + + +
  • +
  • + + +
  • +
  • + + + + +
  • + +
    +
  • + + + + +
  • +
  • + + + + +
  • +
  • + + +
  • + +
    +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
diff --git a/templates/actor/carac-main.html b/templates/actor/carac-main.html index 74590d5c..85462f73 100644 --- a/templates/actor/carac-main.html +++ b/templates/actor/carac-main.html @@ -1,41 +1,36 @@
    {{#each system.carac as |carac key|}} - {{#if carac.isLevelUp}} -
  • - {{else}} -
  • - {{/if}} +
  • {{#if (eq key 'taille')}} {{carac.label}}
  • + {{/each}}
diff --git a/templates/actor/carac-total.html b/templates/actor/carac-total.html index b560bead..a90d1b90 100644 --- a/templates/actor/carac-total.html +++ b/templates/actor/carac-total.html @@ -1,6 +1,6 @@
  • - Total Caractéristiques - {{calc.caracTotal}} + Total Caractéristiques + {{calc.caracTotal}}
diff --git a/templates/actor/xp-competences.html b/templates/actor/xp-competences.html index fa6f29e0..3cf71bbe 100644 --- a/templates/actor/xp-competences.html +++ b/templates/actor/xp-competences.html @@ -1,9 +1,9 @@
  • - + {{#if options.vueDetaillee}} - + {{else}} {{/if}}