Skip to content

[UI] Make sheet tab scrollsbars stable, remove fieldsets, and adjust padding #1944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
CarlosFdez wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[UI] Make sheet tab scrollsbars stable, remove fieldsets, and adjust padding #1944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion module/applications/sheets/actors/adversary.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default class AdversarySheet extends DHBaseActorSheet {
/** @inheritDoc */
static DEFAULT_OPTIONS = {
classes: ['adversary'],
position: { width: 660, height: 766 },
position: { width: 670, height: 766 },
window: { resizable: true },
actions: {
toggleHitPoints: AdversarySheet.#toggleHitPoints,
Expand Down
2 changes: 1 addition & 1 deletion styles/less/global/sheet.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion styles/less/sheets/actors/actor-sheet-shared.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,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);
Expand Down
3 changes: 2 additions & 1 deletion styles/less/sheets/actors/adversary/effects.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
flex-direction: column;
gap: 10px;
overflow-y: auto;
padding-bottom: 20px;
padding-bottom: 4px;
scrollbar-gutter: stable;
.with-scroll-shadows();
}
}
Expand Down
17 changes: 15 additions & 2 deletions styles/less/sheets/actors/adversary/features.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,27 @@
@import '../../../utils/mixin.less';

.application.sheet.daggerheart.actor.dh-style.adversary {
.tab.features {
.tab.features.active {
position: relative;
padding-left: 15px;
.feature-section {
display: flex;
flex-direction: column;
gap: 10px;
padding: 6px 2px 4px 0;
overflow-y: auto;
padding-bottom: 20px;
scrollbar-gutter: stable;
.with-scroll-shadows();
}
> button {
--button-size: 1.75rem;
width: 1.75rem;
position: absolute;
inset: auto 16px 0 auto;
box-shadow: 0 0 5px @light-black;
}
&:has(> button) .feature-section {
padding-bottom: calc(1px + 1.75rem);
}
}
}
5 changes: 2 additions & 3 deletions styles/less/sheets/actors/adversary/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';

6 changes: 5 additions & 1 deletion styles/less/sheets/actors/adversary/notes.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
.application.sheet.daggerheart.actor.dh-style.adversary .tab.notes.active {
padding-bottom: 20px;
padding: 6px 0 4px 15px;
.editor-content {
scrollbar-gutter: stable;
.with-scroll-shadows();
}
}
39 changes: 21 additions & 18 deletions styles/less/sheets/actors/adversary/sheet.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,31 @@
height: 100%;
width: 100%;
padding-bottom: 0;
}

.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;
}

.adversary-sidebar-sheet {
grid-row: 1 / span 2;
grid-column: 1;
.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-right: 0;
margin-right: 2px;
margin-bottom: 16px;
}
}
}
3 changes: 2 additions & 1 deletion styles/less/sheets/actors/character/biography.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
1 change: 1 addition & 0 deletions styles/less/sheets/actors/character/features.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
gap: 10px;
overflow-y: auto;
padding-bottom: 20px;
scrollbar-gutter: stable;
.with-scroll-shadows();
}
}
Expand Down
2 changes: 1 addition & 1 deletion styles/less/sheets/actors/character/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
7 changes: 6 additions & 1 deletion styles/less/sheets/actors/character/inventory.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Expand Down
4 changes: 3 additions & 1 deletion styles/less/sheets/actors/character/loadout.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
}
}
Expand Down
41 changes: 22 additions & 19 deletions styles/less/sheets/actors/character/sheet.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-header-sheet {
position: relative;
grid-row: 1;
grid-column: 2;
}

.character-sidebar-sheet {
grid-row: 1 / span 2;
grid-column: 1;
.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;
}
}
}
6 changes: 5 additions & 1 deletion styles/less/sheets/actors/companion/effects.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();
}
}
Expand Down
14 changes: 13 additions & 1 deletion styles/less/sheets/actors/environment/features.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,25 @@

.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();
}
> button {
--button-size: 1.75rem;
width: 1.75rem;
position: absolute;
inset: auto 16px 0 auto;
box-shadow: 0 0 5px @light-black;
}
&:has(> button) .feature-section {
padding-bottom: calc(1px + 1.75rem);
}
}
}
3 changes: 2 additions & 1 deletion styles/less/sheets/actors/environment/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import './sheet.less';
@import './features.less';
@import './header.less';
@import './potentialAdversaries.less';
@import './sheet.less';
@import './notes.less';
11 changes: 11 additions & 0 deletions styles/less/sheets/actors/environment/notes.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();
}
}
}
4 changes: 3 additions & 1 deletion styles/less/sheets/actors/environment/potentialAdversaries.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import '../../../utils/colors.less';
@import '../../../utils/mixin.less';

.application.sheet.daggerheart.actor.dh-style.environment {
.tab.potentialAdversaries {
Expand All @@ -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();
}
}
Expand Down
2 changes: 2 additions & 0 deletions styles/less/sheets/actors/environment/sheet.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
.tab {
flex: 1;
overflow-y: auto;
padding-right: 0;
margin-right: 2px;

&.active {
overflow: hidden;
Expand Down
3 changes: 2 additions & 1 deletion styles/less/sheets/actors/party/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import './sheet.less';
@import './header.less';
@import './party-members.less';
@import './sheet.less';
@import './inventory.less';
@import './notes.less';
6 changes: 6 additions & 0 deletions styles/less/sheets/actors/party/inventory.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
12 changes: 12 additions & 0 deletions styles/less/sheets/actors/party/notes.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();
}
}
}
1 change: 1 addition & 0 deletions styles/less/sheets/actors/party/party-members.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

.application.sheet.daggerheart.actor.dh-style.party .tab.partyMembers {
overflow: auto;
.with-scroll-shadows();

.actors-list {
display: flex;
Expand Down
Loading
Loading