Fix conflicts

This commit is contained in:
Dapoolp 2025-08-25 13:42:23 +02:00
commit 92a0883806
121 changed files with 1526 additions and 1107 deletions

View file

@ -44,7 +44,7 @@
border-radius: 50%;
width: 24px;
height: 24px;
font-size: 12px;
font-size: var(--font-size-12);
}
}
}
@ -118,7 +118,7 @@
button {
border-radius: 50%;
font-size: 12px;
font-size: var(--font-size-12);
height: 24px;
width: 24px;
margin-right: 4px;

View file

@ -0,0 +1,52 @@
.theme-light .daggerheart.dh-style.setting.homebrew-settings .types.tab {
.adversary-types-container .adversary-type-container {
background-image: url('../assets/parchments/dh-parchment-light.png');
}
}
.daggerheart.dh-style.setting.homebrew-settings {
.types.tab {
.adversary-types-container {
width: 100%;
display: grid;
grid-template-columns: 1fr 1fr 1fr;
gap: 4px;
.adversary-type-container {
height: 2em;
display: flex;
align-items: center;
justify-content: space-between;
gap: 8px;
border: 1px solid;
border-radius: 6px;
padding: 0 8px;
border: 1px solid light-dark(@dark-blue, @golden);
color: light-dark(@dark, @beige);
background-image: url('../assets/parchments/dh-parchment-dark.png');
cursor: pointer;
opacity: 0.6;
&:hover {
opacity: 1;
}
&.active {
opacity: 1;
background: var(--color-warm-2);
}
}
}
.type-edit-container {
width: 100%;
display: flex;
flex-direction: column;
gap: 8px;
textarea {
width: 100%;
}
}
}
}

View file

@ -16,6 +16,12 @@
}
}
&.six-columns {
display: grid;
grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
gap: 2px;
}
&.start-align {
align-self: flex-start;
}
@ -53,7 +59,7 @@
}
i {
font-size: 18px;
font-size: var(--font-size-18);
}
}
}
@ -80,7 +86,7 @@
width: 80%;
.item-name input[type='text'] {
font-size: 32px;
font-size: var(--font-size-32);
height: 42px;
text-align: center;
width: 90%;
@ -103,28 +109,9 @@
gap: 4px;
}
.trait-array-container {
display: flex;
justify-content: space-evenly;
gap: 8px;
margin-bottom: 16px;
.trait-array-item {
position: relative;
display: flex;
justify-content: center;
label {
position: absolute;
top: -7px;
font-size: 12px;
font-variant: petite-caps;
z-index: 2;
}
input {
text-align: center;
}
.trait-item {
input {
text-align: center;
}
}