diff --git a/styles/less/global/elements.less b/styles/less/global/elements.less
index e57ba50d..6c229dda 100755
--- a/styles/less/global/elements.less
+++ b/styles/less/global/elements.less
@@ -261,10 +261,14 @@
fieldset {
align-items: center;
- margin-top: 5px;
border-radius: 6px;
border-color: @color-fieldset-border;
+ /* Left and right side spacing is set up so that content starts at 15px left indent */
+ margin-top: 5px;
+ padding-inline: 7px;
+ margin-inline: 6px;
+
&.glassy {
background-color: light-dark(@dark-blue-10, @golden-10);
border-color: transparent;
@@ -501,7 +505,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 {
diff --git a/styles/less/global/sheet.less b/styles/less/global/sheet.less
index e3072da1..8381c7c3 100755
--- a/styles/less/global/sheet.less
+++ b/styles/less/global/sheet.less
@@ -54,7 +54,7 @@ body.game:is(.performance-low, .noblur) {
position: relative;
min-height: -webkit-fill-available;
transition: opacity 0.3s ease;
- padding-bottom: 20px;
+ padding-bottom: 16px;
.tab {
padding: 0 10px;
diff --git a/styles/less/sheets/actors/actor-sheet-shared.less b/styles/less/sheets/actors/actor-sheet-shared.less
index 89617103..6015047b 100644
--- a/styles/less/sheets/actors/actor-sheet-shared.less
+++ b/styles/less/sheets/actors/actor-sheet-shared.less
@@ -39,6 +39,7 @@
.window-header > .attribution-header-label {
margin-right: var(--spacer-4);
+ pointer-events: none;
}
.tab.inventory {
@@ -46,7 +47,7 @@
display: grid;
grid-template-columns: 1fr 1fr 1fr 1fr;
gap: 10px;
- padding: 10px 10px 0;
+ padding: 12px 12px 0 10px;
.input {
color: light-dark(@dark, @beige);
diff --git a/styles/less/sheets/actors/adversary/effects.less b/styles/less/sheets/actors/adversary/effects.less
index 4aa44e51..c4fa0124 100644
--- a/styles/less/sheets/actors/adversary/effects.less
+++ b/styles/less/sheets/actors/adversary/effects.less
@@ -3,13 +3,20 @@
.application.sheet.daggerheart.actor.dh-style.adversary {
.tab.effects {
+ margin-top: var(--spacer-12);
+ overflow-y: auto;
+ scrollbar-gutter: stable;
+ .with-scroll-shadows();
.effects-sections {
display: flex;
flex-direction: column;
gap: 10px;
- overflow-y: auto;
- padding-bottom: 20px;
- .with-scroll-shadows();
+ }
+ fieldset {
+ margin-right: 0; // scroll gutter compensation
+ &:first-child {
+ margin-top: 0;
+ }
}
}
}
diff --git a/styles/less/sheets/actors/adversary/features.less b/styles/less/sheets/actors/adversary/features.less
index 447d050e..49e64909 100644
--- a/styles/less/sheets/actors/adversary/features.less
+++ b/styles/less/sheets/actors/adversary/features.less
@@ -3,14 +3,17 @@
@import '../../../utils/mixin.less';
.application.sheet.daggerheart.actor.dh-style.adversary {
- .tab.features {
+ .tab.features.active {
+ position: relative;
+ margin-top: var(--spacer-8);
+ padding: var(--spacer-8) 2px 0 var(--left-indent);
+ overflow-y: auto;
+ scrollbar-gutter: stable;
+ .with-scroll-shadows();
.feature-section {
display: flex;
flex-direction: column;
gap: 10px;
- overflow-y: auto;
- padding-bottom: 20px;
- .with-scroll-shadows();
}
}
}
diff --git a/styles/less/sheets/actors/adversary/header.less b/styles/less/sheets/actors/adversary/header.less
index 549a219d..0d50b886 100644
--- a/styles/less/sheets/actors/adversary/header.less
+++ b/styles/less/sheets/actors/adversary/header.less
@@ -7,7 +7,7 @@
width: 100%;
> *:not(line-div, .tab-navigation) {
- padding-left: 15px;
+ padding-left: var(--left-indent);
padding-right: 15px;
}
@@ -75,6 +75,7 @@
.tab-navigation {
margin-top: 0;
+ margin-bottom: 0;
button[data-action="openSettings"] {
margin-right: 12px;
}
diff --git a/styles/less/sheets/actors/adversary/index.less b/styles/less/sheets/actors/adversary/index.less
index 28ff9d22..a05af854 100644
--- a/styles/less/sheets/actors/adversary/index.less
+++ b/styles/less/sheets/actors/adversary/index.less
@@ -1,7 +1,6 @@
-@import './features.less';
-@import './header.less';
@import './sheet.less';
+@import './header.less';
+@import './features.less';
@import './sidebar.less';
@import './effects.less';
@import './notes.less';
-
diff --git a/styles/less/sheets/actors/adversary/notes.less b/styles/less/sheets/actors/adversary/notes.less
index a95d070e..e9dbd271 100644
--- a/styles/less/sheets/actors/adversary/notes.less
+++ b/styles/less/sheets/actors/adversary/notes.less
@@ -1,3 +1,8 @@
.application.sheet.daggerheart.actor.dh-style.adversary .tab.notes.active {
- padding-bottom: 20px;
+ padding-top: var(--spacer-16);
+ padding-left: var(--left-indent);
+ .editor-content {
+ scrollbar-gutter: stable;
+ .with-scroll-shadows();
+ }
}
diff --git a/styles/less/sheets/actors/adversary/sheet.less b/styles/less/sheets/actors/adversary/sheet.less
index 0bd845fa..9a284a26 100644
--- a/styles/less/sheets/actors/adversary/sheet.less
+++ b/styles/less/sheets/actors/adversary/sheet.less
@@ -2,6 +2,8 @@
@import '../../../utils/fonts.less';
.application.sheet.daggerheart.actor.dh-style.adversary {
+ --left-indent: 15px;
+
.window-content {
display: grid;
grid-template-columns: 275px 1fr;
@@ -9,28 +11,31 @@
height: 100%;
width: 100%;
padding-bottom: 0;
+ }
- .adversary-sidebar-sheet {
- grid-row: 1 / span 2;
- grid-column: 1;
+ .adversary-sidebar-sheet {
+ grid-row: 1 / span 2;
+ grid-column: 1;
+ overflow: hidden;
+ display: flex;
+ flex-direction: column;
+ }
+
+ .adversary-header-sheet {
+ grid-row: 1;
+ grid-column: 2;
+ }
+
+ .tab {
+ grid-row: 2;
+ grid-column: 2;
+ &.active {
overflow: hidden;
display: flex;
flex-direction: column;
- }
-
- .adversary-header-sheet {
- grid-row: 1;
- grid-column: 2;
- }
-
- .tab {
- grid-row: 2;
- grid-column: 2;
- &.active {
- overflow: hidden;
- display: flex;
- flex-direction: column;
- }
+ padding: 0;
+ margin-right: 1px;
+ margin-bottom: 12px;
}
}
-}
+}
\ No newline at end of file
diff --git a/styles/less/sheets/actors/character/biography.less b/styles/less/sheets/actors/character/biography.less
index 8548a2fb..ce52c5af 100644
--- a/styles/less/sheets/actors/character/biography.less
+++ b/styles/less/sheets/actors/character/biography.less
@@ -11,8 +11,9 @@
height: 100%;
overflow-y: auto;
padding-top: 8px;
- padding-bottom: 20px;
+ padding-bottom: 4px;
height: 100%;
+ scrollbar-gutter: stable;
.with-scroll-shadows();
}
diff --git a/styles/less/sheets/actors/character/features.less b/styles/less/sheets/actors/character/features.less
index 52b41826..f81f0e32 100644
--- a/styles/less/sheets/actors/character/features.less
+++ b/styles/less/sheets/actors/character/features.less
@@ -10,6 +10,7 @@
gap: 10px;
overflow-y: auto;
padding-bottom: 20px;
+ scrollbar-gutter: stable;
.with-scroll-shadows();
}
}
diff --git a/styles/less/sheets/actors/character/index.less b/styles/less/sheets/actors/character/index.less
index edefe0a1..f196d5bf 100644
--- a/styles/less/sheets/actors/character/index.less
+++ b/styles/less/sheets/actors/character/index.less
@@ -1,8 +1,8 @@
+@import './sheet.less';
@import './biography.less';
@import './effects.less';
@import './features.less';
@import './header.less';
@import './inventory.less';
@import './loadout.less';
-@import './sheet.less';
@import './sidebar.less';
diff --git a/styles/less/sheets/actors/character/inventory.less b/styles/less/sheets/actors/character/inventory.less
index fcfbbee9..b07bb6fe 100644
--- a/styles/less/sheets/actors/character/inventory.less
+++ b/styles/less/sheets/actors/character/inventory.less
@@ -4,13 +4,18 @@
.application.sheet.daggerheart.actor.dh-style.character {
.tab.inventory {
+ padding-right: 0;
+ .search-section {
+ padding-right: 14px;
+ }
.items-section {
display: flex;
flex-direction: column;
gap: 10px;
overflow-y: auto;
+ scrollbar-gutter: stable;
margin-top: 20px;
- padding-bottom: 20px;
+ padding-bottom: 4px;
.with-scroll-shadows();
}
}
diff --git a/styles/less/sheets/actors/character/loadout.less b/styles/less/sheets/actors/character/loadout.less
index fa3e0176..67b2914b 100644
--- a/styles/less/sheets/actors/character/loadout.less
+++ b/styles/less/sheets/actors/character/loadout.less
@@ -5,6 +5,7 @@
.application.sheet.daggerheart.actor.dh-style.character {
.tab.loadout {
.search-section {
+ padding-right: 14px;
.btn-toggle-view {
background: light-dark(@dark-blue-10, @dark-blue);
border: 1px solid @color-border;
@@ -52,8 +53,9 @@
gap: 10px;
height: 100%;
overflow-y: auto;
+ scrollbar-gutter: stable;
margin-top: 20px;
- padding-bottom: 20px;
+ padding-bottom: 4px;
.with-scroll-shadows();
}
}
diff --git a/styles/less/sheets/actors/character/sheet.less b/styles/less/sheets/actors/character/sheet.less
index 68792c99..aebcb9b9 100644
--- a/styles/less/sheets/actors/character/sheet.less
+++ b/styles/less/sheets/actors/character/sheet.less
@@ -10,28 +10,31 @@
width: 100%;
padding-bottom: 0;
overflow-x: auto;
+ }
+
+ .character-sidebar-sheet {
+ grid-row: 1 / span 2;
+ grid-column: 1;
+ display: flex;
+ flex-direction: column;
+ }
- .character-sidebar-sheet {
- grid-row: 1 / span 2;
- grid-column: 1;
+ .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 {
- position: relative;
- grid-row: 1;
- grid-column: 2;
- }
-
- .tab {
- grid-row: 2;
- grid-column: 2;
- &.active {
- display: flex;
- flex-direction: column;
- overflow: hidden;
- }
+ overflow: hidden;
}
}
}
diff --git a/styles/less/sheets/actors/companion/effects.less b/styles/less/sheets/actors/companion/effects.less
index c0cac669..40973196 100644
--- a/styles/less/sheets/actors/companion/effects.less
+++ b/styles/less/sheets/actors/companion/effects.less
@@ -1,13 +1,17 @@
@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;
overflow-y: auto;
- padding-bottom: 20px;
+ padding-bottom: 4px;
+ scrollbar-gutter: stable;
.with-scroll-shadows();
}
}
diff --git a/styles/less/sheets/actors/environment/features.less b/styles/less/sheets/actors/environment/features.less
index 84cf26f8..295636a7 100644
--- a/styles/less/sheets/actors/environment/features.less
+++ b/styles/less/sheets/actors/environment/features.less
@@ -4,12 +4,14 @@
.application.sheet.daggerheart.actor.dh-style.environment {
.tab.features {
+ position: relative;
.feature-section {
display: flex;
flex-direction: column;
gap: 10px;
overflow-y: auto;
- padding-bottom: 4px;
+ padding: 4px 8px;
+ scrollbar-gutter: stable;
.with-scroll-shadows();
}
}
diff --git a/styles/less/sheets/actors/environment/index.less b/styles/less/sheets/actors/environment/index.less
index 211c8e60..db35eabc 100644
--- a/styles/less/sheets/actors/environment/index.less
+++ b/styles/less/sheets/actors/environment/index.less
@@ -1,4 +1,5 @@
+@import './sheet.less';
@import './features.less';
@import './header.less';
@import './potentialAdversaries.less';
-@import './sheet.less';
+@import './notes.less';
diff --git a/styles/less/sheets/actors/environment/notes.less b/styles/less/sheets/actors/environment/notes.less
new file mode 100644
index 00000000..58447c88
--- /dev/null
+++ b/styles/less/sheets/actors/environment/notes.less
@@ -0,0 +1,11 @@
+@import '../../../utils/mixin.less';
+
+.application.sheet.daggerheart.actor.dh-style.environment {
+ .tab.notes {
+ padding: 6px 0 4px 15px;
+ .editor-content {
+ scrollbar-gutter: stable;
+ .with-scroll-shadows();
+ }
+ }
+}
\ No newline at end of file
diff --git a/styles/less/sheets/actors/environment/potentialAdversaries.less b/styles/less/sheets/actors/environment/potentialAdversaries.less
index f112c0d2..e66ff34d 100644
--- a/styles/less/sheets/actors/environment/potentialAdversaries.less
+++ b/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 {
@@ -7,7 +8,8 @@
flex-direction: column;
gap: 10px;
overflow-y: auto;
- padding-bottom: 4px;
+ padding: 0 4px 4px 4px;
+ scrollbar-gutter: stable;
.with-scroll-shadows();
}
}
diff --git a/styles/less/sheets/actors/environment/sheet.less b/styles/less/sheets/actors/environment/sheet.less
index 2d9cc188..02489cac 100644
--- a/styles/less/sheets/actors/environment/sheet.less
+++ b/styles/less/sheets/actors/environment/sheet.less
@@ -16,6 +16,8 @@
.tab {
flex: 1;
overflow-y: auto;
+ padding-right: 0;
+ margin-right: 2px;
&.active {
overflow: hidden;
diff --git a/styles/less/sheets/actors/party/index.less b/styles/less/sheets/actors/party/index.less
index 56f7a457..279c9db2 100644
--- a/styles/less/sheets/actors/party/index.less
+++ b/styles/less/sheets/actors/party/index.less
@@ -1,4 +1,5 @@
+@import './sheet.less';
@import './header.less';
@import './party-members.less';
-@import './sheet.less';
@import './inventory.less';
+@import './notes.less';
\ No newline at end of file
diff --git a/styles/less/sheets/actors/party/inventory.less b/styles/less/sheets/actors/party/inventory.less
index 444c6a57..4b14e112 100644
--- a/styles/less/sheets/actors/party/inventory.less
+++ b/styles/less/sheets/actors/party/inventory.less
@@ -4,11 +4,17 @@
.application.sheet.daggerheart.actor.dh-style.party {
.tab.inventory {
+ padding-right: 0;
+ .search-section {
+ padding-right: 14px;
+ }
+
.items-section {
display: flex;
flex-direction: column;
gap: 10px;
overflow-y: auto;
+ scrollbar-gutter: stable;
margin-top: 20px;
padding-bottom: 4px;
.with-scroll-shadows();
diff --git a/styles/less/sheets/actors/party/notes.less b/styles/less/sheets/actors/party/notes.less
new file mode 100644
index 00000000..4ef51caa
--- /dev/null
+++ b/styles/less/sheets/actors/party/notes.less
@@ -0,0 +1,12 @@
+@import '../../../utils/mixin.less';
+
+.application.sheet.daggerheart.actor.dh-style.party {
+ .tab.notes {
+ padding: 16px 0 4px 15px;
+ .editor-content {
+ scrollbar-gutter: stable;
+ padding-left: 8px;
+ .with-scroll-shadows();
+ }
+ }
+}
\ No newline at end of file
diff --git a/styles/less/sheets/actors/party/party-members.less b/styles/less/sheets/actors/party/party-members.less
index dc464291..7b85eb35 100644
--- a/styles/less/sheets/actors/party/party-members.less
+++ b/styles/less/sheets/actors/party/party-members.less
@@ -4,6 +4,7 @@
.application.sheet.daggerheart.actor.dh-style.party .tab.partyMembers {
overflow: auto;
+ .with-scroll-shadows();
.actors-list {
display: flex;
diff --git a/styles/less/sheets/actors/party/sheet.less b/styles/less/sheets/actors/party/sheet.less
index 852b6cfc..33aa64a3 100644
--- a/styles/less/sheets/actors/party/sheet.less
+++ b/styles/less/sheets/actors/party/sheet.less
@@ -21,6 +21,8 @@
flex: 1;
overflow-y: auto;
scrollbar-gutter: stable;
+ margin-right: 2px;
+ padding-right: 8px;
&.active {
overflow: auto;
diff --git a/templates/sheets/actors/adversary/features.hbs b/templates/sheets/actors/adversary/features.hbs
index 3b495e74..8430d454 100644
--- a/templates/sheets/actors/adversary/features.hbs
+++ b/templates/sheets/actors/adversary/features.hbs
@@ -1,14 +1,15 @@
- {{> 'daggerheart.inventory-items'
- title=tabs.features.label
- type='feature'
- collection=@root.features
- hideContextMenu=true
- hideModifyControls=true
- canCreate=@root.editable
- showActions=@root.editable
- }}
+ {{#each @root.features as |item|}}
+ {{> 'daggerheart.inventory-item'
+ item=item
+ type='feature'
+ actorType=@root.document.type
+ hideContextMenu=true
+ hideModifyControls=true
+ showActions=@root.editable
+ }}
+ {{/each}}
-
\ No newline at end of file
+
diff --git a/templates/sheets/actors/adversary/notes.hbs b/templates/sheets/actors/adversary/notes.hbs
index a5c3f706..28df7f8e 100644
--- a/templates/sheets/actors/adversary/notes.hbs
+++ b/templates/sheets/actors/adversary/notes.hbs
@@ -3,10 +3,7 @@
data-tab='{{tabs.notes.id}}'
data-group='{{tabs.notes.group}}'
>
-
+ {{formInput notes.field value=notes.value enriched=notes.enriched class="aaa" toggled=true}}
{{#if (and showAttribution document.system.attribution.artist)}}
diff --git a/templates/sheets/actors/environment/features.hbs b/templates/sheets/actors/environment/features.hbs
index 35fcb038..264d6bf5 100644
--- a/templates/sheets/actors/environment/features.hbs
+++ b/templates/sheets/actors/environment/features.hbs
@@ -4,14 +4,15 @@
data-group='{{tabs.features.group}}'
>
- {{> 'daggerheart.inventory-items'
- title=tabs.features.label
- type='feature'
- collection=@root.features
- hideContextMenu=true
- hideModifyControls=true
- canCreate=@root.editable
- showActions=@root.editable
- }}
+ {{#each @root.features as |item|}}
+ {{> 'daggerheart.inventory-item'
+ item=item
+ type='feature'
+ actorType=@root.document.type
+ hideContextMenu=true
+ hideModifyControls=true
+ showActions=@root.editable
+ }}
+ {{/each}}
\ No newline at end of file
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}}'
>
-
+ {{formInput notes.field value=notes.value enriched=notes.value toggled=true}}
{{#if (and showAttribution document.system.attribution.artist)}}
diff --git a/templates/sheets/actors/party/notes.hbs b/templates/sheets/actors/party/notes.hbs
index 663a484a..0972bee9 100644
--- a/templates/sheets/actors/party/notes.hbs
+++ b/templates/sheets/actors/party/notes.hbs
@@ -3,8 +3,5 @@
data-tab='{{tabs.notes.id}}'
data-group='{{tabs.notes.group}}'
>
-
+ {{formInput notes.field value=notes.value enriched=notes.value toggled=true}}
\ No newline at end of file