Fix conflicts

This commit is contained in:
Dapoolp 2025-08-08 20:06:59 +02:00
commit 3ff6ec4f5e
164 changed files with 2542 additions and 749 deletions

View file

@ -67,4 +67,30 @@
gap: 5px;
}
}
&.two-big-buttons {
.window-content {
padding-top: 0;
.form-footer {
display: grid;
grid-auto-columns: 1fr;
grid-auto-flow: column;
}
button[type='submit'] {
gap: 5px;
flex-direction: row;
font-family: @font-body;
font-weight: bold;
font-size: var(--font-size-14);
height: 40px;
white-space: nowrap;
i {
font-size: var(--font-size-16);
}
}
}
}
}

View file

@ -486,8 +486,42 @@
flex-wrap: wrap;
margin-top: 2px;
button {
white-space: nowrap;
.item-button {
display: flex;
border: 1px solid light-dark(#18162e, #18162e);
color: light-dark(#18162e, #18162e);
outline: none;
box-shadow: none;
border-radius: 6px;
button {
border-radius: 3px 0px 0px 3px;
color: light-dark(@dark-blue, @dark-blue);
white-space: nowrap;
border: 0;
font-family: @font-body;
&:hover {
color: light-dark(@dark-blue, @golden);
}
&:not(:first-child) {
padding: 6px;
background: light-dark(@dark-blue-10, @golden-secondary);
border-radius: 0px 3px 3px 0px;
color: light-dark(@dark-blue, @dark-golden);
&:hover {
background: light-dark(@light-black, @dark-blue);
color: light-dark(@dark-blue, @golden-secondary);
}
}
}
.spacer {
border-right: 1px solid black;
content: '';
}
}
}
}
@ -644,6 +678,12 @@
}
&.theme-light {
.tagify {
tag div img {
filter: @beige-filter;
}
}
.tagify__dropdown {
.tagify__dropdown__wrapper {
background-image: url(../assets/parchments/dh-parchment-light.png);

View file

@ -24,13 +24,15 @@
width: 100%;
list-style-type: none;
&:not(.single-img):hover {
.inventory-item-header .img-portait {
.roll-img {
opacity: 1;
}
.item-img {
opacity: 0;
&:not(.single-img) {
.inventory-item-header:hover {
.img-portait {
.roll-img {
opacity: 1;
}
.item-img {
opacity: 0;
}
}
}
}