From b73c70aeb842ab2bdc03a12d21451cb9f287d5df Mon Sep 17 00:00:00 2001
From: Carlos Fernandez <cfern1990@gmail.com>
Date: Fri, 3 Jul 2026 01:42:34 -0400
Subject: [PATCH] Also remove fieldset for npc features and fix padding issue
 in full screen notes

---
 .../sheets/actors/actor-sheet-shared.less     |  3 ++-
 styles/less/sheets/actors/npc/features.less   |  8 ++-----
 templates/sheets/actors/npc/features.hbs      | 21 ++++++++++---------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/styles/less/sheets/actors/actor-sheet-shared.less b/styles/less/sheets/actors/actor-sheet-shared.less
index 37e8579f..3e233013 100644
--- a/styles/less/sheets/actors/actor-sheet-shared.less
+++ b/styles/less/sheets/actors/actor-sheet-shared.less
@@ -79,6 +79,7 @@
             .editor-content {
                 scrollbar-gutter: stable;
                 padding-right: @right-padding;
+                padding-bottom: 4px;
             }
             &.inactive {
                 button.toggle {
@@ -89,7 +90,7 @@
                 }
             }
             &.active {
-                padding: 8px 0 4px 16px;
+                padding: 8px 0 0 16px;
             }
         }
 
diff --git a/styles/less/sheets/actors/npc/features.less b/styles/less/sheets/actors/npc/features.less
index a579d9f8..f68df8a8 100644
--- a/styles/less/sheets/actors/npc/features.less
+++ b/styles/less/sheets/actors/npc/features.less
@@ -7,12 +7,8 @@
         }
 
         .feature-section {
-            display: flex;
-            flex-direction: column;
-            gap: 10px;
-            overflow-y: auto;
-            padding-bottom: 4px;
-            .with-scroll-shadows();
+            padding: 16px calc(16px - var(--scrollbar-width)) 4px 16px;
+            .stable-scroll-container();
         }
     }
 }
diff --git a/templates/sheets/actors/npc/features.hbs b/templates/sheets/actors/npc/features.hbs
index 3b495e74..05e95737 100644
--- a/templates/sheets/actors/npc/features.hbs
+++ b/templates/sheets/actors/npc/features.hbs
@@ -1,14 +1,15 @@
 <section class='tab {{tabs.features.cssClass}} {{tabs.features.id}}' data-tab='{{tabs.features.id}}'
     data-group='{{tabs.features.group}}'>
-    <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 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>
 </section>
\ No newline at end of file