Merge from development and fix conflicts

This commit is contained in:
Chris Ryan 2025-08-24 11:11:50 +10:00
commit 1aa00566d5
51 changed files with 788 additions and 558 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

@ -59,7 +59,7 @@
}
i {
font-size: 18px;
font-size: var(--font-size-18);
}
}
}
@ -86,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%;
@ -110,7 +110,6 @@
}
.trait-item {
input {
text-align: center;
}