merge develop into feat/galerie - resolve model and code conflicts

This commit is contained in:
Tom Boullay
2026-05-29 02:25:46 +02:00
940 changed files with 92419 additions and 37567 deletions
+120 -2
View File
@@ -1144,6 +1144,7 @@ canvas {
}
.game-settings-menu__choice-group button,
.game-settings-menu__restart,
.game-settings-menu__quit {
width: 100%;
padding: 11px 12px;
@@ -1162,6 +1163,16 @@ canvas {
color: #050505;
}
.game-settings-menu__restart {
display: inline-flex;
align-items: center;
justify-content: center;
gap: 8px;
margin-top: 8px;
border-color: rgba(96, 165, 250, 0.35);
color: #bfdbfe;
}
.game-settings-menu__quit {
margin-top: 8px;
border-color: rgba(248, 113, 113, 0.35);
@@ -1715,7 +1726,7 @@ canvas {
.editor-transform-button {
display: grid;
grid-template-columns: 18px 1fr auto;
grid-template-columns: 18px minmax(0, 1fr) auto;
align-items: center;
gap: 10px;
width: 100%;
@@ -1735,6 +1746,30 @@ canvas {
transform 160ms ease;
}
.editor-transform-label {
display: grid;
min-width: 0;
gap: 2px;
}
.editor-transform-label span,
.editor-transform-label small {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.editor-transform-label small {
color: #8f8f8f;
font-size: 0.64rem;
font-weight: 620;
letter-spacing: 0;
}
.editor-transform-button.active .editor-transform-label small {
color: #555555;
}
.editor-transform-button.active {
background: #ffffff;
color: #050505;
@@ -1818,7 +1853,8 @@ canvas {
transform 160ms ease;
}
.editor-action-button + .editor-action-button {
.editor-action-button + .editor-action-button,
.editor-player-button + .editor-action-button {
margin-top: 8px;
}
@@ -1849,6 +1885,42 @@ canvas {
color: #050505;
}
.editor-checkbox-row {
display: grid;
grid-template-columns: auto 1fr;
align-items: center;
gap: 10px;
margin-top: 9px;
padding: 10px 11px;
background: #101010;
border: 1px solid #242424;
border-radius: 14px;
color: #f2f2f2;
cursor: pointer;
}
.editor-checkbox-row input {
width: 16px;
height: 16px;
accent-color: #ffffff;
}
.editor-checkbox-row span {
display: grid;
gap: 2px;
}
.editor-checkbox-row strong {
font-size: 0.82rem;
line-height: 1.1;
}
.editor-checkbox-row small {
color: #8f8f8f;
font-size: 0.68rem;
line-height: 1.2;
}
.editor-selected-info {
display: grid;
grid-template-columns: 17px 1fr auto;
@@ -1861,6 +1933,52 @@ canvas {
color: #050505;
}
.editor-scale-fields {
grid-column: 1 / -1;
display: grid;
grid-template-columns: repeat(3, minmax(0, 1fr));
gap: 8px;
margin-top: 2px;
}
.editor-scale-fields label,
.editor-checkbox-row,
.editor-add-node-row {
display: flex;
align-items: center;
gap: 8px;
}
.editor-scale-fields label {
flex-direction: column;
align-items: stretch;
}
.editor-scale-fields input,
.editor-add-node-row input {
width: 100%;
min-width: 0;
color: #f4f4f4;
background: #101010;
border: 1px solid #2a2a2a;
border-radius: 10px;
padding: 8px 9px;
font: inherit;
}
.editor-checkbox-row {
color: #d5d5d5;
font-size: 0.82rem;
}
.editor-add-node-row {
align-items: stretch;
}
.editor-add-node-row .editor-action-button {
white-space: nowrap;
}
.editor-selected-actions {
display: inline-flex;
gap: 6px;