Moved Honor/Glory/status in tooltip and some css fix

CHANGELOG.md

@@ -6,6 +6,7 @@
   - Added a new button bar for system specific buttons.
   - Added +/- buttons to add or subtract Fatigue and Strife (PC & NPC Sheet), Casualties and Panic (Armies Sheet).
 - GmMonitor :
+  - Moved Honor/Glory/status in tooltip.
   - Added ability to add or subtract fatigue/strife/void/casualties/panic points on mouse clic (left/right/middle).
   - Added ability to switch between stance/prepared on mouse clic (left/right).
 - Compendiums :

system/styles/scss/army.scss

@@ -25,8 +25,11 @@
                         position: relative;
 
                         .attributes-buttons {
+                            position: relative;
                             line-height: 13px;
-                            text-align: center;
+                            top: 0.3rem;
+                            right: 1.2rem;
+                            width: 12px;
                         }
 
                         strong {
@@ -44,6 +47,7 @@
                             background: transparent;
                             border: 0 none;
                             text-align: center;
+                            margin: 0.3rem 1.6rem 0 1.5rem;
                         }
 
                         &:after {
@@ -60,6 +64,9 @@
                         }
 
                         &:nth-child(1) {
+                            input {
+                                margin: 0.3rem 1rem 0 1.5rem;
+                            }
                             &:after {
                                 transform: rotate(0deg);
                             }
@@ -72,6 +79,9 @@
                         }
 
                         &:nth-child(3) {
+                            input {
+                                margin: 0.3rem 1rem 0 1.5rem;
+                            }
                             &:after {
                                 transform: rotate(180deg);
                             }
@@ -93,7 +103,7 @@
             }
         }
         .sheet-body {
-            height: calc(100% - 9.5rem);
+            height: calc(100% - 11.5rem);
             .tab {
                 height: calc(100% - 3.5rem);
                 &.army {

system/styles/scss/sheets.scss

@@ -11,9 +11,10 @@
         flex: 0 0 100%;
         overflow: hidden;
         padding: 0 8px;
-        line-height: 30px;
+        line-height: 1.9rem;
         justify-content: flex-end;
         background: rgba(186, 187, 177, 0.5);
+        height: 2rem;
 
         a.l5r-header-button {
             flex: none;
@@ -29,7 +30,7 @@
             }
         }
         .sheet-body {
-            height: calc(100% - 27rem);
+            height: calc(100% - 28rem);
         }
         fieldset {
             &.advancement,

system/styles/scss/ui.scss

@@ -741,6 +741,12 @@ button {
             top: -1px;
             left: -1px;
         }
+        .goodvalue {
+            color: #4e8c69;
+        }
+        .badvalue {
+            color: #ab2a00;
+        }
     }
     .card-header img {
         display: inline-block;

system/templates/actors/army-sheet.html

@@ -13,27 +13,35 @@
             <div class="readiness">
                 <ul>
                     <li>
-                        <input name="data.battle_readiness.casualties_strength.value" type="number" value="{{data.data.battle_readiness.casualties_strength.value}}"  {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
+                        <label class="attribute-label-casualties">
+                            <input name="data.battle_readiness.casualties_strength.value" type="number" value="{{data.data.battle_readiness.casualties_strength.value}}"  {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
+                            <span class="attributes-buttons">
+                                <i class="addsub-control pointer-choice fa fa-plus-square" data-type="casualties" data-value="1"></i>
+                                <i class="addsub-control pointer-choice fa fa-minus-square" data-type="casualties" data-value="-1"></i>
+                            </span>
+                        </label>
                         <strong>{{localize 'l5r5e.army.battle_readiness.casualties'}}</strong>
-                        <span class="attributes-buttons">
-                            <i class="addsub-control pointer-choice fa fa-minus-square" data-type="casualties" data-value="-1"></i>
-                            <i class="addsub-control pointer-choice fa fa-plus-square" data-type="casualties" data-value="1"></i>
-                        </span>
                     </li>
                     <li>
-                        <input name="data.battle_readiness.casualties_strength.max" type="number" value="{{data.data.battle_readiness.casualties_strength.max}}"  {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
+                        <label class="attribute-label-strength">
+                            <input name="data.battle_readiness.casualties_strength.max" type="number" value="{{data.data.battle_readiness.casualties_strength.max}}"  {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
+                        </label>
                         <strong>{{localize 'l5r5e.army.battle_readiness.strength'}}</strong>
                     </li>
                     <li>
-                        <input name="data.battle_readiness.panic_discipline.value" type="number" value="{{data.data.battle_readiness.panic_discipline.value}}"  {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
+                        <label class="attribute-label-panic">
+                            <input name="data.battle_readiness.panic_discipline.value" type="number" value="{{data.data.battle_readiness.panic_discipline.value}}"  {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
+                            <span class="attributes-buttons">
+                                <i class="addsub-control pointer-choice fa fa-plus-square" data-type="panic" data-value="1"></i>
+                                <i class="addsub-control pointer-choice fa fa-minus-square" data-type="panic" data-value="-1"></i>
+                            </span>
+                        </label>
                         <strong>{{localize 'l5r5e.army.battle_readiness.panic'}}</strong>
-                        <span class="attributes-buttons">
-                            <i class="addsub-control pointer-choice fa fa-minus-square" data-type="panic" data-value="-1"></i>
-                            <i class="addsub-control pointer-choice fa fa-plus-square" data-type="panic" data-value="1"></i>
-                        </span>
                     </li>
                     <li>
-                        <input name="data.battle_readiness.panic_discipline.max" type="number" value="{{data.data.battle_readiness.panic_discipline.max}}"  {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
+                        <label class="attribute-label-discipline">
+                            <input name="data.battle_readiness.panic_discipline.max" type="number" value="{{data.data.battle_readiness.panic_discipline.max}}"  {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
+                        </label>
                         <strong>{{localize 'l5r5e.army.battle_readiness.discipline'}}</strong>
                     </li>
                 </ul>

system/templates/gm/gm-monitor.html

@@ -10,7 +10,6 @@
             <th class="weapon"><i class="fas fa-fan"></i></th>
             <th class="armor"><i class="fas fa-user-shield"></i></th>
             <th class="rank">{{localize 'l5r5e.rank'}}</th>
-            <th class="social">{{localize 'l5r5e.gm_monitor.honor_glory_status'}}</th>
             <th class="fatigue">{{localize 'l5r5e.attributes.fatigue'}}</th>
             <th class="strife">{{localize 'l5r5e.attributes.strife'}}</th>
             <th class="vigilance">{{localize 'l5r5e.gm_monitor.focus_vigilance'}}</th>
@@ -28,7 +27,7 @@
             </td>
             <td>
                 <a data-actor-id="{{actor.id}}" data-type="stance" class="actor-modify-control">
-                    <i data-type="text" data-text="<h2>{{localize 'l5r5e.conflict.stance'}} ({{localizeRing actor.data.data.stance}})</h2>{{localizeStanceTip actor.data.data.stance}}" class="i_{{actor.data.data.stance}} actor-infos-control"></i>
+                    <i data-type="text" data-text="<h2>{{localize 'l5r5e.conflict.stance'}} ({{localizeRing actor.data.data.stance}} - {{lookup actor.data.data.rings actor.data.data.stance}})</h2>{{localizeStanceTip actor.data.data.stance}}" class="i_{{actor.data.data.stance}} actor-infos-control"></i>
                 </a>
             </td>
             <td>
@@ -56,11 +55,6 @@
                     {{/if}}
                 </p>
             </td>
-            <td>
-                <span class="{{#ifCond actor.data.data.social.honor '>' 64}}goodvalue{{/ifCond}}{{#ifCond actor.data.data.social.honor '<' 30}}badvalue{{/ifCond}}">{{actor.data.data.social.honor}}</span>
-                / <span class="{{#ifCond actor.data.data.social.glory '>' 64}}goodvalue{{/ifCond}}{{#ifCond actor.data.data.social.glory '<' 20}}badvalue{{/ifCond}}">{{actor.data.data.social.glory}}</span>
-                / {{actor.data.data.social.status}}
-            </td>
             <td>
                 <a title="{{localize 'l5r5e.gm_monitor.mouse_control'}}" data-actor-id="{{actor.id}}" data-type="fatigue" class="actor-modify-control">
                     <span class="{{#ifCond actor.data.data.fatigue.value '>' actor.data.data.fatigue.max}}badvalue{{/ifCond}}">{{actor.data.data.fatigue.value}}</span>

system/templates/gm/monitor-tooltips/global.html

@@ -11,6 +11,11 @@
         {{!-- Peculiarities --}}
         <li><b>{{localize 'l5r5e.social.npc.advantages'}}</b> : {{advantages}}</li>
         <li><b>{{localize 'l5r5e.social.npc.disadvantages'}}</b> : {{disadvantages}}</li>
+
+        {{!-- Honor/Glory/Status --}}
+        <li><b>{{localize 'l5r5e.social.honor'}}</b> : <span class="{{#ifCond actorData.social.honor '>' 64}}goodvalue{{/ifCond}}{{#ifCond actorData.social.honor '<' 30}}badvalue{{/ifCond}}">{{actorData.social.honor}}</span></li>
+        <li><b>{{localize 'l5r5e.social.glory'}}</b> : <span class="{{#ifCond actorData.social.glory '>' 64}}goodvalue{{/ifCond}}{{#ifCond actorData.social.glory '<' 20}}badvalue{{/ifCond}}">{{actorData.social.glory}}</span></li>
+        <li><b>{{localize 'l5r5e.social.status'}}</b> : {{actorData.social.status}}</li>
     </ul>
     <p>{{{actorData.description}}}</p>
 </section>