diff --git a/changelog.md b/changelog.md index 2a64bc40..5d7baedd 100644 --- a/changelog.md +++ b/changelog.md @@ -10,6 +10,8 @@ - Ajout d'une gravité de blessure sur les encaissement d'entités - Amélioration de champs numériques: ajout de min et max quand c'est utile - correction pour cuisiner depuis l'équipement +- les boutons dans les listes d'équipement sont mieux affichés sans retour à la ligne + ## 13.0.35 - Les travaux d'Illisys diff --git a/css/foundryvtt-reve-de-dragon.css b/css/foundryvtt-reve-de-dragon.css index 5ce0461c..611a5bfd 100644 --- a/css/foundryvtt-reve-de-dragon.css +++ b/css/foundryvtt-reve-de-dragon.css @@ -1120,49 +1120,27 @@ body { text-align: left; } .system-foundryvtt-reve-de-dragon .equipement-nom { - flex-grow: 3; + flex-grow: 4; + flex-shrink: 2; margin: 0; - justify-content: center; text-align: left; display: ruby; } .system-foundryvtt-reve-de-dragon .equipement-valeur { margin: 0; - flex-grow: 1.5; + flex-grow: 1; + flex-shrink: 1; text-align: center; } .system-foundryvtt-reve-de-dragon .equipement-detail { margin: 0; flex-grow: 1; - align-items: center; - justify-content: center; - text-align: center; -} -.system-foundryvtt-reve-de-dragon span.equipement-detail-buttons { - margin: 0; - flex-grow: 1.5; + flex-shrink: 1; align-items: center; justify-content: center; text-align: center; display: flex; - flex-direction: row; -} -.system-foundryvtt-reve-de-dragon .equipement-button { - margin: 0; - flex-grow: 0.5; - align-items: center; - justify-content: center; - text-align: center; -} -.system-foundryvtt-reve-de-dragon :is(.item-actions-controls, .equipement-actions) { - margin: 0; - flex-grow: 1.2; - align-items: end; - justify-content: flex-end; - text-align: right; -} -.system-foundryvtt-reve-de-dragon .liste-equipement :is(.equipement-actions, .item-actions-controls) { - flex-grow: 2; + min-width: max-content; } .system-foundryvtt-reve-de-dragon .blessure-control { flex-grow: 1; @@ -1526,9 +1504,20 @@ body { .system-foundryvtt-reve-de-dragon .competence-list .item-controls.hidden-controls { display: none !important; } +.system-foundryvtt-reve-de-dragon .competence-header .item-actions-controls { + flex-shrink: 2; + flex-grow: 2; +} .system-foundryvtt-reve-de-dragon .item-actions-controls, .system-foundryvtt-reve-de-dragon .item-controls { - vertical-align: super; + margin: 0; + flex-grow: 1; + flex-shrink: 1; + align-items: end; + text-align: right; + min-width: max-content; + flex-basis: fit-content; + vertical-align: baseline; } .system-foundryvtt-reve-de-dragon .item-actions-controls img, .system-foundryvtt-reve-de-dragon .item-controls img { diff --git a/less/foundryvtt-reve-de-dragon.less b/less/foundryvtt-reve-de-dragon.less index 5649b873..9a85e862 100644 --- a/less/foundryvtt-reve-de-dragon.less +++ b/less/foundryvtt-reve-de-dragon.less @@ -393,49 +393,27 @@ text-align: left; } .equipement-nom { - flex-grow: 3; + flex-grow: 4; + flex-shrink: 2; margin: 0; - justify-content: center; text-align: left; display: ruby; } .equipement-valeur { margin: 0; - flex-grow: 1.5; + flex-grow: 1; + flex-shrink: 1; text-align: center; } .equipement-detail { margin: 0; flex-grow: 1; - align-items: center; - justify-content: center; - text-align: center; - } - span.equipement-detail-buttons { - margin: 0; - flex-grow: 1.5; + flex-shrink: 1; align-items: center; justify-content: center; text-align: center; display: flex; - flex-direction: row; - } - .equipement-button { - margin: 0; - flex-grow: 0.5; - align-items: center; - justify-content: center; - text-align: center; - } - :is(.item-actions-controls, .equipement-actions) { - margin: 0; - flex-grow: 1.2; - align-items: end; - justify-content: flex-end; - text-align: right; - } - .liste-equipement :is(.equipement-actions, .item-actions-controls) { - flex-grow: 2; + min-width: max-content; } .blessure-control { @@ -848,12 +826,20 @@ .competence-list .item-controls.hidden-controls { display: none !important; } + .competence-header .item-actions-controls{ + flex-shrink: 2; + flex-grow: 2; + } .item-actions-controls, .item-controls { - vertical-align: super; - // a { - // } - + margin: 0; + flex-grow: 1; + flex-shrink: 1; + align-items: end; + text-align: right; + min-width: max-content; + flex-basis: fit-content; + vertical-align: baseline; img { vertical-align: text-bottom; display: inline; diff --git a/templates/actor/commerce-actor-sheet.hbs b/templates/actor/commerce-actor-sheet.hbs index 927b8235..8452057e 100644 --- a/templates/actor/commerce-actor-sheet.hbs +++ b/templates/actor/commerce-actor-sheet.hbs @@ -40,13 +40,12 @@
{{> "systems/foundryvtt-reve-de-dragon/templates/actor/commerce-inventaire.hbs"}} - {{log @root.options}} - {{#unless system.illimite}} + {{#if @root.options.isObserver}}
{{> "systems/foundryvtt-reve-de-dragon/templates/actor/inventaire-monnaie.hbs"}} {{/if}} - {{/unless}} +
{{> "systems/foundryvtt-reve-de-dragon/templates/actor/editor-notes-mj.hbs"}}
diff --git a/templates/actor/commerce-inventaire-item.hbs b/templates/actor/commerce-inventaire-item.hbs index c855d6a5..2e7a4d94 100644 --- a/templates/actor/commerce-inventaire-item.hbs +++ b/templates/actor/commerce-inventaire-item.hbs @@ -14,7 +14,7 @@ {{#unless item.parent.system.illimite}} - + {{#unless (or (eq item.type 'service') (and (eq item.type 'conteneur') (not vide)))}} {{#if options.isOwner}} diff --git a/templates/actor/commerce-inventaire.hbs b/templates/actor/commerce-inventaire.hbs index 902ea6a4..7119321d 100644 --- a/templates/actor/commerce-inventaire.hbs +++ b/templates/actor/commerce-inventaire.hbs @@ -23,7 +23,7 @@ Quantité {{/unless}} Prix (sols) - Actions + Actions {{#each (trier inventaires) as |item id|}} {{#unless item.estContenu}} diff --git a/templates/actor/inventaire-monnaie.hbs b/templates/actor/inventaire-monnaie.hbs index 6421a15d..1a15766a 100644 --- a/templates/actor/inventaire-monnaie.hbs +++ b/templates/actor/inventaire-monnaie.hbs @@ -8,19 +8,21 @@ ({{piece.system.cout}} Sols) + {{#if @root.options.isOwner}} - + {{/if}} - + {{piece.system.quantite}} {{#if @root.options.isOwner}} - + {{/if}} + {{#if @root.options.isOwner}} {{>'systems/foundryvtt-reve-de-dragon/templates/actor/item-action-controls.hbs' item=signe options=@root.options}} {{/if}} diff --git a/templates/actor/inventaire.hbs b/templates/actor/inventaire.hbs index b1799774..e23cd479 100644 --- a/templates/actor/inventaire.hbs +++ b/templates/actor/inventaire.hbs @@ -18,9 +18,9 @@
  • Nom - Q. + Quantité Enc. - Actions + Actions
  • {{#each inventaires as |item id|}} {{#unless item.estContenu}} diff --git a/templates/item/conteneur-sheet.hbs b/templates/item/conteneur-sheet.hbs index 0f0f6ea6..deb7b060 100644 --- a/templates/item/conteneur-sheet.hbs +++ b/templates/item/conteneur-sheet.hbs @@ -21,7 +21,7 @@ Nom Q. Enc. - Actions + Actions {{buildInventaireConteneur actorId id options}}