Merge pull request #425 from shadowfoundry/dev

v11.0.6
shadowfoundry · Sep 15, 2023 · a75a1de · a75a1de
2 parents 3564def + d728a22
commit a75a1de
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 36 deletions.
diff --git a/css/sr5.css b/css/sr5.css
@@ -4581,7 +4581,6 @@ input[type=range]:focus::-ms-fill-upper {
 }
 #sidebar.collapsed {
   width: 35px!important;
-  height: 340px!important;
   border-bottom: 1px solid #0c9394;
   border-bottom-left-radius: 10px;
 }

diff --git a/css/sr6.css b/css/sr6.css
@@ -4581,7 +4581,6 @@ input[type=range]:focus::-ms-fill-upper {
 }
 #sidebar.collapsed {
   width: 35px!important;
-  height: 340px!important;
   border-bottom: 1px solid #839c88;
   border-bottom-left-radius: 10px;
 }

diff --git a/less/interface.less b/less/interface.less
@@ -956,7 +956,6 @@
 
     &.collapsed {
         width: 35px!important;
-        height: 340px!important;
         border-bottom: 1px solid @subColor;
         border-bottom-left-radius: 10px;
 

diff --git a/system.json b/system.json
@@ -9,7 +9,7 @@
       "flags": {}
     }
   ],
-  "version": "11.0.5",
+  "version": "11.0.6",
   "compatibility": {
     "minimum": "11",
     "maximum": "11",

diff --git a/templates/interface/sceneConfig.html b/templates/interface/sceneConfig.html
@@ -6,9 +6,6 @@
         <a class="item" data-tab="grid"><i class="fas fa-ruler"></i> {{localize "SCENES.HeaderGrid"}}</a>
         <a class="item" data-tab="lighting"><i class="fas fas fa-lightbulb"></i> {{localize "SCENES.HeaderVision"}}</a>
         <a class="item" data-tab="ambience"><i class="fas fa-cloud-sun"></i> {{localize "SCENES.HeaderAmbience"}}</a>
-        <a class="item" data-tab="environmentalMod"><i class="fas fa-cloud-sun-rain"></i> {{localize "SR5.EnvironmentalModifiers"}}</a>
-        <a class="item" data-tab="matrixNoise"><i class="fas fa-wifi"></i> {{localize "SR5.SceneMatrixNoise"}}</a>
-        <a class="item" data-tab="backgroundCount"><i class="fab fa-hornbill"></i> {{localize "SR5.SceneBackgroundCount"}}</a>
     </nav>
 
     <!-- Basic Tab -->
@@ -83,7 +80,7 @@
         <div class="form-group initial-position">
             <label>{{localize "SCENES.InitialView"}}</label>
             <div class="form-fields">
-                <button class="capture-position" type="button" title="{{ localize "SCENES.InitialViewButton" }}">
+                <button class="capture-position" type="button" data-tooltip="{{ localize "SCENES.InitialViewButton" }}">
                     <i class="fas fa-crop-alt fa-fw"></i>
                 </button>
                 <label>X</label>
@@ -102,7 +99,7 @@
         <div class="form-group">
             <label>{{localize "SCENES.GridType"}}</label>
             <div class="form-fields">
-                <button type="button" class="grid-config" title="{{ localize "SCENES.GridConfigTool" }}">
+                <button type="button" class="grid-config" data-tooltip="{{ localize "SCENES.GridConfigTool" }}">
                     <i class="fas fa-ruler-combined"></i>
                 </button>
                 <select name="grid.type" data-dtype="Number">
@@ -122,10 +119,13 @@
         <div class="form-group">
             <label>{{localize "SCENES.Dimensions"}} <span class="units">({{localize "SCENES.Pixels"}})</span></label>
             <div class="form-fields">
-                <label class="grid-label">{{localize "Width"}}</label>
-                <input type="number" name="width" placeholder="{{localize 'SCENES.Pixels'}}" value="{{data.width}}"/>
-                <label class="grid-label">{{localize "Height"}}</label>
-                <input type="number" name="height" placeholder="{{localize 'SCENES.Pixels'}}" value="{{data.height}}"/>
+                <label>{{localize "Width"}}</label>
+                {{numberInput data.width name="width"}}
+                <button type="button" class="dimension-link" data-tooltip="{{ localize 'SCENES.DimensionLinked' }}">
+                    <i class="fas fa-link-simple"></i>
+                </button>
+                <label>{{localize "Height"}}</label>
+                {{numberInput data.height name="height"}}
             </div>
             <p class="notes">{{localize "SCENES.DimensionsHint"}}</p>
         </div>
@@ -412,7 +412,7 @@
     <!-- END OF CUSTOM SR5 PART -->
 
     <!-- Form Submission -->
-    <button type="submit" name="submit">
+    <button type="submit">
         <i class="far fa-save"></i> {{localize "Save Changes"}}
     </button>
 </form>
diff --git a/templates/interface/srcombat-tracker.html b/templates/interface/srcombat-tracker.html
@@ -23,12 +23,12 @@ <h4 class="encounter">{{localize "COMBAT.Encounter"}} {{currentIndex}} / {{comba
         </nav>
         {{/if}}
         -->
-        <nav class="encounters flexrow {{#if hasCombat}}combat{{/if}}">
+        <div class="encounter-controls flexrow {{#if hasCombat}}combat{{/if}}">
             {{#if user.isGM}}
-            <a class="combat-button combat-control" data-tooltip="COMBAT.RollAll" data-control="rollAll" {{#unless turns}}disabled{{/unless}}>
+            <a class="combat-button combat-control" aria-label="{{localize 'COMBAT.RollAll'}}" role="button" data-tooltip="COMBAT.RollAll" data-control="rollAll" {{#unless turns}}disabled{{/unless}}>
                 <i class="fas fa-users"></i>
             </a>
-            <a class="combat-button combat-control" data-tooltip="COMBAT.RollNPC" data-control="rollNPC" {{#unless turns}}disabled{{/unless}}>
+            <a class="combat-button combat-control" aria-label="{{localize 'COMBAT.RollNPC'}}" role="button" data-tooltip="COMBAT.RollNPC" data-control="rollNPC" {{#unless turns}}disabled{{/unless}}>
                 <i class="fas fa-users-cog"></i>
             </a>
             {{/if}}
@@ -44,7 +44,7 @@ <h3 class="encounter-title noborder">{{localize "COMBAT.None"}}</h3>
             {{/if}}
 
             {{#if user.isGM}}
-            <a class="combat-button combat-control" data-tooltip="COMBAT.InitiativeReset" data-control="resetAll"
+            <a class="combat-button combat-control" aria-label="{{localize 'COMBAT.InitiativeReset'}}" role="button" data-tooltip="COMBAT.InitiativeReset" data-control="resetAll"
                 {{#unless hasCombat}}disabled{{/unless}}>
                 <i class="fas fa-undo"></i>
             </a>
@@ -54,11 +54,15 @@ <h3 class="encounter-title noborder">{{localize "COMBAT.None"}}</h3>
                 <i class="fas fa-{{#unless linked}}un{{/unless}}link"></i>
             </a>
             -->
-            <a class="combat-button combat-settings" data-tooltip="COMBAT.Settings" data-control="trackerSettings">
-                <i class="fas fa-cog"></i>
+            <a class="combat-button combat-control" aria-label="{{localize 'labels.scope'}}" role="button" data-tooltip="{{labels.scope}}"
+                data-control="toggleSceneLink" {{#unless hasCombat}}disabled{{/unless}}>
+                <i class="fas fa-{{#unless linked}}un{{/unless}}link"></i>
             </a>
             {{/if}}
-        </nav>
+            <a class="combat-button combat-settings" aria-label="{{localize 'COMBAT.Settings'}}" role="button" data-tooltip="COMBAT.Settings" data-control="trackerSettings">
+                <i class="fas fa-cog"></i>
+            </a>
+        </div>
 
         <!-- Add initiative Pass count -->
         {{#if combatCount}}
@@ -78,15 +82,15 @@ <h3>{{localize 'SR5.InitiativePass'}} {{combat.initiativePass}}</h3>
                 <h4>{{this.name}}</h4>
                 <div class="combatant-controls flexrow">
                     {{#if ../user.isGM}}
-                    <a class="combatant-control {{#if this.hidden}}active{{/if}}" data-tooltip="COMBAT.ToggleVis" data-control="toggleHidden">
+                    <a class="combatant-control {{#if this.hidden}}active{{/if}}" aria-label="{{localize 'COMBAT.ToggleVis'}}" role="button" data-tooltip="COMBAT.ToggleVis" data-control="toggleHidden">
                         <i class="fas fa-eye-slash"></i>
                     </a>
-                    <a class="combatant-control {{#if this.defeated}}active{{/if}}" data-tooltip="COMBAT.ToggleDead" data-control="toggleDefeated">
+                    <a class="combatant-control {{#if this.defeated}}active{{/if}}" aria-label="{{localize 'COMBAT.ToggleDead'}}" role="button" data-tooltip="COMBAT.ToggleDead" data-control="toggleDefeated">
                         <i class="fas fa-skull"></i>
                     </a>
                     {{/if}}
                     {{#if this.canPing}}
-                    <a class="combatant-control" data-tooltip="COMBAT.PingCombatant" data-control="pingCombatant">
+                    <a class="combatant-control" aria-label="{{localize 'COMBAT.PingCombatant'}}" role="button" data-tooltip="COMBAT.PingCombatant" data-control="pingCombatant">
                         <i class="fa-solid fa-bullseye-arrow"></i>
                     </a>
                     {{/if}}
@@ -117,7 +121,7 @@ <h4>{{this.name}}</h4>
                 {{#if this.hasRolled}}
                 <span class="initiative">{{this.initiative}}</span>
                 {{else if this.owner}}
-                <a class="combatant-control roll" data-tooltip="COMBAT.InitiativeRoll" data-control="rollInitiative"></a>
+                <a class="combatant-control roll" aria-label="{{localize 'COMBAT.InitiativeRoll'}}" role="button" data-tooltip="COMBAT.InitiativeRoll" data-control="rollInitiative"></a>
                 {{/if}}
             </div>
         </li>
@@ -129,18 +133,18 @@ <h4>{{this.name}}</h4>
             {{#if user.isGM}}
                 {{#if round}}
                 <!--<a class="combat-control" data-tooltip="COMBAT.RoundPrev" data-control="previousRound"><i class="fas fa-step-backward"></i></a>-->
-                <a class="combat-control" data-tooltip="COMBAT.TurnPrev" data-control="previousTurn"><i class="fas fa-arrow-left"></i></a>
-                <a class="combat-control center" data-control="endCombat">{{localize 'COMBAT.End'}}</a>
-                <a class="combat-control" data-tooltip="COMBAT.TurnNext" data-control="nextTurn"><i class="fas fa-arrow-right"></i></a>
+                <a class="combat-control" aria-label="{{localize 'COMBAT.TurnPrev'}}" role="button" data-tooltip="COMBAT.TurnPrev" data-control="previousTurn"><i class="fas fa-arrow-left"></i></a>
+                <a class="combat-control center" aria-label="{{localize 'COMBAT.End'}}" role="button" data-control="endCombat">{{localize 'COMBAT.End'}}</a>
+                <a class="combat-control" aria-label="{{localize 'COMBAT.TurnNext'}}" role="button" data-tooltip="COMBAT.TurnNext" data-control="nextTurn"><i class="fas fa-arrow-right"></i></a>
                 <!--<a class="combat-control" data-tooltip="COMBAT.RoundNext" data-control="nextRound"><i class="fas fa-step-forward"></i></a>-->
                 {{else}}
-                <a class="combat-control center" data-control="startCombat">{{localize 'COMBAT.Begin'}}</a>
-                {{/if}}
-            {{else if control}}
-            <a class="combat-control" data-tooltip="COMBAT.TurnPrev" data-control="previousTurn"><i class="fas fa-arrow-left"></i></a>
-            <a class="combat-control center" data-control="nextTurn">{{localize 'COMBAT.TurnEnd'}}</a>
-            <a class="combat-control" data-tooltip="COMBAT.TurnNext" data-control="nextTurn"><i class="fas fa-arrow-right"></i></a>
+                <a class="combat-control center" aria-label="{{localize 'COMBAT.Begin'}}" role="button"  data-control="startCombat">{{localize 'COMBAT.Begin'}}</a>
             {{/if}}
+        {{else if control}}
+        <a class="combat-control" aria-label="{{localize 'COMBAT.TurnPrev'}}" role="button"  data-tooltip="COMBAT.TurnPrev" data-control="previousTurn"><i class="fas fa-arrow-left"></i></a>
+        <a class="combat-control center" aria-label="{{localize 'COMBAT.TurnEnd'}}" role="button"  data-control="nextTurn">{{localize 'COMBAT.TurnEnd'}}</a>
+        <a class="combat-control" aria-label="{{localize 'COMBAT.TurnNext'}}" role="button"  data-tooltip="COMBAT.TurnNext" data-control="nextTurn"><i class="fas fa-arrow-right"></i></a>
         {{/if}}
-        </nav>
-</section>
+    {{/if}}
+    </nav>
+</section>