From dcaa39fe8fb7443da4bfe908cabd47b2401763d8 Mon Sep 17 00:00:00 2001
From: TheLastScrub <67403321+TheLastScrub@users.noreply.github.com>
Date: Sat, 5 Jun 2021 15:57:40 -0700
Subject: [PATCH] made armor/weapon/gear sheets more uniform

---
 css/deltagreen.css                    | 72 +++++++++++++++++++++++----
 templates/item/item-armor-sheet.html  | 20 +++++---
 templates/item/item-bond-sheet.html   |  4 +-
 templates/item/item-gear-sheet.html   |  4 +-
 templates/item/item-weapon-sheet.html | 56 ++++++++++++---------
 5 files changed, 110 insertions(+), 46 deletions(-)

diff --git a/css/deltagreen.css b/css/deltagreen.css
index aef64b2..74e2bd4 100644
--- a/css/deltagreen.css
+++ b/css/deltagreen.css
@@ -631,6 +631,25 @@ div.motivation-editor-container div.editor{
   height: 300px;
 }
 
+/*
+  Item Sheet Common CSS
+*/
+
+.item-img {
+  -webkit-box-flex: 0;
+  -ms-flex: 0 0 100px;
+  flex: 0 0 100px;
+  height: 100px;
+  border: 0px solid black;
+}
+
+input.item-sheet-short-input{
+  width: 75px;
+  margin-right: 5px;
+  margin-left: 5px;
+  text-align: center !important;
+}
+
 /*
   Bonds Item Sheet
 */
@@ -680,8 +699,9 @@ div.motivation-editor-container div.editor{
   align-items: center;
   justify-content: center;
   text-align: center;
-  padding-left: 5px;
   grid-gap: 5px;
+  padding-bottom: 10px;
+  padding-left: 5px;
 }
 
 .armor-sheet-horizontal-grid-2col{
@@ -689,12 +709,22 @@ div.motivation-editor-container div.editor{
   grid-template-columns: 100px auto;
   align-items: center;
   text-align: left;
-  padding-bottom: 10px;
   column-gap: 10px;
   row-gap: 10px;
+  padding-bottom: 10px;
   padding-right: 5px;
 }
 
+.armor-sheet-secondary-grid-2col{
+  display: grid;
+  grid-template-columns: 25% 75%;
+  align-items: center;
+  justify-content: left;
+  text-align: left;
+  grid-gap: 5px;
+  padding-bottom: 10px;
+}
+
 /*
   Gear Item Sheet
 */
@@ -705,8 +735,8 @@ div.motivation-editor-container div.editor{
   align-items: center;
   justify-content: center;
   text-align: center;
-  padding-left: 5px;
   grid-gap: 5px;
+  padding-left: 5px;
 }
 
 .gear-sheet-horizontal-grid-2col{
@@ -714,9 +744,9 @@ div.motivation-editor-container div.editor{
   grid-template-columns: 100px auto;
   align-items: center;
   text-align: left;
-  padding-bottom: 10px;
   column-gap: 10px;
   row-gap: 10px;
+  padding-bottom: 10px;
   padding-right: 5px;
 }
 
@@ -724,15 +754,25 @@ div.motivation-editor-container div.editor{
   Weapon Item Sheet
 */
 
-.weapon-sheet-header-grid-3col{
+.weapon-sheet-grid-2col{
   display: grid;
-  grid-template-columns: 25% 15% 60%;
+  grid-template-columns: 25% 75%;
   align-items: center;
-  justify-content: left;
-  text-align: left;
-  padding-left: 5px;
+  justify-content: center;
+  text-align: center;
   grid-gap: 5px;
-  padding-right: 10px;
+  padding-left: 5px;
+}
+
+.weapon-sheet-horizontal-grid-2col{
+  display: grid;
+  grid-template-columns: 100px auto;
+  align-items: center;
+  text-align: left;
+  column-gap: 10px;
+  row-gap: 10px;
+  padding-bottom: 10px;
+  padding-right: 5px;
 }
 
 .weapon-sheet-outer-grid-2col{
@@ -743,7 +783,8 @@ div.motivation-editor-container div.editor{
   text-align: center;
   padding-left: 5px;
   padding-right: 5px;
-  grid-gap: 5px;
+  column-gap: 10px;
+  row-gap: 5px;
 }
 
 .weapon-sheet-horizontal-grid-left-2col{
@@ -766,4 +807,13 @@ div.motivation-editor-container div.editor{
   column-gap: 10px;
   row-gap: 10px;
   padding-right: 10px;
+}
+
+.weapon-sheet-secondary-grid-2col{
+  display: grid;
+  grid-template-columns: 40% 60%;
+  align-items: center;
+  justify-content: left;
+  text-align: left;
+  grid-gap: 5px;
 }
\ No newline at end of file
diff --git a/templates/item/item-armor-sheet.html b/templates/item/item-armor-sheet.html
index d950569..c7a3d74 100644
--- a/templates/item/item-armor-sheet.html
+++ b/templates/item/item-armor-sheet.html
@@ -1,15 +1,14 @@
 <form class="{{cssClass}} {{getFontFamilySystemSettingClass}}" autocomplete="off">
-    <header class="sheet-header">
+    <header class="">
       <div class="armor-sheet-grid-2col">
-        <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}"/>
+
+        <img class="item-img" src="{{item.img}}" data-edit="img" title="{{item.name}}"/>
+
         <div class="armor-sheet-horizontal-grid-2col">
 
           <span class="resource-label">{{localize 'DG.Bonds.Name'}}:</span>
           <input name="name" type="text" value="{{item.name}}" placeholder="{{localize 'DG.ItemWindow.Armor.NamePlaceholder'}}"/></h1>
-      
-          <span class="resource-label">{{localize 'DG.ItemWindow.Armor.ArmorRating'}}:</span>
-          <input type="text" name="data.protection" value="{{data.data.protection}}" data-dtype="Number"/>
-        
+                        
           <span class="resource-label">{{localize 'DG.ItemWindow.Armor.Expense'}}:</span>
           <select name="data.expense" >
             <option {{#if_eq data.data.expense 'Incidental'}}selected{{/if_eq}} value="Incidental">{{localize 'DG.Gear.Expense.Incidental'}}</option>
@@ -20,11 +19,16 @@
           </select>
         
           <span class="resource-label">{{localize 'DG.ItemWindow.Armor.Equipped'}}:</span>
-          <input class="labeled-resource-checkbox" type="checkbox" name="data.equipped" {{checked data.data.equipped}} data-dtype="Boolean" />
+          <input class="labeled-resource-checkbox" type="checkbox" name="data.equipped" {{checked data.data.equipped}} data-dtype="Boolean" />          
               
         </div>
       </div>
-        
+      
+      <div class="armor-sheet-secondary-grid-2col">
+        <span class="resource-label">{{localize 'DG.ItemWindow.Armor.ArmorRating'}}:</span>
+        <input class="item-sheet-short-input" type="text" name="data.protection" value="{{data.data.protection}}" data-dtype="Number"/>
+      </div>
+      
     </header>
 
     {{!-- Sheet Tab Navigation --}}
diff --git a/templates/item/item-bond-sheet.html b/templates/item/item-bond-sheet.html
index 38ef7c7..a995800 100644
--- a/templates/item/item-bond-sheet.html
+++ b/templates/item/item-bond-sheet.html
@@ -1,7 +1,7 @@
 <form class="{{cssClass}} {{getFontFamilySystemSettingClass}}" autocomplete="off">
-    <header class="sheet-header">
+    <header class="">
         <div class="bond-sheet-grid-2col">
-            <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
+            <img class="item-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
             <div class="bond-sheet-horizontal-grid-2col">
 
                 <span class="resource-label">{{localize 'DG.Bonds.Name'}}:</span>
diff --git a/templates/item/item-gear-sheet.html b/templates/item/item-gear-sheet.html
index 9ba1299..22660f7 100644
--- a/templates/item/item-gear-sheet.html
+++ b/templates/item/item-gear-sheet.html
@@ -1,8 +1,8 @@
 <form class="{{cssClass}} {{getFontFamilySystemSettingClass}}" autocomplete="off">
-    <header class="sheet-header">
+    <header class="">
         <div class="gear-sheet-grid-2col">
 
-            <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}"/>
+            <img class="item-img" src="{{item.img}}" data-edit="img" title="{{item.name}}"/>
             
             <div class="gear-sheet-horizontal-grid-2col">
     
diff --git a/templates/item/item-weapon-sheet.html b/templates/item/item-weapon-sheet.html
index 9cf60f4..0680839 100644
--- a/templates/item/item-weapon-sheet.html
+++ b/templates/item/item-weapon-sheet.html
@@ -1,11 +1,27 @@
 <form class="{{cssClass}} {{getFontFamilySystemSettingClass}}" autocomplete="off">
     <header class="">
-      <div class="weapon-sheet-header-grid-3col">
+      <div class="weapon-sheet-grid-2col">
 
-        <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}"/>
+        <img class="item-img" src="{{item.img}}" data-edit="img" title="{{item.name}}"/>
 
-        <span class="resource-label">{{localize 'DG.Bonds.Name'}}:</span>
-        <input name="name" type="text" value="{{item.name}}" placeholder="{{localize 'DG.ItemWindow.Weapons.NamePlaceholder'}}"/>
+        <div class="weapon-sheet-horizontal-grid-2col">
+          
+          <span class="resource-label">{{localize 'DG.Bonds.Name'}}:</span>
+          <input name="name" type="text" value="{{item.name}}" placeholder="{{localize 'DG.ItemWindow.Weapons.NamePlaceholder'}}"/>
+          
+          <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.Expense'}}:</span>
+          <select name="data.expense" >
+            <option {{#if_eq data.data.expense 'Incidental'}}selected{{/if_eq}} value="Incidental">{{localize 'DG.Gear.Expense.Incidental'}}</option>
+            <option {{#if_eq data.data.expense 'Standard'}}selected{{/if_eq}} value="Standard">{{localize 'DG.Gear.Expense.Standard'}}</option>
+            <option {{#if_eq data.data.expense 'Unusual'}}selected{{/if_eq}} value="Unusual">{{localize 'DG.Gear.Expense.Unusual'}}</option>
+            <option {{#if_eq data.data.expense 'Major'}}selected{{/if_eq}} value="Major">{{localize 'DG.Gear.Expense.Major'}}</option>
+            <option {{#if_eq data.data.expense 'Extreme'}}selected{{/if_eq}} value="Extreme">{{localize 'DG.Gear.Expense.Extreme'}}</option>
+          </select>
+
+          <span class="resource-label">{{localize 'DG.ItemWindow.Gear.Equipped'}}:</span>
+          <input class="labeled-resource-checkbox" type="checkbox" name="data.equipped" {{checked data.data.equipped}} data-dtype="Boolean" />
+
+        </div>
       </div>
       
       <div class="weapon-sheet-outer-grid-2col">
@@ -23,22 +39,15 @@
               <option {{#if_eq data.data.skill 'artillery'}}selected{{/if_eq}} value="artillery">{{localize 'DG.Skills.artillery'}}</option>
           </select>                    
 
-          <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.Expense'}}:</span>
-          <select name="data.expense" >
-            <option {{#if_eq data.data.expense 'Incidental'}}selected{{/if_eq}} value="Incidental">{{localize 'DG.Gear.Expense.Incidental'}}</option>
-            <option {{#if_eq data.data.expense 'Standard'}}selected{{/if_eq}} value="Standard">{{localize 'DG.Gear.Expense.Standard'}}</option>
-            <option {{#if_eq data.data.expense 'Unusual'}}selected{{/if_eq}} value="Unusual">{{localize 'DG.Gear.Expense.Unusual'}}</option>
-            <option {{#if_eq data.data.expense 'Major'}}selected{{/if_eq}} value="Major">{{localize 'DG.Gear.Expense.Major'}}</option>
-            <option {{#if_eq data.data.expense 'Extreme'}}selected{{/if_eq}} value="Extreme">{{localize 'DG.Gear.Expense.Extreme'}}</option>
-          </select>
+          
 
-          <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.IsLethality'}}: </span>
+          <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.IsLethality'}}:</span>
           <input class="labeled-resource-checkbox" type="checkbox" name="data.isLethal" {{checked data.data.isLethal}} data-dtype="Boolean" 
               title="{{localize 'DG.ItemWindow.Weapons.IsLethalityTooltip'}}"
           />
 
-          <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.Ammo'}}:</span>
-          <input type="text" name="data.ammo" value="{{data.data.ammo}}" data-dtype="String"/>
+          <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.KillRadius'}}:</span>
+          <input type="text" name="data.killRadius" value="{{data.data.killRadius}}" data-dtype="String"/>
           
         </div>
 
@@ -47,9 +56,6 @@
           <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.Range'}}:</span>
           <input type="text" name="data.range" value="{{data.data.range}}" data-dtype="String"/>
 
-          <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.ArmorPiercing'}}:</span>
-          <input type="text" name="data.armorPiercing" value="{{data.data.armorPiercing}}" data-dtype="Number"/>
-          
           {{!-- If a weapon is 'Lethal', need to show the d100% Lethality input, otherwise only show the regular Damage formula (e.g. 1D6, 1D4+2, etc...) --}}
 
           {{#unless data.data.isLethal}}
@@ -61,21 +67,25 @@
 
           {{#if data.data.isLethal}}
           
-            <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.Lethality'}}:</span>
+            <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.Lethality'}} %:</span>
             <input class="" type="text" name="data.lethality" value="{{data.data.lethality}}" data-dtype="Number"
               title="{{localize 'DG.ItemWindow.Weapons.LethalityTooltip'}}"
             />
           
           {{/if}}
           
-          <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.KillRadius'}}:</span>
-          <input type="text" name="data.killRadius" value="{{data.data.killRadius}}" data-dtype="String"/>
+          <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.ArmorPiercing'}}:</span>
+          <input type="text" name="data.armorPiercing" value="{{data.data.armorPiercing}}" data-dtype="Number"/>
  
         </div>
 
       </div>
-
-              
+      
+      <div class="weapon-sheet-secondary-grid-2col">
+        <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.Ammo'}}:</span>
+        <input type="text" name="data.ammo" value="{{data.data.ammo}}" data-dtype="String"/>
+      </div>
+         
     </header>
 
     {{!-- Sheet Tab Navigation --}}