merge files inital commit

This commit is contained in:
2026-05-23 15:02:40 +02:00
parent 8929080dc7
commit 3a0a90bd4a
16 changed files with 1232 additions and 190 deletions

View File

@@ -398,3 +398,94 @@ button.secondary {
align-items: flex-start;
}
}
.merge-queue-list {
display: flex;
flex-direction: column;
gap: 0.5rem;
margin: 0.75rem 0;
}
.merge-queue-item {
display: grid;
grid-template-columns: auto 1fr auto;
align-items: center;
gap: 0.75rem;
border: 1px solid #bfdbfe;
border-radius: 0.75rem;
background: rgba(255, 255, 255, 0.8);
padding: 0.6rem;
}
.merge-queue-order {
border-radius: 999px;
background: #dbeafe;
color: #1e3a8a;
font-size: 0.8rem;
font-weight: 700;
padding: 0.2rem 0.5rem;
}
.merge-queue-details {
display: flex;
flex-direction: column;
gap: 0.1rem;
min-width: 0;
font-size: 0.9rem;
}
.merge-queue-details strong {
overflow-wrap: anywhere;
}
.merge-queue-details span {
color: #4b5563;
font-size: 0.8rem;
}
.merge-queue-actions {
display: flex;
flex-wrap: wrap;
justify-content: flex-end;
gap: 0.35rem;
}
.merge-queue-actions button.secondary {
padding: 0.3rem 0.55rem;
font-size: 0.8rem;
}
.merge-mode-group {
display: flex;
flex-direction: column;
gap: 0.5rem;
margin-top: 0.75rem;
font-size: 0.9rem;
}
.merge-mode-group label {
display: flex;
align-items: center;
gap: 0.4rem;
}
.merge-warning {
margin: 0.75rem 0 0;
border: 1px solid #fed7aa;
border-radius: 0.5rem;
background: #fff7ed;
color: #9a3412;
padding: 0.55rem 0.65rem;
font-size: 0.85rem;
}
@media (max-width: 700px) {
.merge-queue-item {
grid-template-columns: 1fr;
align-items: stretch;
}
.merge-queue-actions {
justify-content: flex-start;
}
}