Fix conflict

This commit is contained in:
Dapoolp 2025-07-31 11:54:36 +02:00
commit dbb07008f0
677 changed files with 67498 additions and 579 deletions

View file

@ -9,6 +9,36 @@
}
.application.daggerheart.dialog.dh-style.views.roll-selection {
.dialog-header {
display: flex;
justify-content: center;
h1 {
width: auto;
display: flex;
align-items: center;
gap: 8px;
.reaction-roll-controller {
width: auto;
opacity: 0.3;
border-radius: 50%;
font-size: 18px;
font-weight: bold;
&:hover {
opacity: 0.5;
background: light-dark(transparent, @golden);
color: light-dark(@dark-blue, @dark-blue);
}
&.active {
opacity: 1;
}
}
}
}
.roll-dialog-container {
display: flex;
flex-direction: column;
@ -16,6 +46,7 @@
max-width: 550px;
.dices-section {
position: relative;
display: flex;
gap: 60px;
justify-content: center;

View file

@ -5,6 +5,7 @@
@import './tab-navigation.less';
@import './tab-form-footer.less';
@import './tab-actions.less';
@import './tab-description.less';
@import './tab-features.less';
@import './tab-effects.less';
@import './tab-settings.less';

View file

@ -1,4 +1,15 @@
@import '../utils/colors.less';
@import '../utils/mixin.less';
.appTheme({
.item-card-header .item-icons-list .item-icon img {
filter: invert(88%) sepia(98%) saturate(1784%) hue-rotate(311deg) brightness(104%) contrast(91%);
}
}, {
.item-card-header .item-icons-list .item-icon img {
filter: invert(87%) sepia(15%) saturate(343%) hue-rotate(333deg) brightness(110%) contrast(87%);
}
});
.application.sheet.daggerheart.dh-style {
.item-sheet-header {
@ -68,7 +79,9 @@
.item-icons-list {
position: absolute;
display: flex;
align-items: center;
flex-direction: column;
gap: 5px;
align-items: end;
justify-content: center;
top: 50px;
right: 10px;
@ -82,7 +95,8 @@
max-width: 50px;
height: 50px;
font-size: 1.2rem;
background: light-dark(@light-black, @semi-transparent-dark-blue);
background: light-dark(@dark-blue-60, @dark-golden-80);
backdrop-filter: blur(8px);
border: 4px double light-dark(@beige, @golden);
color: light-dark(@beige, @golden);
border-radius: 999px;
@ -99,6 +113,11 @@
font-size: 0.8rem;
}
img {
height: 24px;
width: 24px;
}
&:hover {
max-width: 300px;
padding: 0 10px;

View file

@ -1,6 +1,7 @@
@import '../utils/colors.less';
@import '../utils/fonts.less';
.application {
.application.daggerheart {
prose-mirror {
height: 100% !important;
@ -11,14 +12,70 @@
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
h1 {
font-size: 36px;
}
h2 {
font-size: 32px;
}
h2 {
font-size: 28px;
font-weight: 600;
}
h3 {
font-size: 24px;
font-size: 20px;
font-weight: 600;
}
h4 {
font-size: 16px;
color: @beige;
font-weight: 600;
}
table {
font-family: @font-body;
border-radius: 3px;
thead {
background-color: light-dark(@dark-blue, @golden);
color: light-dark(@beige, @dark-blue);
}
tr:nth-child(odd) {
background-color: light-dark(@dark-blue-40, @golden-40);
border-color: light-dark(@golden, @dark-blue);
}
tr:nth-child(even) {
background-color: light-dark(@dark-blue-10, @golden-10);
border-color: light-dark(@golden, @dark-blue);
}
}
ul,
ol {
margin: 1rem 0;
padding: 0 0 0 1.25rem;
li {
font-family: @font-body;
margin-bottom: 0.25rem;
}
}
ul {
list-style: disc;
}
pre {
code {
border-radius: 6px;
background-color: @dark;
color: @beige;
border-color: @dark-blue;
}
}
blockquote {
border-radius: 3px;
border-left: 3px solid light-dark(@dark-blue-40, @golden-40);
background-color: light-dark(@dark-blue-10, @golden-10);
}
}
}
}
}

View file

@ -0,0 +1,13 @@
@import '../utils/colors.less';
@import '../utils/fonts.less';
.daggerheart.dh-style {
.tab.active.description {
overflow-y: hidden !important;
height: -webkit-fill-available !important;
fieldset {
height: -webkit-fill-available;
}
}
}

View file

@ -24,6 +24,12 @@
@medium-red-10: #D0474710;
@medium-red-40: #D0474740;
@dark-golden: #2b1d03;
@dark-golden-80: #2b1d0380;
@red: #e54e4e;
@red-10: #e54e4e10;
@red-40: #e54e4e40;
@dark-red: #3c0000;
@dark-red-10: #3c000010;