Merge from main, with conflict fixes

This commit is contained in:
Chris Ryan 2025-12-08 21:07:44 +10:00
commit a11a2d4e30
1252 changed files with 2537 additions and 22178 deletions

View file

@ -12,7 +12,8 @@
.card-list {
display: flex;
flex-direction: row;
gap: 10px;
flex-wrap: wrap;
gap: 6px;
align-items: center;
}
}

View file

@ -290,7 +290,7 @@
.card-item {
position: relative;
height: 120px;
width: 100px;
width: 98px;
border: 1px solid light-dark(@dark-blue, @golden);
border-radius: 6px;
cursor: pointer;