QR-Scanner: Kamera-Fallbacks und Foto-Upload; weitere Aenderungen

2026-09-29 18:08:01 +02:00
1 parent 7a0406eaa2
commit e2aef67099
@@ -741,4 +741,130 @@
    margin-bottom: 0.5rem;
 }

+/* ========================================
+   Merge Modal
+   ======================================== */
+.merge-source {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: baseline;
+    gap: 0.5rem;
+    padding: 0.6rem 0.75rem;
+    margin-bottom: 1rem;
+    border-radius: 8px;
+    background: rgba(255, 255, 255, 0.04);
+    border: 1px solid rgba(255, 255, 255, 0.08);
+}
+
+.merge-source .label {
+    font-size: 0.75rem;
+    text-transform: uppercase;
+    letter-spacing: 0.04em;
+    color: var(--text-secondary, #9a9a9a);
+}
+
+.merge-number {
+    font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
+    font-size: 0.8rem;
+    color: var(--text-secondary, #9a9a9a);
+}
+
+.merge-candidates {
+    list-style: none;
+    margin: 0.5rem 0 0;
+    padding: 0;
+    max-height: 260px;
+    overflow-y: auto;
+    border: 1px solid rgba(255, 255, 255, 0.08);
+    border-radius: 8px;
+}
+
+.merge-candidate {
+    padding: 0.55rem 0.75rem;
+    cursor: pointer;
+    border-bottom: 1px solid rgba(255, 255, 255, 0.06);
+    transition: background-color 0.15s ease;
+}
+
+.merge-candidate:last-child {
+    border-bottom: none;
+}
+
+.merge-candidate:hover {
+    background: rgba(255, 255, 255, 0.05);
+}
+
+.merge-candidate.selected {
+    background: rgba(var(--primary-rgb, 59, 130, 246), 0.18);
+    box-shadow: inset 3px 0 0 var(--primary, #3b82f6);
+}
+
+.merge-candidate-main {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: baseline;
+    gap: 0.5rem;
+}
+
+.merge-candidate-sub {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 0.75rem;
+    font-size: 0.8rem;
+    color: var(--text-secondary, #9a9a9a);
+    margin-top: 0.15rem;
+}
+
+.merge-suggest-badge {
+    font-size: 0.7rem;
+    padding: 0.1rem 0.45rem;
+    border-radius: 999px;
+    background: rgba(34, 197, 94, 0.18);
+    color: #4ade80;
+    border: 1px solid rgba(34, 197, 94, 0.35);
+}
+
+.merge-empty {
+    padding: 0.75rem;
+    font-size: 0.85rem;
+    color: var(--text-secondary, #9a9a9a);
+    text-align: center;
+}
+
+.merge-summary {
+    margin-top: 1rem;
+    padding: 0.75rem;
+    border-radius: 8px;
+    background: rgba(255, 255, 255, 0.04);
+    border: 1px solid rgba(255, 255, 255, 0.08);
+    font-size: 0.9rem;
+}
+
+.merge-summary p {
+    margin: 0 0 0.5rem;
+}
+
+.merge-summary ul {
+    margin: 0 0 0.5rem 1.1rem;
+    padding: 0;
+}
+
+.merge-warning {
+    color: #f87171;
+}
+
+.merge-confirm {
+    display: flex;
+    align-items: flex-start;
+    gap: 0.5rem;
+    margin-top: 0.5rem;
+    font-size: 0.85rem;
+    cursor: pointer;
+}
+
+.merge-confirm input {
+    margin-top: 0.2rem;
+    flex-shrink: 0;
+}
+
 /* Reduced motion: inherited from app.css (section 17) */