Merge remote-tracking branch 'origin/master' into 056-items-compendium

src/lang/de.json

@@ -14,7 +14,7 @@
     "DS4.HeadingTalentsAbilities": "Talente & Fähigkeiten",
     "DS4.HeadingSpells": "Zaubersprüche",
     "DS4.HeadingDescription": "Beschreibung",
-    "DS4.HeadingSpecialCreatureAbilites": "Besondere Fähigkeiten",
+    "DS4.HeadingSpecialCreatureAbilities": "Besondere Fähigkeiten",
     "DS4.AttackType": "Angriffstyp",
     "DS4.AttackTypeAbbr": "AT",
     "DS4.WeaponBonus": "Waffenbonus",

src/lang/en.json

@@ -14,7 +14,7 @@
     "DS4.HeadingTalentsAbilities": "Talents & Abilities",
     "DS4.HeadingSpells": "Spells",
     "DS4.HeadingDescription": "Description",
-    "DS4.HeadingSpecialCreatureAbilites": "Special Abilites",
+    "DS4.HeadingSpecialCreatureAbilities": "Special Abilities",
     "DS4.AttackType": "Attack Type",
     "DS4.AttackTypeAbbr": "AT",
     "DS4.WeaponBonus": "Weapon Bonus",

src/module/actor/sheets/actor-sheet.ts

@@ -16,7 +16,14 @@ export class DS4ActorSheet extends ActorSheet<ActorSheet.Data<DS4Actor>> {
             classes: ["ds4", "sheet", "actor"],
             width: 745,
             height: 600,
-            scrollY: [".sheet-body"],
+            scrollY: [
+                ".inventory",
+                ".spells",
+                ".talents-abilities",
+                ".profile",
+                ".biography",
+                ".special-creature-abilities",
+            ],
             template: superDefaultOptions.template,
             viewPermission: superDefaultOptions.viewPermission,
             closeOnSubmit: superDefaultOptions.closeOnSubmit,

src/scss/components/_apps.scss

@@ -8,14 +8,11 @@
     }
 
     .sheet-body {
-        overflow-y: auto;
+        overflow-y: hidden;
     }
     .tab {
         height: 100%;
         overflow-y: auto;
         align-content: flex-start;
-        ol {
-            overflow-y: auto;
-        }
     }
 }

src/templates/actor/creature-sheet.hbs

@@ -58,7 +58,7 @@
     {{!-- Sheet Tab Navigation --}}
     <nav class="sheet-tabs tabs" data-group="primary">
         <a class="item" data-tab="inventory">{{localize 'DS4.HeadingInventory'}}</a>
-        <a class="item" data-tab="special-creature-abilites">{{localize 'DS4.HeadingSpecialCreatureAbilites'}}</a>
+        <a class="item" data-tab="special-creature-abilities">{{localize 'DS4.HeadingSpecialCreatureAbilities'}}</a>
         <a class="item" data-tab="spells">{{localize 'DS4.HeadingSpells'}}</a>
         <a class="item" data-tab="description">{{localize 'DS4.HeadingDescription'}}</a>
     </nav>

src/templates/actor/partials/special-creature-abilities-overview.hbs

@@ -51,7 +51,7 @@
 {{!-- ======================================================================== --}}
 
 
-<div class="tab special-creature-abilites" data-group="primary" data-tab="special-creature-abilites">
+<div class="tab special-creature-abilities" data-group="primary" data-tab="special-creature-abilities">
     <ol class="items-list">
         {{> baseItemListHeader dataType='specialCreatureAbility' }}
         {{#each itemsByType.specialCreatureAbility as |item id|}}