From 1b794e5953b9a7ba760cdc555d4b8885ba0b5102 Mon Sep 17 00:00:00 2001
From: LeRatierBretonnien <sylvain@lahiette.com>
Date: Sun, 24 May 2020 21:02:04 +0200
Subject: [PATCH] Sync with head

---
 templates/actor-sheet.html | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html
index 6052501f..a901b3aa 100644
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -1,4 +1,4 @@
-<form class="{{cssClass}} flexcol" autocomplete="off">
+<form class="{{cssClass}}" autocomplete="off">
 
     {{!-- Sheet Header --}}
     <header class="sheet-header">
@@ -29,38 +29,33 @@
     <section class="sheet-body">
 
         {{!-- Carac Tab --}}
-        <div class="tab" data-group="primary" data-tab="carac">
+        <div class="tab items" data-group="primary" data-tab="carac">
           <div class="grid grid-2col">
-            <div class="flex-group-center">
-              <header class="carac-header flexrow">
-                  <span class="carac-title">Nom</span>
-                  <span class="carac-title">Valeur</span>
-                  <span class="carac-title">XP</span>
-              </header>
+            <div class="flex-group-left flexcol">
               <ol class="carac-list">
               {{#each data.carac as |carac key|}}
                   <li class="competence flexrow" data-attribute="{{key}}">
-                      <span class="competence-label" name="data.carac.{{key}}.label">{{carac.label}}</span>
+                      <span class="competence-label flexrow" name="data.carac.{{key}}.label">{{carac.label}}</span>
                       {{#if carac.derivee}}
-                        <label class="competence-value">{{carac.value}}</label>
+                        <label class="competence-value flexrow">{{carac.value}}</label>
                       {{else}}
-                        <input class="competence-value" type="text" name="data.carac.{{key}}.value" value="{{carac.value}}" data-dtype="{{carac.type}}"/>
-                        <input class="competence-xp" type="text" name="data.carac.{{key}}.xp" value="{{carac.xp}}" data-dtype="number"/>
+                        <input class="competence-value flexrow" type="text" name="data.carac.{{key}}.value" value="{{carac.value}}" data-dtype="{{carac.type}}"/>
+                        <input class="competence-xp flexrow" type="text" name="data.carac.{{key}}.xp" value="{{carac.xp}}" data-dtype="number"/>
                       {{/if}}
                   </li>
               {{/each}}
               </ol>          
             </div>
-            <div class="flex-group-center" >
-              <header class="attributs-header flexrow">
-                  <span class="attributs-title">Nom</span>
-                  <span class="attributs-title">Valeur</span>
-              </header>
-              <ol class="attributs-list">
+            <div class="flex-group-left flexcol" >
+              <ol class="carac-list">
               {{#each data.attributs as |attr key|}}
-                  <li class="attribut flexrow" data-attribute="{{key}}">
-                      <span class="attribut-label" name="data.attributs.{{key}}.label">{{attr.label}}</span>
-                      <label class="attribut-value">{{attr.value}}</label>
+                  <li class="competence flexrow" data-attribute="{{key}}">
+                      <span class="competence-label flexrow" name="data.attributs.{{key}}.label">{{attr.label}} : {{attr.value}}</span>
+                  </li>
+              {{/each}}
+              {{#each data.sante as |point key|}}
+                  <li class="competence flexrow" data-attribute="{{key}}">
+                      <span class="competence-label flexrow" name="data.attributs.{{key}}.label">{{point.label}} : {{point.value}}</span>
                   </li>
               {{/each}}
               </ol>