mirror of
https://github.com/runkids/skillshare.git
synced 2026-11-19 02:17:09 +00:00
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.
This commit is contained in:
@@ -37,9 +37,11 @@ export default function FolderConflictNotice({ conflict, targets, onStop }: { co
|
||||
|
||||
return (
|
||||
<div className="ss-note warn flex-col !items-stretch">
|
||||
<div className="flex flex-wrap items-center gap-x-2.5 gap-y-2">
|
||||
<TriangleAlert size={16} className="shrink-0 text-warn" />
|
||||
<span className="min-w-0 flex-1 basis-80">{t('sync.folderConflict.text', { names: joinList(conflict.targets, locale), path: shortenHome(conflict.path) })}</span>
|
||||
<div className="flex items-start gap-2.5">
|
||||
<TriangleAlert size={16} className="mt-0.5 shrink-0 text-warn" />
|
||||
<span className="min-w-0 flex-1">{t('sync.folderConflict.text', { names: joinList(conflict.targets, locale), path: shortenHome(conflict.path) })}</span>
|
||||
</div>
|
||||
<div className="flex flex-wrap gap-2 pl-[26px]">
|
||||
{conflict.stop.map((name) => {
|
||||
const page = projectPage(name);
|
||||
return page ? (
|
||||
|
||||
Reference in New Issue
Block a user