Make sheet tab scrollbars stable and remove fieldsets

module/applications/sheets/actors/adversary.mjs

@@ -7,7 +7,7 @@ export default class AdversarySheet extends DHBaseActorSheet {
     /** @inheritDoc */
     static DEFAULT_OPTIONS = {
         classes: ['adversary'],
-        position: { width: 645, height: 750 },
+        position: { width: 645, height: 760 },
         window: { resizable: true },
         actions: {
             toggleHitPoints: AdversarySheet.#toggleHitPoints,

module/applications/sheets/api/application-mixin.mjs

@@ -305,7 +305,7 @@ export default function DHApplicationMixin(Base) {
         _preSyncPartState(partId, newElement, priorElement, state) {
             super._preSyncPartState(partId, newElement, priorElement, state);
             for (const el of priorElement.querySelectorAll('.extensible.extended')) {
-                const { actionId, itemUuid } = el.closest('[data-item-uuid], [data-action-id]').dataset;
+                const { actionId, itemUuid } = el.parentElement.dataset;
                 const selector = `${actionId ? `[data-action-id="${actionId}"]` : `[data-item-uuid="${itemUuid}"]`} .extensible`;
                 const newExtensible = newElement.querySelector(selector);
                 newExtensible?.classList.add('extended');

styles/less/global/elements.less

@@ -261,14 +261,15 @@
 
     fieldset {
         align-items: center;
-        margin: 5px 0 0 0;
+        margin: 0;
+        margin-top: 5px;
         border-radius: 6px;
         border-color: @color-fieldset-border;
-        padding-inline: 0.625rem;
 
         &.glassy {
             background-color: light-dark(@dark-blue-10, @golden-10);
             border: none;
+            padding-inline: 10px;
 
             legend {
                 padding: 2px 12px;
@@ -513,7 +514,7 @@
         height: 1px;
         width: 100%;
         border-bottom: 1px solid @color-border;
-        mask-image: linear-gradient(270deg, transparent 0%, black 50%, transparent 100%);
+        mask-image: linear-gradient(270deg, transparent 0%, black 35%, black 50%, black 65%, transparent 100%);
     }
 
     side-line-div {
@@ -547,39 +548,6 @@
         transform-origin: top;
     }
 
-    /* A multi-button element used to attach resources to other buttons */
-    .item-button {
-        display: flex;
-        button {
-            color: light-dark(@dark-blue, @dark-blue);
-            white-space: nowrap;
-            border: none;
-
-            &:hover {
-                color: @color-text-emphatic;
-            }
-
-            &:not(:first-child) {
-                border-top-left-radius: 0;
-                border-bottom-left-radius: 0;
-                padding: 6px;
-                background: light-dark(@dark-blue-10, @golden-secondary);
-                color: light-dark(@dark-blue, @dark-golden);
-
-                &:hover {
-                    background: light-dark(@light-black, @dark-blue);
-                    color: light-dark(@dark-blue, @golden-secondary);
-                }
-            }
-
-            &:not(:last-child) {
-                border-top-right-radius: 0;
-                border-bottom-right-radius: 0;
-                border-right: 1px solid black;
-            }
-        }
-    }
-
     .artist-attribution {
         width: 100%;
         display: flex;
@@ -587,7 +555,7 @@
         font-style: italic;
         font-family: @font-body;
         margin-top: 4px;
-        color: light-dark(#14142599, #efe6d850);
+        color: @color-text-subtle;
         font-size: var(--font-size-12);
         padding-left: 3px;
     }

styles/less/global/global.less

@@ -96,7 +96,7 @@
             flex-wrap: wrap;
             font-size: var(--font-size-12);
             justify-content: start;
-            padding: 3px 5px;
+            padding: 2px 5px;
         }
     }
 }

styles/less/global/inventory-item.less

@@ -45,8 +45,11 @@
 
             .item-main {
                 border-radius: 5px;
+
+                // Make hover extend out of bounds.
+                // Because of this extra spacing, the scroll container parent needs some padding
                 padding: 2px;
-                margin: -2px;
+                margin: -2px -2px 0 -2px;
             }
 
             &:hover {
@@ -275,9 +278,45 @@
         .item-buttons {
             grid-column: span 3;
             display: flex;
-            gap: 4px;
+            gap: 8px;
             flex-wrap: wrap;
-            margin-top: 2px;
+
+            .item-button {
+                display: flex;
+                border: 1px solid light-dark(#18162e, #18162e);
+                color: light-dark(#18162e, #18162e);
+                outline: none;
+                box-shadow: none;
+                border-radius: 6px;
+
+                button {
+                    border-radius: 3px 0px 0px 3px;
+                    color: light-dark(@dark-blue, @dark-blue);
+                    white-space: nowrap;
+                    border: 0;
+
+                    &:hover {
+                        color: @color-text-emphatic;
+                    }
+
+                    &:not(:first-child) {
+                        padding: 6px;
+                        background: light-dark(@dark-blue-10, @golden-secondary);
+                        border-radius: 0px 3px 3px 0px;
+                        color: light-dark(@dark-blue, @dark-golden);
+
+                        &:hover {
+                            background: light-dark(@light-black, @dark-blue);
+                            color: light-dark(@dark-blue, @golden-secondary);
+                        }
+                    }
+                }
+
+                .spacer {
+                    border-right: 1px solid black;
+                    content: '';
+                }
+            }
         }
     }
 

styles/less/sheets/actors/actor-sheet-shared.less

@@ -18,6 +18,8 @@
 });
 
 .application.sheet.daggerheart.actor.dh-style {
+    --side-indent: 16px;
+
     .portrait img,
     .profile {
         width: 100%;
@@ -47,11 +49,24 @@
     }
 
     .tab {
-        flex: 1;
         padding: 0;
-        overflow: hidden;
         .search-section {
-            padding: 12px 14px var(--spacer-8) 12px;
+            padding: var(--spacer-16) 12px var(--spacer-8) 10px;
+        }
+
+        .scroll-container {
+            scrollbar-gutter: stable;
+            overflow-y: auto;
+            .with-scroll-shadows();
+
+            padding: var(--spacer-16) calc(var(--side-indent) - var(--scrollbar-width)) 4px var(--side-indent);
+
+            > fieldset:first-child {
+                margin-top: 0;
+            }
+        }
+        .scroll-container:not(:first-child) {
+            padding-top: var(--spacer-8); // nested have less top padding
         }
     }
 
@@ -60,7 +75,7 @@
             display: grid;
             grid-template-columns: 1fr 1fr 1fr 1fr;
             gap: 10px;
-            padding: var(--spacer-8) 16px var(--spacer-8) 16px;
+            padding: var(--spacer-8) var(--side-indent) var(--spacer-12) var(--side-indent);
 
             .input {
                 color: light-dark(@dark, @beige);
@@ -71,6 +86,7 @@
     .tab.notes.active {
         padding: 0;
         margin: 0;
+        margin-top: -10px; // will be removed once tab-navigation bottom margin is removed on all actor sheets
         scrollbar-gutter: unset;
 
         // Add padding around top level level prosemirrors used for note tabs
@@ -79,7 +95,6 @@
             .editor-content {
                 scrollbar-gutter: stable;
                 padding-right: @right-padding;
-                padding-bottom: 4px;
             }
             &.inactive {
                 button.toggle {
@@ -90,7 +105,7 @@
                 }
             }
             &.active {
-                padding: 8px 0 0 16px;
+                padding: 8px 0 4px 16px;
             }
         }
 
@@ -108,7 +123,6 @@
             position: relative;
             color: light-dark(@dark-blue-50, @beige-50);
             width: 100%;
-            padding-top: 5px;
 
             input {
                 border-radius: 50px;

styles/less/sheets/actors/adversary/effects.less

@@ -7,8 +7,6 @@
             display: flex;
             flex-direction: column;
             gap: 10px;
-            padding: 7px calc(12px - var(--scrollbar-width)) 4px 12px;
-            .stable-scroll-container();
         }
     }
 }

styles/less/sheets/actors/adversary/features.less

@@ -5,8 +5,9 @@
 .application.sheet.daggerheart.actor.dh-style.adversary {
     .tab.features {
         .feature-section {
-            padding: 16px calc(16px - var(--scrollbar-width)) 4px 16px;
-            .stable-scroll-container();
+            display: flex;
+            flex-direction: column;
+            gap: 10px;
         }
     }
 }

styles/less/sheets/actors/adversary/header.less

@@ -7,7 +7,7 @@
         width: 100%;
 
         > *:not(line-div, .tab-navigation) {
-            padding-left: 15px;
+            padding-left: var(--side-indent);
             padding-right: 15px;
         }
 

styles/less/sheets/actors/adversary/notes.less

@@ -1,3 +0,0 @@
-.application.sheet.daggerheart.actor.dh-style.adversary .tab.notes.active {
-    padding-bottom: 20px;
-}

styles/less/sheets/actors/adversary/sheet.less

@@ -30,9 +30,11 @@
         grid-row: 2;
         grid-column: 2;
         &.active {
+            overflow: hidden;
             display: flex;
             flex-direction: column;
             margin: 0 0 10px 0;
+            position: relative;
         }
     }
 }

styles/less/sheets/actors/character/biography.less

@@ -8,14 +8,11 @@
             display: flex;
             flex-direction: column;
             gap: 10px;
-            height: 100%;            
-            padding: 12px calc(12px - var(--scrollbar-width)) 4px 12px;
-            .stable-scroll-container();
+            flex: 1;
         }
 
         .characteristics-section {
             gap: 20px;
-            padding: 0 4px;
         }
 
         .biography-section {

styles/less/sheets/actors/character/effects.less

@@ -8,8 +8,6 @@
             display: flex;
             flex-direction: column;
             gap: 10px;
-            padding: 7px calc(12px - var(--scrollbar-width)) 4px 12px;
-            .stable-scroll-container();
         }
     }
 }

styles/less/sheets/actors/character/features.less

@@ -8,8 +8,6 @@
             display: flex;
             flex-direction: column;
             gap: 10px;
-            padding: 7px calc(12px - var(--scrollbar-width)) 4px 12px;
-            .stable-scroll-container();
         }
     }
 }

styles/less/sheets/actors/character/header.less

@@ -23,8 +23,8 @@
         width: 100%;
         
         > *:not(line-div, .tab-navigation) {
-            padding-left: 15px;
-            padding-right: 15px;
+            margin-left: var(--side-indent);
+            margin-right: 15px;
         }
 
         .name-row {
@@ -224,7 +224,7 @@
             justify-content: space-between;
             max-width: 38.5rem;
             gap: 0.5rem;
-            margin-left: 0.5rem;
+            padding-left: 0.5rem;
 
             .trait {
                 cursor: pointer;

styles/less/sheets/actors/character/inventory.less

@@ -8,8 +8,6 @@
             display: flex;
             flex-direction: column;
             gap: 10px;
-            padding: 8px calc(12px - var(--scrollbar-width)) 4px 12px;
-            .stable-scroll-container();
         }
     }
 }

styles/less/sheets/actors/character/loadout.less

@@ -50,8 +50,6 @@
             display: flex;
             flex-direction: column;
             gap: 10px;
-            padding: 8px calc(12px - var(--scrollbar-width)) 4px 12px;
-            .stable-scroll-container();
         }
     }
 }

styles/less/sheets/actors/character/sheet.less

@@ -2,6 +2,8 @@
 @import '../../../utils/fonts.less';
 
 .application.sheet.daggerheart.actor.dh-style.character {
+    --side-indent: 16px;
+
     .window-content {
         display: grid;
         grid-template-columns: 275px 1fr;
@@ -10,28 +12,34 @@
         width: 100%;
         padding-bottom: 0;
         overflow-x: auto;
+    }
     
-        .character-sidebar-sheet {
-            grid-row: 1 / span 2;
-            grid-column: 1;
+    .character-sidebar-sheet {
+        grid-row: 1 / span 2;
+        grid-column: 1;
+        display: flex;
+        flex-direction: column;
+    }
+
+    .character-header-sheet {
+        position: relative;
+        grid-row: 1;
+        grid-column: 2;
+    }
+
+    .tab {
+        grid-row: 2;
+        grid-column: 2;
+        padding-right: 0;
+        margin-right: 2px;
+        margin-bottom: 12px;
+        &.active {
             display: flex;
             flex-direction: column;
-        }
-
-        .character-header-sheet {
+            overflow: hidden;
+            margin: 0 0 10px 0;
+            padding: 0;
             position: relative;
-            grid-row: 1;
-            grid-column: 2;
-        }
-
-        .tab {
-            grid-row: 2;
-            grid-column: 2;
-            &.active {
-                display: flex;
-                flex-direction: column;
-                margin: 0 0 10px 0;
-            }
         }
     }
 }

styles/less/sheets/actors/companion/details.less

@@ -1,10 +1,7 @@
 @import '../../../utils/colors.less';
 @import '../../../utils/fonts.less';
 
-.application.sheet.daggerheart.actor.dh-style.companion .tab.details.active {
-    padding: 12px calc(12px - var(--scrollbar-width)) 4px 12px;
-    .stable-scroll-container();
-
+.application.sheet.daggerheart.actor.dh-style.companion {
     .partner-section,
     .attack-section,
     .experience-list {

styles/less/sheets/actors/companion/effects.less

@@ -1,13 +1,18 @@
 @import '../../../utils/colors.less';
+@import '../../../utils/mixin.less';
 
 .application.sheet.daggerheart.actor.dh-style.companion {
     .tab.effects {
+        margin-right: 2px;
+        padding-right: 0;
         .effects-sections {
             display: flex;
             flex-direction: column;
             gap: 10px;
-            padding: 7px calc(12px - var(--scrollbar-width)) 4px 12px;
-            .stable-scroll-container();
+            overflow-y: auto;
+            padding-bottom: 4px;
+            scrollbar-gutter: stable;
+            .with-scroll-shadows();
         }
     }
 }

styles/less/sheets/actors/environment/features.less

@@ -5,8 +5,9 @@
 .application.sheet.daggerheart.actor.dh-style.environment {
     .tab.features {
         .feature-section {
-            padding: 16px calc(16px - var(--scrollbar-width)) 4px 16px;
-            .stable-scroll-container();
+            display: flex;
+            flex-direction: column;
+            gap: 10px;
         }
     }
 }

styles/less/sheets/actors/environment/header.less

@@ -138,10 +138,11 @@
         }
 
         .environment-navigation {
-            padding: 0 20px;
+            padding-right: 20px;
 
             .tab-navigation {
                 margin-top: 0;
+                margin-bottom: 0;
             }
         }
     }

styles/less/sheets/actors/environment/potentialAdversaries.less

@@ -1,4 +1,5 @@
 @import '../../../utils/colors.less';
+@import '../../../utils/mixin.less';
 
 .application.sheet.daggerheart.actor.dh-style.environment {
     .tab.potentialAdversaries {
@@ -6,8 +7,6 @@
             display: flex;
             flex-direction: column;
             gap: 10px;
-            padding: 7px calc(12px - var(--scrollbar-width)) 4px 12px;
-            .stable-scroll-container();
         }
     }
 }

styles/less/sheets/actors/environment/sheet.less

@@ -14,7 +14,9 @@
 
 .application.sheet.daggerheart.actor.dh-style.environment {
     .tab {
+        flex: 1;
         overflow-y: auto;
+
         &.active {
             overflow: hidden;
             display: flex;

styles/less/sheets/actors/npc/features.less

@@ -7,8 +7,12 @@
         }
 
         .feature-section {
-            padding: 16px calc(16px - var(--scrollbar-width)) 4px 16px;
-            .stable-scroll-container();
+            display: flex;
+            flex-direction: column;
+            gap: 10px;
+            overflow-y: auto;
+            padding-bottom: 4px;
+            .with-scroll-shadows();
         }
     }
 }

styles/less/sheets/actors/party/index.less

@@ -1,4 +1,4 @@
+@import './sheet.less';
 @import './header.less';
 @import './party-members.less';
-@import './sheet.less';
 @import './inventory.less';

styles/less/sheets/actors/party/inventory.less

@@ -8,10 +8,6 @@
             display: flex;
             flex-direction: column;
             gap: 10px;
-            overflow-y: auto;
-            margin-top: 20px;
-            padding-bottom: 4px;
-            .with-scroll-shadows();
         }
     }
 }

styles/less/sheets/actors/party/party-members.less

@@ -2,9 +2,10 @@
 @import '../../../utils/fonts.less';
 @import '../../../utils/mixin.less';
 
-.application.sheet.daggerheart.actor.dh-style.party .tab.partyMembers {
-    padding: 12px calc(12px - var(--scrollbar-width)) 4px 12px;
-    .stable-scroll-container();
+.application.sheet.daggerheart.actor.dh-style.party .tab.partyMembers.active {
+    padding: var(--spacer-8) 4px 0 10px;
+    scrollbar-gutter: stable;
+    .with-scroll-shadows();
 
     .actions-section {
         display: flex;

styles/less/sheets/actors/party/sheet.less

@@ -18,7 +18,9 @@
 
 .application.sheet.daggerheart.actor.dh-style.party {
     .tab.active {
+        overflow: auto;
         display: flex;
         flex-direction: column;
+        flex: 1;
     }
 }

styles/less/utils/mixin.less

@@ -198,9 +198,3 @@
         transparent 100%
     );
 }
-
-.stable-scroll-container() {
-    overflow-y: auto;
-    scrollbar-gutter: stable;
-    .with-scroll-shadows();
-}

templates/sheets/actors/adversary/effects.hbs

@@ -1,6 +1,6 @@
 <section class='tab {{tabs.effects.cssClass}} {{tabs.effects.id}}' data-tab='{{tabs.effects.id}}'
     data-group='{{tabs.effects.group}}'>
-    <div class="effects-sections">
+    <div class="effects-sections scroll-container">
         {{> 'daggerheart.inventory-items'
         title='DAGGERHEART.GENERAL.activeEffects'
         type='effect'

templates/sheets/actors/adversary/features.hbs

@@ -1,6 +1,8 @@
-<section class='tab {{tabs.features.cssClass}} {{tabs.features.id}}' data-tab='{{tabs.features.id}}'
-    data-group='{{tabs.features.group}}'>
-    <div class="feature-section items-list">
+<section 
+    class="tab {{tabs.features.cssClass}} {{tabs.features.id}}"
+    data-tab="{{tabs.features.id}}"
+    data-group="{{tabs.features.group}}">
+    <div class="feature-section scroll-container">
         {{#each @root.features as |item|}}
             {{> "daggerheart.inventory-item"
                 item=item

templates/sheets/actors/character/biography.hbs

@@ -1,9 +1,9 @@
 <section
-    class='tab {{tabs.biography.cssClass}} {{tabs.biography.id}}'
-    data-tab='{{tabs.biography.id}}'
+    class="tab {{tabs.biography.cssClass}} {{tabs.biography.id}}"
+    data-tab="{{tabs.biography.id}}"
     data-group='{{tabs.biography.group}}'
 >
-    <div class="items-section">
+    <div class="items-section scroll-container">
         <div class="characteristics-section flexrow">
             <div class="input">
                 <span>{{localize 'DAGGERHEART.ACTORS.Character.pronouns'}}</span>

templates/sheets/actors/character/effects.hbs

@@ -1,7 +1,7 @@
 <section class='tab {{tabs.effects.cssClass}} {{tabs.effects.id}}' data-tab='{{tabs.effects.id}}'
     data-group='{{tabs.effects.group}}'>
 
-    <div class="effects-sections">
+    <div class="effects-sections scroll-container">
         {{> 'daggerheart.inventory-items'
         title='DAGGERHEART.GENERAL.activeEffects'
         type='effect'

templates/sheets/actors/character/features.hbs

@@ -1,21 +1,23 @@
-<section class='tab {{tabs.features.cssClass}} {{tabs.features.id}}' data-tab='{{tabs.features.id}}'
-    data-group='{{tabs.features.group}}'>
-    <div class="features-sections">
+<section 
+    class="tab {{tabs.features.cssClass}} {{tabs.features.id}}"
+    data-tab="{{tabs.features.id}}"
+    data-group="{{tabs.features.group}}">
+    <div class="features-section scroll-container">
         {{#each document.system.sheetLists as |category|}}
-            {{#if (eq category.type 'feature' )}}
-                {{> 'daggerheart.inventory-items'
+            {{#if (eq category.type "feature" )}}
+                {{> "daggerheart.inventory-items"
                     title=category.title
-                    type='feature'
-                    actorType='character'
+                    type="feature"
+                    actorType="character"
                     collection=category.values
                     canCreate=@root.editable
                     showActions=@root.editable
                 }}
                 {{else if category.values}}
-                {{> 'daggerheart.inventory-items'
+                {{> "daggerheart.inventory-items"
                     title=category.title
-                    type='feature'
-                    actorType='character'
+                    type="feature"
+                    actorType="character"
                     collection=category.values
                     canCreate=false
                     showActions=@root.editable

templates/sheets/actors/character/inventory.hbs

@@ -16,7 +16,7 @@
         {{> "systems/daggerheart/templates/sheets/global/partials/gold.hbs" currencies=inventory.currencies}}
     {{/if}}
 
-    <div class="items-section">
+    <div class="items-section scroll-container">
         {{> 'daggerheart.inventory-items'
         title='TYPES.Item.weapon'
         type='weapon'

templates/sheets/actors/character/loadout.hbs

@@ -20,7 +20,7 @@
         </button>
     </div>
 
-    <div class="items-section">
+    <div class="items-section scroll-container">
         {{> 'daggerheart.inventory-items'
         title='DAGGERHEART.GENERAL.Tabs.loadout'
         type='domainCard'

templates/sheets/actors/environment/features.hbs

@@ -1,9 +1,9 @@
 <section
-    class='tab {{tabs.features.cssClass}} {{tabs.features.id}}'
-    data-tab='{{tabs.features.id}}'
-    data-group='{{tabs.features.group}}'
+    class="tab {{tabs.features.cssClass}} {{tabs.features.id}}"
+    data-tab="{{tabs.features.id}}"
+    data-group="{{tabs.features.group}}"
 >
-    <div class="feature-section items-list">
+    <div class="feature-section scroll-container">
         {{#each @root.features as |item|}}
             {{> "daggerheart.inventory-item"
                 item=item

templates/sheets/actors/environment/potentialAdversaries.hbs

@@ -3,7 +3,7 @@
     data-tab='{{tabs.potentialAdversaries.id}}'
     data-group='{{tabs.potentialAdversaries.group}}'
 >    
-    <div class="items-section">
+    <div class="items-section scroll-container">
         {{#each document.system.potentialAdversaries as |category categoryId|}}
             {{> 'daggerheart.inventory-items'
             title=category.label

templates/sheets/actors/npc/features.hbs

@@ -1,15 +1,14 @@
 <section class='tab {{tabs.features.cssClass}} {{tabs.features.id}}' data-tab='{{tabs.features.id}}'
     data-group='{{tabs.features.group}}'>
-    <div class="feature-section items-list">
-        {{#each @root.features as |item|}}
-            {{> "daggerheart.inventory-item"
-                item=item
-                type="feature"
-                actorType=@root.document.type
-                hideContextMenu=true
-                hideModifyControls=true
-                showActions=@root.editable
-            }}
-        {{/each}}
+    <div class="feature-section">
+        {{> 'daggerheart.inventory-items'
+            title=tabs.features.label
+            type='feature'
+            collection=@root.features
+            hideContextMenu=true
+            hideModifyControls=true
+            canCreate=@root.editable
+            showActions=@root.editable
+        }}
     </div>
 </section>

templates/sheets/actors/party/inventory.hbs

@@ -19,7 +19,7 @@
         {{> "systems/daggerheart/templates/sheets/global/partials/gold.hbs" currencies=inventory.currencies}}
     {{/if}}
 
-    <div class="items-section">
+    <div class="items-section scroll-container">
         {{> 'daggerheart.inventory-items'
         title='TYPES.Item.weapon'
         type='weapon'

templates/sheets/global/partials/inventory-item-V2.hbs

@@ -158,6 +158,7 @@ Parameters:
             </button>
             {{/if}}
             {{#if action.uses.max}}
+                <div class="spacer"></div>
                 <button type="button" class="action-uses-button" data-action="increaseActionUses" data-item-uuid="{{action.uuid}}">
                 {{action.remainingUses}}/{{action.uses.max}}
                 </button>