Fix conflicts

This commit is contained in:
Dapoolp 2025-08-22 12:27:50 +02:00
commit f747dc3c32
1060 changed files with 10292 additions and 4494 deletions

View file

@ -0,0 +1,23 @@
.daggerheart.dh-style.dialog.attribution {
.window-content {
padding-top: 0;
}
.attribution-container {
display: flex;
flex-direction: column;
gap: 8px;
h4 {
margin-bottom: 0;
}
footer {
display: flex;
button {
flex: 1;
}
}
}
}

View file

@ -1,3 +1,4 @@
@import './attribution/sheet.less';
@import './level-up/navigation-container.less';
@import './level-up/selections-container.less';
@import './level-up/sheet.less';

View file

@ -7,6 +7,15 @@
#chat-notifications .chat-log {
.chat-message {
background-image: url('../assets/parchments/dh-parchment-light.png');
.message-header .message-header-metadata .message-metadata,
.message-header .message-header-main .message-sub-header-container {
color: @dark;
}
.message-header .message-header-main .message-sub-header-container h4 {
color: @dark-blue;
}
}
}
}
@ -36,7 +45,7 @@
.message-metadata {
font-family: @font-body;
color: light-dark(@dark, @beige);
color: @beige;
}
}
@ -59,14 +68,14 @@
display: flex;
flex-direction: column;
justify-content: space-between;
color: light-dark(@dark, @beige);
color: @beige;
h4 {
font-size: 16px;
font-weight: bold;
margin-bottom: 0;
font-family: @font-subtitle;
color: light-dark(@dark-blue, @golden);
color: @golden;
}
}
}

View file

@ -519,6 +519,17 @@
}
}
}
.artist-attribution {
width: 100%;
display: flex;
justify-content: left;
font-style: italic;
font-family: @font-body;
margin-top: 4px;
color: light-dark(#14142599, #efe6d850);
font-size: 12px;
padding-left: 3px;
}
}
.application.setting.dh-style {

View file

@ -135,7 +135,7 @@
.label {
gap: 4px;
color: @beige-80;
color: light-dark(@dark-80, @beige-80);
}
}
}

View file

@ -4,12 +4,20 @@
// Theme handling
.appTheme({
background: @dark-blue-60;
backdrop-filter: blur(10px);
background: @dark-blue-90;
backdrop-filter: blur(8px);
}, {
background: url('../assets/parchments/dh-parchment-light.png') no-repeat center;
});
body.game:is(.performance-low, .noblur) {
.themed.theme-dark .application.daggerheart.sheet.dh-style,
.themed.theme-dark.application.daggerheart.sheet.dh-style,
&.theme-dark .application.daggerheart {
background: @dark-blue;
};
}
.application.sheet.dh-style {
border-radius: 10px;

View file

@ -1,8 +1,20 @@
.application.sheet.daggerheart.actor.dh-style {
.portrait img, .profile {
.portrait img,
.profile {
width: 100%;
object-fit: cover;
object-position: top center;
}
}
&.minimized {
.attribution-header-label {
display: none;
}
}
.attribution-header-label {
font-style: italic;
font-family: @font-body;
color: light-dark(@chat-blue-bg, @beige-50);
}
}

View file

@ -0,0 +1,17 @@
@import '../../../utils/colors.less';
.application.sheet.daggerheart.actor.dh-style.adversary {
.tab.effects {
.effects-sections {
display: flex;
flex-direction: column;
gap: 10px;
overflow-y: auto;
mask-image: linear-gradient(0deg, transparent 0%, black 5%);
padding-bottom: 20px;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
}
}
}

View file

@ -270,7 +270,7 @@
margin-bottom: 10px;
.inventory-item {
padding: 0 10px;
padding-left: 10px;
}
}
@ -279,10 +279,11 @@
padding-top: 10px;
padding-bottom: 20px;
mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 95%, transparent 100%);
scrollbar-width: thin;
scrollbar-gutter: stable;
&:hover {
overflow-y: auto;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
}
}

View file

@ -443,7 +443,7 @@
margin-bottom: 10px;
.inventory-item {
padding: 0 10px;
padding-left: 10px;
}
}
@ -452,10 +452,11 @@
padding-top: 10px;
padding-bottom: 20px;
mask-image: linear-gradient(0deg, transparent 0%, black 5%);
scrollbar-gutter: stable;
scrollbar-width: thin;
&:hover {
overflow-y: auto;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
}
}

View file

@ -0,0 +1,17 @@
@import '../../../utils/colors.less';
.application.sheet.daggerheart.actor.dh-style.companion {
.tab.effects {
.effects-sections {
display: flex;
flex-direction: column;
gap: 10px;
overflow-y: auto;
mask-image: linear-gradient(0deg, transparent 0%, black 5%);
padding-bottom: 20px;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
}
}
}

View file

@ -55,6 +55,13 @@
font-size: 12px;
}
}
.attribution-header-label {
text-align: left;
position: relative;
top: 4px;
margin-bottom: -6px;
}
}
.status-number {

View file

@ -0,0 +1,17 @@
@import '../../../utils/colors.less';
.application.sheet.daggerheart.actor.dh-style.environment {
.tab.potentialAdversaries {
.items-section {
display: flex;
flex-direction: column;
gap: 10px;
overflow-y: auto;
mask-image: linear-gradient(0deg, transparent 0%, black 5%);
padding-bottom: 20px;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
}
}
}

View file

@ -5,6 +5,10 @@
.appTheme({
&.environment {
background-image: url('../assets/parchments/dh-parchment-dark.png');
.attribution-header-label {
background-image: url('../assets/parchments/dh-parchment-dark.png');
}
}
}, {
&.environment {
@ -18,5 +22,11 @@
overflow-y: auto;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
&.active {
overflow: hidden;
display: flex;
flex-direction: column;
}
}
}

View file

@ -4,6 +4,7 @@
@import './actors/adversary/header.less';
@import './actors/adversary/sheet.less';
@import './actors/adversary/sidebar.less';
@import './actors/adversary/effects.less';
@import './actors/character/biography.less';
@import './actors/character/effects.less';
@ -17,12 +18,16 @@
@import './actors/companion/details.less';
@import './actors/companion/header.less';
@import './actors/companion/sheet.less';
@import './actors/companion/effects.less';
@import './actors/environment/actions.less';
@import './actors/environment/header.less';
@import './actors/environment/potentialAdversaries.less';
@import './actors/environment/sheet.less';
@import './items/beastform.less';
@import './items/class.less';
@import './items/domain-card.less';
@import './items/feature.less';
@import './items/heritage.less';
@import './items/item-sheet-shared.less';

View file

@ -0,0 +1,12 @@
.application.sheet.daggerheart.dh-style {
&.ancestry,
&.community {
.item-card-header {
.item-info {
.item-description {
gap: 0;
}
}
}
}
}

View file

@ -0,0 +1,13 @@
.application.sheet.daggerheart.dh-style.item {
&.minimized {
.attribution-header-label {
display: none;
}
}
.attribution-header-label {
font-style: italic;
font-family: @font-body;
color: light-dark(@chat-blue-bg, @beige-50);
}
}

View file

@ -2,6 +2,38 @@
@import '../../utils/fonts.less';
@import '../../utils/spacing.less';
.theme-light {
.daggerheart.chat.domain-card {
.domain-card-move .domain-card-header {
border-bottom: 1px solid @dark-blue;
&:hover {
background: @dark-blue-10;
}
.domain-label {
.title {
color: @dark-blue;
}
.tags .tag {
background: @dark-15;
border: 1px solid @dark;
color: @dark;
}
}
.fa-chevron-down {
color: @dark-blue;
}
}
.description {
color: @dark;
}
}
}
.daggerheart.chat {
&.domain-card {
display: flex;
@ -41,7 +73,7 @@
border-bottom: 1px solid @golden;
&:hover {
background: light-dark(@dark-blue-10, @golden-10);
background: @golden-10;
cursor: pointer;
transition: all 0.3s ease;
}
@ -73,9 +105,9 @@
padding: 3px 5px;
font-size: 12px;
background: light-dark(@dark-15, @beige-15);
border: 1px solid light-dark(@dark, @beige);
color: light-dark(@dark, @beige);
background: @beige-15;
border: 1px solid @beige;
color: @beige;
border-radius: 3px;
}
}

View file

@ -2,6 +2,35 @@
@import '../../utils/fonts.less';
@import '../../utils/spacing.less';
.theme-light {
.daggerheart.chat.action {
.action-move .action-section {
border-bottom: 1px solid @dark-blue;
&:hover {
background: @dark-blue-10;
}
.action-header {
.title {
color: @dark-blue;
}
.label {
color: @dark;
}
}
.fa-chevron-down {
color: @dark-blue;
}
}
.description {
color: @dark;
}
}
}
.daggerheart.chat {
&.action {
display: flex;
@ -34,7 +63,7 @@
border-bottom: 1px solid @golden;
&:hover {
background: light-dark(@dark-blue-10, @golden-10);
background: @golden-10;
cursor: pointer;
transition: all 0.3s ease;
}

View file

@ -2,6 +2,49 @@
@import '../../utils/fonts.less';
@import '../../utils/spacing.less';
.theme-light {
.daggerheart,
#chat-notifications {
--text-color: @dark-blue;
--bg-color: @dark-blue-40;
.message-content .chat-roll {
.roll-part-header {
span,
span:before,
span:after {
color: @dark-blue;
}
&:before {
background: linear-gradient(90deg, rgba(0, 0, 0, 0) 0%, @dark-blue 100%);
color: @dark-blue;
}
&:after {
background: linear-gradient(90deg, @dark-blue 0%, rgba(0, 0, 0, 0) 100%);
color: @dark-blue;
}
}
.roll-section {
.roll-part-content {
.roll-result-value {
color: @dark-blue;
}
.dice-tooltip .wrapper .roll-die {
color: @beige;
}
}
}
}
.chat-message .roll-formula {
background: @dark-15;
color: @dark;
}
}
}
.daggerheart.chat {
&.resource-roll {
.reroll-message {
@ -27,8 +70,8 @@
.daggerheart,
#chat-notifications {
.chat-message {
--text-color: light-dark(@dark-blue, @golden);
--bg-color: light-dark(@dark-blue-40, @golden-40);
--text-color: @golden;
--bg-color: @golden-40;
[data-use-perm='false'] {
pointer-events: none;
@ -85,7 +128,7 @@
display: grid;
grid-template-columns: 1fr auto 1fr;
align-items: center;
color: light-dark(@dark, @beige);
color: @beige;
margin: 10px 0;
span {
@ -427,6 +470,7 @@
gap: 5px;
margin-top: 8px;
button {
height: 32px;
flex: 1;
}
}

View file

@ -2,6 +2,35 @@
@import '../../utils/fonts.less';
@import '../../utils/spacing.less';
.theme-light {
.daggerheart.chat.downtime {
.downtime-moves-list .downtime-move {
&:hover {
background: @dark-blue-10;
}
.downtime-label {
border-bottom: 1px solid @dark-blue;
.header-label .title {
color: @dark-blue;
}
.header-label .label {
color: @dark;
}
}
.fa-chevron-down {
color: @dark-blue;
}
}
.description {
color: @dark;
}
}
}
.daggerheart.chat {
&.downtime {
display: flex;

View file

@ -1,6 +1,66 @@
@import '../../utils/colors.less';
@import '../../utils/fonts.less';
.theme-light {
.chat-message .message-content {
color: @dark;
blockquote {
border-left: 5px solid @dark-blue-40;
}
a[href] {
color: @dark-blue;
}
a[href]:hover,
a[href].active {
font-weight: bold;
text-shadow: 0 0 8px @dark-blue;
}
button {
background: transparent;
border: 1px solid @dark-blue;
color: @dark-blue;
&:hover {
background: @light-black;
color: @dark-blue;
}
&:disabled {
background: transparent;
color: @dark-blue;
&:hover {
background: transparent;
color: @dark-blue;
}
}
&.reverted {
background: @dark-blue-10;
color: @dark-blue;
border: 1px solid @dark;
&:hover {
background: transparent;
color: @dark-blue;
}
img {
border-radius: 3px;
}
}
}
.roll-buttons button {
height: 40px;
font-family: @font-body;
font-weight: bold;
}
}
}
.chat-message.dh-chat-message {
.message-content {
padding: 0;
@ -17,7 +77,7 @@
.message-content {
padding: 0 8px;
font-family: @font-body;
color: light-dark(@dark, @beige);
color: @beige;
blockquote {
border-left: 5px solid light-dark(@dark-blue-40, @golden-40);
@ -34,15 +94,15 @@
}
button {
background: light-dark(transparent, @golden);
border: 1px solid light-dark(@dark-blue, @dark-blue);
color: light-dark(@dark-blue, @dark-blue);
background: @golden;
border: 1px solid @dark-blue;
color: @dark-blue;
outline: none;
box-shadow: none;
&:hover {
background: light-dark(@light-black, @dark-blue);
color: light-dark(@dark-blue, @golden);
background: @dark-blue;
color: @golden;
}
&.glow {
@ -50,24 +110,24 @@
}
&:disabled {
background: light-dark(transparent, @golden);
color: light-dark(@dark-blue, @dark-blue);
background: @golden;
color: @dark-blue;
opacity: 0.6;
cursor: not-allowed;
&:hover {
background: light-dark(transparent, @golden);
color: light-dark(@dark-blue, @dark-blue);
background: @golden;
color: @dark-blue;
}
}
&.reverted {
background: light-dark(@dark-blue-10, @golden-10);
color: light-dark(@dark-blue, @golden);
border: 1px solid light-dark(@dark, transparent);
background: @golden-10;
color: @golden;
border: 1px solid transparent;
&:hover {
background: light-dark(transparent, @golden);
color: light-dark(@dark-blue, @dark-blue);
background: @golden;
color: @dark-blue;
}
img {
border-radius: 3px;

View file

@ -47,11 +47,13 @@
@dark-blue-40: #18162e40;
@dark-blue-50: #18162e50;
@dark-blue-60: #18162e60;
@dark-blue-90: #18162e90;
@semi-transparent-dark-blue: rgba(24, 22, 46, 0.33);
@dark: #222;
@dark-15: #22222215;
@dark-40: #22222240;
@dark-80: #22222280;
@dark-filter: brightness(0) saturate(100%);
@deep-black: #0e0d15;