Merge branch 'slight-improvements-in-actor-sheet' into 'master'

Fix saving scroll position in actor sheets

See merge request dungeonslayers/ds4!81
This commit is contained in:
Johannes Loher 2021-02-20 02:15:25 +01:00
commit db5283062e
4 changed files with 12 additions and 8 deletions

View file

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

View file

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

View file

@ -58,7 +58,7 @@
{{!-- Sheet Tab Navigation --}} {{!-- Sheet Tab Navigation --}}
<nav class="sheet-tabs tabs" data-group="primary"> <nav class="sheet-tabs tabs" data-group="primary">
<a class="item" data-tab="inventory">{{localize 'DS4.HeadingInventory'}}</a> <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="spells">{{localize 'DS4.HeadingSpells'}}</a>
<a class="item" data-tab="description">{{localize 'DS4.HeadingDescription'}}</a> <a class="item" data-tab="description">{{localize 'DS4.HeadingDescription'}}</a>
</nav> </nav>

View file

@ -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"> <ol class="items-list">
{{> baseItemListHeader dataType='specialCreatureAbility' }} {{> baseItemListHeader dataType='specialCreatureAbility' }}
{{#each itemsByType.specialCreatureAbility as |item id|}} {{#each itemsByType.specialCreatureAbility as |item id|}}