From dd93636b271e835474560868ef8ee966cfe0574c Mon Sep 17 00:00:00 2001
From: Carlos Fernandez <cfern1990@gmail.com>
Date: Tue, 30 Jun 2026 00:46:20 -0400
Subject: [PATCH] Remove fieldset from top level notes

---
 styles/less/global/global.less                |  3 ++
 styles/less/global/prose-mirror.less          |  4 ++-
 .../sheets/actors/actor-sheet-shared.less     | 31 +++++++++++++++++++
 templates/sheets/actors/adversary/notes.hbs   | 12 +++----
 templates/sheets/actors/environment/notes.hbs |  5 +--
 templates/sheets/actors/npc/notes.hbs         |  6 ++--
 templates/sheets/actors/party/notes.hbs       | 11 +++----
 7 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/styles/less/global/global.less b/styles/less/global/global.less
index c0e7f3fc..19a9e519 100644
--- a/styles/less/global/global.less
+++ b/styles/less/global/global.less
@@ -12,6 +12,9 @@
 }
 
 .daggerheart.dh-style {
+    /** Not an actual scrollbar width (it can't be configured on all browsers) but actually a compensation value for scrollbar gutter purposes */
+    --scrollbar-width: 10px;
+
     * {
         scrollbar-width: thin;
         scrollbar-color: light-dark(@dark-blue, @golden) transparent;
diff --git a/styles/less/global/prose-mirror.less b/styles/less/global/prose-mirror.less
index fc8e49f9..27048ddf 100644
--- a/styles/less/global/prose-mirror.less
+++ b/styles/less/global/prose-mirror.less
@@ -1,5 +1,6 @@
 @import '../utils/colors.less';
 @import '../utils/fonts.less';
+@import '../utils/mixin.less';
 
 .application.daggerheart {
     prose-mirror {
@@ -12,6 +13,7 @@
             background-color: transparent;
         }
         .editor-content {
+            .with-scroll-shadows();
             h1 {
                 font-size: var(--font-size-32);
             }
@@ -42,7 +44,7 @@
             ul {
                 list-style: disc;
             }
-        }       
+        }
         // Fixes centering and makes it not render over scrollbar
         &:hover button.toggle:enabled {
             display: flex;
diff --git a/styles/less/sheets/actors/actor-sheet-shared.less b/styles/less/sheets/actors/actor-sheet-shared.less
index 89617103..5eb5b43c 100644
--- a/styles/less/sheets/actors/actor-sheet-shared.less
+++ b/styles/less/sheets/actors/actor-sheet-shared.less
@@ -54,6 +54,37 @@
         }
     }
 
+    .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
+        > prose-mirror {
+            @right-padding: calc(16px - var(--scrollbar-width));
+            .editor-content {
+                scrollbar-gutter: stable;
+                padding-right: @right-padding;
+            }
+            &.inactive {
+                button.toggle {
+                    top: 16px;
+                }
+                .editor-content {
+                    padding: 16px @right-padding 4px 16px;
+                }
+            }
+            &.active {
+                padding: 8px 0 4px 16px;
+            }
+        }
+
+        .artist-attribution {
+            padding-left: 16px;
+        }
+    }
+
     .search-section {
         display: flex;
         gap: 10px;
diff --git a/templates/sheets/actors/adversary/notes.hbs b/templates/sheets/actors/adversary/notes.hbs
index a5c3f706..d329d318 100644
--- a/templates/sheets/actors/adversary/notes.hbs
+++ b/templates/sheets/actors/adversary/notes.hbs
@@ -1,13 +1,9 @@
 <section
-    class='tab {{tabs.notes.cssClass}} {{tabs.notes.id}}'
-    data-tab='{{tabs.notes.id}}'
-    data-group='{{tabs.notes.group}}'
+    class="tab {{tabs.notes.cssClass}} {{tabs.notes.id}}"
+    data-tab="{{tabs.notes.id}}"
+    data-group="{{tabs.notes.group}}"
 >
-    <fieldset class="fit-height">
-        <legend>{{localize tabs.notes.label}}</legend>
-        {{formInput notes.field value=notes.value enriched=notes.enriched toggled=true}}
-    </fieldset>
-
+    {{formInput notes.field value=notes.value enriched=notes.enriched toggled=true}}
     {{#if (and showAttribution document.system.attribution.artist)}}
         <label class="artist-attribution">{{localize "DAGGERHEART.GENERAL.artistAttribution" artist=document.system.attribution.artist}}</label>
     {{/if}}
diff --git a/templates/sheets/actors/environment/notes.hbs b/templates/sheets/actors/environment/notes.hbs
index 4f6b131e..1acf0e93 100644
--- a/templates/sheets/actors/environment/notes.hbs
+++ b/templates/sheets/actors/environment/notes.hbs
@@ -3,10 +3,7 @@
     data-tab='{{tabs.notes.id}}'
     data-group='{{tabs.notes.group}}'
 >
-    <fieldset class="fit-height">
-        <legend>{{localize tabs.notes.label}}</legend>
-        {{formInput notes.field value=notes.value enriched=notes.value toggled=true}}
-    </fieldset>
+    {{formInput notes.field value=notes.value enriched=notes.value toggled=true}}
 
     {{#if (and showAttribution document.system.attribution.artist)}}
         <label class="artist-attribution">{{localize "DAGGERHEART.GENERAL.artistAttribution" artist=document.system.attribution.artist}}</label>
diff --git a/templates/sheets/actors/npc/notes.hbs b/templates/sheets/actors/npc/notes.hbs
index bc9ac3cf..7dd5432d 100644
--- a/templates/sheets/actors/npc/notes.hbs
+++ b/templates/sheets/actors/npc/notes.hbs
@@ -1,7 +1,7 @@
 <section
-    class='tab {{tabs.notes.cssClass}} {{tabs.notes.id}}'
-    data-tab='{{tabs.notes.id}}'
-    data-group='{{tabs.notes.group}}'
+    class="tab {{tabs.notes.cssClass}} {{tabs.notes.id}}"
+    data-tab="{{tabs.notes.id}}"
+    data-group="{{tabs.notes.group}}"
 >
     {{formInput notes.field value=notes.value enriched=notes.enriched toggled=true}}
 
diff --git a/templates/sheets/actors/party/notes.hbs b/templates/sheets/actors/party/notes.hbs
index 663a484a..af21b29f 100644
--- a/templates/sheets/actors/party/notes.hbs
+++ b/templates/sheets/actors/party/notes.hbs
@@ -1,10 +1,7 @@
 <section
-    class='tab {{tabs.notes.cssClass}} {{tabs.notes.id}}'
-    data-tab='{{tabs.notes.id}}'
-    data-group='{{tabs.notes.group}}'
+    class="tab {{tabs.notes.cssClass}} {{tabs.notes.id}}"
+    data-tab="{{tabs.notes.id}}"
+    data-group="{{tabs.notes.group}}"
 >
-    <fieldset class="fit-height">
-        <legend>{{localize tabs.notes.label}}</legend>
-        {{formInput notes.field value=notes.value enriched=notes.value toggled=true}}
-    </fieldset>
+    {{formInput notes.field value=notes.value enriched=notes.value toggled=true}}
 </section>
\ No newline at end of file