From 2c724c4e5116fc5df1d3d4dd326498d22ccab2fe Mon Sep 17 00:00:00 2001 From: Willie Date: Fri, 23 Oct 2026 14:29:43 +0800 Subject: [PATCH] fix(ui): put folder-conflict actions on their own row (#613) The conflict notice placed its action buttons beside the sentence. With a project target the "Edit app@claude's project" label is long, so two buttons squeezed the sentence into a narrow column of short lines. Put the actions on a row under the sentence, indented like the comparison table, so the sentence uses the full width. --- ui/src/components/sync/FolderConflictNotice.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ui/src/components/sync/FolderConflictNotice.tsx b/ui/src/components/sync/FolderConflictNotice.tsx index 1846f3f02..806e3e247 100644 --- a/ui/src/components/sync/FolderConflictNotice.tsx +++ b/ui/src/components/sync/FolderConflictNotice.tsx @@ -37,9 +37,11 @@ export default function FolderConflictNotice({ conflict, targets, onStop }: { co return (
-
- - {t('sync.folderConflict.text', { names: joinList(conflict.targets, locale), path: shortenHome(conflict.path) })} +
+ + {t('sync.folderConflict.text', { names: joinList(conflict.targets, locale), path: shortenHome(conflict.path) })} +
+
{conflict.stop.map((name) => { const page = projectPage(name); return page ? (