diff --git a/module/applications/sheets/actors/adversary.mjs b/module/applications/sheets/actors/adversary.mjs index a5d9d8a6..b47cb85a 100644 --- a/module/applications/sheets/actors/adversary.mjs +++ b/module/applications/sheets/actors/adversary.mjs @@ -25,11 +25,22 @@ export default class AdversarySheet extends DHBaseActorSheet { }; static PARTS = { - sidebar: { template: 'systems/daggerheart/templates/sheets/actors/adversary/sidebar.hbs' }, + sidebar: { + template: 'systems/daggerheart/templates/sheets/actors/adversary/sidebar.hbs', + scrollable: ['.shortcut-items-section'] + }, header: { template: 'systems/daggerheart/templates/sheets/actors/adversary/header.hbs' }, - features: { template: 'systems/daggerheart/templates/sheets/actors/adversary/features.hbs' }, - notes: { template: 'systems/daggerheart/templates/sheets/actors/adversary/notes.hbs' }, - effects: { template: 'systems/daggerheart/templates/sheets/actors/adversary/effects.hbs' } + features: { + template: 'systems/daggerheart/templates/sheets/actors/adversary/features.hbs', + scrollable: ['.feature-section'] + }, + notes: { + template: 'systems/daggerheart/templates/sheets/actors/adversary/notes.hbs' + }, + effects: { + template: 'systems/daggerheart/templates/sheets/actors/adversary/effects.hbs', + scrollable: ['.effects-sections'] + } }; /** @inheritdoc */ diff --git a/module/applications/sheets/actors/character.mjs b/module/applications/sheets/actors/character.mjs index 92f6239b..0328f0dd 100644 --- a/module/applications/sheets/actors/character.mjs +++ b/module/applications/sheets/actors/character.mjs @@ -78,6 +78,7 @@ export default class CharacterSheet extends DHBaseActorSheet { static PARTS = { sidebar: { id: 'sidebar', + scrollable: ['.shortcut-items-section'], template: 'systems/daggerheart/templates/sheets/actors/character/sidebar.hbs' }, header: { @@ -86,22 +87,27 @@ export default class CharacterSheet extends DHBaseActorSheet { }, features: { id: 'features', + scrollable: ['.features-sections'], template: 'systems/daggerheart/templates/sheets/actors/character/features.hbs' }, loadout: { id: 'loadout', + scrollable: ['.items-section'], template: 'systems/daggerheart/templates/sheets/actors/character/loadout.hbs' }, inventory: { id: 'inventory', + scrollable: ['.items-section'], template: 'systems/daggerheart/templates/sheets/actors/character/inventory.hbs' }, biography: { id: 'biography', + scrollable: ['.items-section'], template: 'systems/daggerheart/templates/sheets/actors/character/biography.hbs' }, effects: { id: 'effects', + scrollable: ['.effects-sections'], template: 'systems/daggerheart/templates/sheets/actors/character/effects.hbs' } }; diff --git a/module/applications/sheets/actors/companion.mjs b/module/applications/sheets/actors/companion.mjs index 1105131d..2b82f50a 100644 --- a/module/applications/sheets/actors/companion.mjs +++ b/module/applications/sheets/actors/companion.mjs @@ -15,7 +15,10 @@ export default class DhCompanionSheet extends DHBaseActorSheet { static PARTS = { header: { template: 'systems/daggerheart/templates/sheets/actors/companion/header.hbs' }, details: { template: 'systems/daggerheart/templates/sheets/actors/companion/details.hbs' }, - effects: { template: 'systems/daggerheart/templates/sheets/actors/companion/effects.hbs' } + effects: { + template: 'systems/daggerheart/templates/sheets/actors/companion/effects.hbs', + scrollable: ['.effects-sections'] + } }; /* -------------------------------------------- */ diff --git a/module/applications/sheets/actors/environment.mjs b/module/applications/sheets/actors/environment.mjs index 9fd003c6..0389d2c9 100644 --- a/module/applications/sheets/actors/environment.mjs +++ b/module/applications/sheets/actors/environment.mjs @@ -27,9 +27,13 @@ export default class DhpEnvironment extends DHBaseActorSheet { /**@override */ static PARTS = { header: { template: 'systems/daggerheart/templates/sheets/actors/environment/header.hbs' }, - features: { template: 'systems/daggerheart/templates/sheets/actors/environment/features.hbs' }, + features: { + template: 'systems/daggerheart/templates/sheets/actors/environment/features.hbs', + scrollable: ['feature-section'] + }, potentialAdversaries: { - template: 'systems/daggerheart/templates/sheets/actors/environment/potentialAdversaries.hbs' + template: 'systems/daggerheart/templates/sheets/actors/environment/potentialAdversaries.hbs', + scrollable: ['items-sections'] }, notes: { template: 'systems/daggerheart/templates/sheets/actors/environment/notes.hbs' } }; diff --git a/styles/less/sheets/actors/adversary/effects.less b/styles/less/sheets/actors/adversary/effects.less new file mode 100644 index 00000000..4afe2454 --- /dev/null +++ b/styles/less/sheets/actors/adversary/effects.less @@ -0,0 +1,17 @@ +@import '../../../utils/colors.less'; + +.application.sheet.daggerheart.actor.dh-style.adversary { + .tab.effects { + .effects-sections { + display: flex; + flex-direction: column; + gap: 10px; + overflow-y: auto; + mask-image: linear-gradient(0deg, transparent 0%, black 5%); + padding-bottom: 20px; + + scrollbar-width: thin; + scrollbar-color: light-dark(@dark-blue, @golden) transparent; + } + } +} diff --git a/styles/less/sheets/actors/companion/effects.less b/styles/less/sheets/actors/companion/effects.less new file mode 100644 index 00000000..12e1d847 --- /dev/null +++ b/styles/less/sheets/actors/companion/effects.less @@ -0,0 +1,17 @@ +@import '../../../utils/colors.less'; + +.application.sheet.daggerheart.actor.dh-style.companion { + .tab.effects { + .effects-sections { + display: flex; + flex-direction: column; + gap: 10px; + overflow-y: auto; + mask-image: linear-gradient(0deg, transparent 0%, black 5%); + padding-bottom: 20px; + + scrollbar-width: thin; + scrollbar-color: light-dark(@dark-blue, @golden) transparent; + } + } +} diff --git a/styles/less/sheets/actors/environment/potentialAdversaries.less b/styles/less/sheets/actors/environment/potentialAdversaries.less new file mode 100644 index 00000000..6fd7af65 --- /dev/null +++ b/styles/less/sheets/actors/environment/potentialAdversaries.less @@ -0,0 +1,17 @@ +@import '../../../utils/colors.less'; + +.application.sheet.daggerheart.actor.dh-style.environment { + .tab.potentialAdversaries { + .items-section { + display: flex; + flex-direction: column; + gap: 10px; + overflow-y: auto; + mask-image: linear-gradient(0deg, transparent 0%, black 5%); + padding-bottom: 20px; + + scrollbar-width: thin; + scrollbar-color: light-dark(@dark-blue, @golden) transparent; + } + } +} \ No newline at end of file diff --git a/styles/less/sheets/index.less b/styles/less/sheets/index.less index 1ffb92fe..991837c0 100644 --- a/styles/less/sheets/index.less +++ b/styles/less/sheets/index.less @@ -4,6 +4,7 @@ @import './actors/adversary/header.less'; @import './actors/adversary/sheet.less'; @import './actors/adversary/sidebar.less'; +@import './actors/adversary/effects.less'; @import './actors/character/biography.less'; @import './actors/character/effects.less'; @@ -17,9 +18,11 @@ @import './actors/companion/details.less'; @import './actors/companion/header.less'; @import './actors/companion/sheet.less'; +@import './actors/companion/effects.less'; @import './actors/environment/actions.less'; @import './actors/environment/header.less'; +@import './actors/environment/potentialAdversaries.less'; @import './actors/environment/sheet.less'; @import './items/beastform.less'; diff --git a/templates/sheets/actors/adversary/effects.hbs b/templates/sheets/actors/adversary/effects.hbs index 325610e6..cefb6e57 100644 --- a/templates/sheets/actors/adversary/effects.hbs +++ b/templates/sheets/actors/adversary/effects.hbs @@ -1,20 +1,22 @@
- {{> 'daggerheart.inventory-items' - title='DAGGERHEART.GENERAL.activeEffects' - type='effect' - isGlassy=true - collection=effects.actives - canCreate=true - hideResources=true - }} +
+ {{> 'daggerheart.inventory-items' + title='DAGGERHEART.GENERAL.activeEffects' + type='effect' + isGlassy=true + collection=effects.actives + canCreate=true + hideResources=true + }} - {{> 'daggerheart.inventory-items' - title='DAGGERHEART.GENERAL.inactiveEffects' - type='effect' - isGlassy=true - collection=effects.inactives - canCreate=true - hideResources=true - }} + {{> 'daggerheart.inventory-items' + title='DAGGERHEART.GENERAL.inactiveEffects' + type='effect' + isGlassy=true + collection=effects.inactives + canCreate=true + hideResources=true + }} +
\ No newline at end of file diff --git a/templates/sheets/actors/companion/effects.hbs b/templates/sheets/actors/companion/effects.hbs index 325610e6..cefb6e57 100644 --- a/templates/sheets/actors/companion/effects.hbs +++ b/templates/sheets/actors/companion/effects.hbs @@ -1,20 +1,22 @@
- {{> 'daggerheart.inventory-items' - title='DAGGERHEART.GENERAL.activeEffects' - type='effect' - isGlassy=true - collection=effects.actives - canCreate=true - hideResources=true - }} +
+ {{> 'daggerheart.inventory-items' + title='DAGGERHEART.GENERAL.activeEffects' + type='effect' + isGlassy=true + collection=effects.actives + canCreate=true + hideResources=true + }} - {{> 'daggerheart.inventory-items' - title='DAGGERHEART.GENERAL.inactiveEffects' - type='effect' - isGlassy=true - collection=effects.inactives - canCreate=true - hideResources=true - }} + {{> 'daggerheart.inventory-items' + title='DAGGERHEART.GENERAL.inactiveEffects' + type='effect' + isGlassy=true + collection=effects.inactives + canCreate=true + hideResources=true + }} +
\ No newline at end of file diff --git a/templates/sheets/actors/environment/potentialAdversaries.hbs b/templates/sheets/actors/environment/potentialAdversaries.hbs index cc246312..5f4d039e 100644 --- a/templates/sheets/actors/environment/potentialAdversaries.hbs +++ b/templates/sheets/actors/environment/potentialAdversaries.hbs @@ -3,7 +3,7 @@ data-tab='{{tabs.potentialAdversaries.id}}' data-group='{{tabs.potentialAdversaries.group}}' > -
+
{{#each document.system.potentialAdversaries as |category categoryId|}} {{> 'daggerheart.inventory-items' title=category.label