From d31c9ac24b6ff70d3c568327a224dcb4faac88e0 Mon Sep 17 00:00:00 2001
From: Johannes Loher <johannes.loher@fg4f.de>
Date: Sat, 20 Feb 2021 02:12:34 +0100
Subject: [PATCH 1/2] Fix saving scroll position in actor sheets

---
 src/module/actor/sheets/actor-sheet.ts                   | 9 ++++++++-
 src/scss/components/_apps.scss                           | 5 +----
 src/templates/actor/creature-sheet.hbs                   | 2 +-
 .../partials/special-creature-abilities-overview.hbs     | 4 ++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/module/actor/sheets/actor-sheet.ts b/src/module/actor/sheets/actor-sheet.ts
index 3df4f04..5860e5d 100644
--- a/src/module/actor/sheets/actor-sheet.ts
+++ b/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,
diff --git a/src/scss/components/_apps.scss b/src/scss/components/_apps.scss
index 878f83e..a919804 100644
--- a/src/scss/components/_apps.scss
+++ b/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;
-        }
     }
 }
diff --git a/src/templates/actor/creature-sheet.hbs b/src/templates/actor/creature-sheet.hbs
index 1238420..520f469 100644
--- a/src/templates/actor/creature-sheet.hbs
+++ b/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.HeadingSpecialCreatureAbilites'}}</a>
         <a class="item" data-tab="spells">{{localize 'DS4.HeadingSpells'}}</a>
         <a class="item" data-tab="description">{{localize 'DS4.HeadingDescription'}}</a>
     </nav>
diff --git a/src/templates/actor/partials/special-creature-abilities-overview.hbs b/src/templates/actor/partials/special-creature-abilities-overview.hbs
index 078fa28..a79d5d2 100644
--- a/src/templates/actor/partials/special-creature-abilities-overview.hbs
+++ b/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|}}
@@ -59,4 +59,4 @@
         {{/each}}
     </ol>
     {{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType='specialCreatureAbility' }}
-</div>
\ No newline at end of file
+</div>

From 2db1dae4c23ee075f98268995afc32c6887ea202 Mon Sep 17 00:00:00 2001
From: Johannes Loher <johannes.loher@fg4f.de>
Date: Sat, 20 Feb 2021 02:15:28 +0100
Subject: [PATCH 2/2] Fix typo

---
 src/lang/de.json                       | 2 +-
 src/lang/en.json                       | 2 +-
 src/templates/actor/creature-sheet.hbs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lang/de.json b/src/lang/de.json
index caf0ce5..e211953 100644
--- a/src/lang/de.json
+++ b/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",
diff --git a/src/lang/en.json b/src/lang/en.json
index 3012b70..993e61a 100644
--- a/src/lang/en.json
+++ b/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",
diff --git a/src/templates/actor/creature-sheet.hbs b/src/templates/actor/creature-sheet.hbs
index 520f469..65d4ff0 100644
--- a/src/templates/actor/creature-sheet.hbs
+++ b/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-abilities">{{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>