cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-06-08 13:48:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix conflicts

Browse source
This commit is contained in:
Dapoolp 2025-07-01 18:10:16 +02:00
commit 1fff74d098
57 changed files with 1676 additions and 993 deletions
Download patch file Download diff file Expand all files Collapse all files

16
styles/daggerheart.css
View file

@ -3015,6 +3015,7 @@ div.daggerheart.views.multiclass {
display: flex;
flex-direction: column;
gap: 8px;
margin-top: 8px;
}
.daggerheart.levelup .levelup-navigation-container {
display: flex;
@ -3176,6 +3177,13 @@ div.daggerheart.views.multiclass {
align-items: center;
gap: 4px;
}
.daggerheart.levelup .levelup-selections-container .levelup-radio-choices {
display: flex;
gap: 8px;
}
.daggerheart.levelup .levelup-selections-container .levelup-radio-choices label {
flex: 0;
}
.daggerheart.levelup .levelup-summary-container .level-achievements-container,
.daggerheart.levelup .levelup-summary-container .level-advancements-container {
display: flex;
@ -4291,6 +4299,14 @@ div.daggerheart.views.multiclass {
scrollbar-width: thin;
scrollbar-color: light-dark(#18162e, #f3c267) transparent;
}
.application.sheet.daggerheart.actor.dh-style.companion .profile {
height: 80px;
width: 80px;
}
.application.sheet.daggerheart.actor.dh-style.companion .temp-container {
position: relative;
top: 32px;
}
.application.sheet.daggerheart.actor.dh-style.adversary .window-content {
overflow: auto;
}

2
styles/daggerheart.less
View file

@ -25,6 +25,8 @@
@import './less/actors/character/biography.less';
@import './less/actors/character/features.less';
@import './less/actors/companion/sheet.less';
@import './less/actors/adversary.less';
@import './less/actors/environment.less';

140
styles/less/actors/character/inventory.less
View file

@ -1,70 +1,70 @@
@import '../../utils/colors.less';
@import '../../utils/fonts.less';
.application.sheet.daggerheart.actor.dh-style.character {
.tab.inventory {
.search-section {
display: flex;
gap: 10px;
align-items: center;
.search-bar {
position: relative;
color: light-dark(@dark-blue-50, @beige-50);
width: 100%;
padding-top: 5px;
input {
border-radius: 50px;
font-family: @font-body;
background: light-dark(@dark-blue-10, @golden-10);
border: none;
outline: 2px solid transparent;
transition: all 0.3s ease;
padding: 0 20px;
&:hover {
outline: 2px solid light-dark(@dark, @golden);
}
&:placeholder {
color: light-dark(@dark-blue-50, @beige-50);
}
&::-webkit-search-cancel-button {
-webkit-appearance: none;
display: none;
}
}
.icon {
align-content: center;
height: 32px;
position: absolute;
right: 20px;
font-size: 16px;
z-index: 1;
color: light-dark(@dark-blue-50, @beige-50);
}
}
}
.items-section {
display: flex;
flex-direction: column;
gap: 10px;
overflow-y: auto;
mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 95%, transparent 100%);
padding: 20px 0;
height: 80%;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
}
.currency-section {
display: flex;
gap: 10px;
}
}
}
@import '../../utils/colors.less';
@import '../../utils/fonts.less';
.application.sheet.daggerheart.actor.dh-style.character {
.tab.inventory {
.search-section {
display: flex;
gap: 10px;
align-items: center;
.search-bar {
position: relative;
color: light-dark(@dark-blue-50, @beige-50);
width: 100%;
padding-top: 5px;
input {
border-radius: 50px;
font-family: @font-body;
background: light-dark(@dark-blue-10, @golden-10);
border: none;
outline: 2px solid transparent;
transition: all 0.3s ease;
padding: 0 20px;
&:hover {
outline: 2px solid light-dark(@dark, @golden);
}
&:placeholder {
color: light-dark(@dark-blue-50, @beige-50);
}
&::-webkit-search-cancel-button {
-webkit-appearance: none;
display: none;
}
}
.icon {
align-content: center;
height: 32px;
position: absolute;
right: 20px;
font-size: 16px;
z-index: 1;
color: light-dark(@dark-blue-50, @beige-50);
}
}
}
.items-section {
display: flex;
flex-direction: column;
gap: 10px;
overflow-y: auto;
mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 95%, transparent 100%);
padding: 20px 0;
height: 80%;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
}
.currency-section {
display: flex;
gap: 10px;
}
}
}

11
styles/less/actors/companion/sheet.less Normal file
View file

@ -0,0 +1,11 @@
.application.sheet.daggerheart.actor.dh-style.companion {
.profile {
height: 80px;
width: 80px;
}
.temp-container {
position: relative;
top: 32px;
}
}

10
styles/levelup.less
View file

@ -25,6 +25,7 @@
display: flex;
flex-direction: column;
gap: 8px;
margin-top: 8px;
}
}
@ -217,6 +218,15 @@
align-items: center;
gap: 4px;
}
.levelup-radio-choices {
display: flex;
gap: 8px;
label {
flex: 0;
}
}
}
.levelup-summary-container {