marcel/familienarchiv
1
0
Fork 0
Code Issues 114 Pull Requests 3 Actions 1 Packages Projects Releases Wiki Activity

chore: merge main into feat/issue-281-documents-page
Some checks failed
CI / Unit & Component Tests (pull_request) Failing after 2m39s
Details
CI / OCR Service Tests (pull_request) Successful in 29s
Details
CI / Backend Unit Tests (pull_request) Failing after 2m50s
Details
CI / Unit & Component Tests (push) Failing after 2m31s
Details
CI / OCR Service Tests (push) Successful in 31s
Details
CI / Backend Unit Tests (push) Failing after 2m52s
Details

Browse Source 
Resolved 9 conflicts:
- AuditLogQueryRepository/Service: keep HEAD (findRecentContributorsForDocuments)
- ContributorStack: merge main key fix + text-[10px] with HEAD safeColor + aria
- DashboardResumeStrip: merge main text-[10px] with HEAD safeColor
- +page.server/svelte + tests: keep HEAD (pure dashboard, no isDashboard)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit was merged in pull request #282.
This commit is contained in:
Marcel
2026-04-20 08:54:17 +02:00
parent da2ece986a b6466fcd95
commit 4e1d0b1cf0
5 changed files with 45 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/lib/components/ContributorStack.svelte
View File

@@ -25,11 +25,11 @@ function safeColor(color: string): string {
></span>
{:else}
<span class="inline-flex items-center">
{#each safeContributors as actor, i (i)}
{#each safeContributors as actor, i (actor.initials + '-' + actor.color)}
<span
role="img"
aria-label={actor.name ?? actor.initials}
class="inline-flex h-[22px] w-[22px] flex-shrink-0 items-center justify-center rounded-full font-sans text-xs font-bold text-white ring-2 ring-white {i > 0 ? '-ml-1.5' : ''}"
class="inline-flex h-[22px] w-[22px] flex-shrink-0 items-center justify-center rounded-full font-sans text-[10px] font-bold text-white ring-2 ring-white {i > 0 ? '-ml-1.5' : ''}"
style="background-color: {safeColor(actor.color)};"
title={actor.name ?? actor.initials}
>
@@ -40,7 +40,7 @@ function safeColor(color: string): string {
<span
role="img"
aria-label="Weitere Mitwirkende"
class="-ml-1.5 inline-flex h-[22px] w-[22px] flex-shrink-0 items-center justify-center rounded-full bg-[#e4e2d7] font-sans text-xs font-bold text-ink-3 ring-2 ring-white"
class="-ml-1.5 inline-flex h-[22px] w-[22px] flex-shrink-0 items-center justify-center rounded-full bg-[#e4e2d7] font-sans text-[10px] font-bold text-ink-3 ring-2 ring-white"
>
…
</span>

2
frontend/src/lib/components/DashboardResumeStrip.svelte
View File

@@ -97,7 +97,7 @@ function safeColor(color: string): string {
</div>
{#each resumeDoc.collaborators.slice(0, 3) as collab (collab.initials + collab.color)}
<span
class="-ml-1 inline-flex h-6 w-6 items-center justify-center rounded-full font-sans text-xs font-bold text-white ring-2 ring-white"
class="-ml-1 inline-flex h-6 w-6 items-center justify-center rounded-full font-sans text-[10px] font-bold text-white ring-2 ring-white"
style="background:{safeColor(collab.color)}">{collab.initials}</span
>
{/each}