Skip to content

A self-hostable bookmark-everything app (links, notes and images) with AI-based automatic tagging and full text search

fix(web): port shadcn v4 button styles (#3171)

Mohamed Bassem7240691dc242
diff --git a/apps/web/app/check-email/page.tsx b/apps/web/app/check-email/page.tsx
index 83241fc4..e41654d9 100644
--- a/apps/web/app/check-email/page.tsx
+++ b/apps/web/app/check-email/page.tsx
@@ -117,7 +117,7 @@ export default function CheckEmailPage() {
>
{resendEmailMutation.isPending ? (
<>
- <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+ <Loader2 className="h-4 w-4 animate-spin" />
Sending...
</>
) : (
diff --git a/apps/web/app/dashboard/not-found.tsx b/apps/web/app/dashboard/not-found.tsx
index c36d8612..027ef157 100644
--- a/apps/web/app/dashboard/not-found.tsx
+++ b/apps/web/app/dashboard/not-found.tsx
@@ -29,13 +29,13 @@ export default function NotFound() {
{/* Action Buttons */}
<div className="space-y-3">
<Button className="w-full" onClick={() => window.history.back()}>
- <ArrowLeft className="mr-2 h-4 w-4" />
+ <ArrowLeft className="h-4 w-4" />
Go Back
</Button>
<Link href="/" className="block">
<Button variant="outline" className="w-full">
- <Home className="mr-2 h-4 w-4" />
+ <Home className="h-4 w-4" />
Go Home
</Button>
</Link>
diff --git a/apps/web/app/settings/assets/page.tsx b/apps/web/app/settings/assets/page.tsx
index 84c31416..84a7213f 100644
--- a/apps/web/app/settings/assets/page.tsx
+++ b/apps/web/app/settings/assets/page.tsx
@@ -151,7 +151,7 @@ export default function AssetsSettingsPage() {
)
}
>
- <Trash2 className="mr-2 size-4" />
+ <Trash2 className="size-4" />
{t("actions.delete")}
</ActionButton>
)}
diff --git a/apps/web/app/settings/rules/page.tsx b/apps/web/app/settings/rules/page.tsx
index ca6a1b0f..868dea74 100644
--- a/apps/web/app/settings/rules/page.tsx
+++ b/apps/web/app/settings/rules/page.tsx
@@ -56,7 +56,7 @@ export default function RulesSettingsPage() {
description={t("settings.rules.description")}
action={
<Button onClick={handleCreateRule} variant="default">
- <PlusCircle className="mr-2 h-4 w-4" />
+ <PlusCircle className="h-4 w-4" />
{t("settings.rules.ceate_rule")}
</Button>
}
diff --git a/apps/web/app/verify-email/page.tsx b/apps/web/app/verify-email/page.tsx
index 2aba8ff1..bda65956 100644
--- a/apps/web/app/verify-email/page.tsx
+++ b/apps/web/app/verify-email/page.tsx
@@ -165,7 +165,7 @@ export default function VerifyEmailPage() {
>
{resendEmailMutation.isPending ? (
<>
- <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+ <Loader2 className="h-4 w-4 animate-spin" />
Sending...
</>
) : (
diff --git a/apps/web/components/admin/BookmarkDebugger.tsx b/apps/web/components/admin/BookmarkDebugger.tsx
index 4d173974..2f5ad7d8 100644
--- a/apps/web/components/admin/BookmarkDebugger.tsx
+++ b/apps/web/components/admin/BookmarkDebugger.tsx
@@ -234,7 +234,7 @@ export default function BookmarkDebugger() {
/>
</div>
<Button onClick={handleLookup} disabled={!inputValue.trim()}>
- <Search className="mr-2 h-4 w-4" />
+ <Search className="h-4 w-4" />
{t("admin.admin_tools.lookup")}
</Button>
</div>
@@ -632,9 +632,9 @@ export default function BookmarkDebugger() {
variant="outline"
>
{recrawlMutation.isPending ? (
- <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+ <Loader2 className="h-4 w-4 animate-spin" />
) : (
- <RefreshCw className="mr-2 h-4 w-4" />
+ <RefreshCw className="h-4 w-4" />
)}
{t("admin.admin_tools.recrawl")}
</Button>
@@ -645,9 +645,9 @@ export default function BookmarkDebugger() {
variant="outline"
>
{reindexMutation.isPending ? (
- <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+ <Loader2 className="h-4 w-4 animate-spin" />
) : (
- <Search className="mr-2 h-4 w-4" />
+ <Search className="h-4 w-4" />
)}
{t("admin.admin_tools.reindex")}
</Button>
@@ -658,9 +658,9 @@ export default function BookmarkDebugger() {
variant="outline"
>
{regenerateEmbeddingMutation.isPending ? (
- <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+ <Loader2 className="h-4 w-4 animate-spin" />
) : (
- <Layers className="mr-2 h-4 w-4" />
+ <Layers className="h-4 w-4" />
)}
{t("admin.admin_tools.regenerate_embedding")}
</Button>
@@ -671,9 +671,9 @@ export default function BookmarkDebugger() {
variant="outline"
>
{retagMutation.isPending ? (
- <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+ <Loader2 className="h-4 w-4 animate-spin" />
) : (
- <Tag className="mr-2 h-4 w-4" />
+ <Tag className="h-4 w-4" />
)}
{t("admin.admin_tools.retag")}
</Button>
@@ -687,9 +687,9 @@ export default function BookmarkDebugger() {
variant="outline"
>
{resummarizeMutation.isPending ? (
- <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+ <Loader2 className="h-4 w-4 animate-spin" />
) : (
- <Sparkles className="mr-2 h-4 w-4" />
+ <Sparkles className="h-4 w-4" />
)}
{t("admin.admin_tools.resummarize")}
</Button>
diff --git a/apps/web/components/admin/InvitesList.tsx b/apps/web/components/admin/InvitesList.tsx
index 787b1ea8..ebdd972a 100644
--- a/apps/web/components/admin/InvitesList.tsx
+++ b/apps/web/components/admin/InvitesList.tsx
@@ -103,7 +103,7 @@ export default function InvitesList() {
onClick={() => resendInvite({ inviteId: invite.id })}
disabled={isResendPending}
>
- <Mail size={14} />
+ <Mail className="size-3.5" size={14} />
</ButtonWithTooltip>
<ActionConfirmingDialog
title="Revoke Invite"
@@ -126,7 +126,7 @@ export default function InvitesList() {
variant="outline"
size="sm"
>
- <MailX size={14} color="red" />
+ <MailX className="size-3.5" size={14} color="red" />
</ButtonWithTooltip>
</ActionConfirmingDialog>
</>
diff --git a/apps/web/components/dashboard/BulkBookmarksAction.tsx b/apps/web/components/dashboard/BulkBookmarksAction.tsx
index e2498d9a..a80b3959 100644
--- a/apps/web/components/dashboard/BulkBookmarksAction.tsx
+++ b/apps/web/components/dashboard/BulkBookmarksAction.tsx
@@ -164,14 +164,14 @@ export default function BulkBookmarksAction() {
name: isClipboardAvailable()
? t("actions.copy_link")
: "Copying is only available over https",
- icon: <Link size={18} />,
+ icon: <Link size={18} className="size-[18px]" />,
action: () => copyLinks(),
isPending: false,
hidden: !isBulkEditEnabled,
},
{
name: t("actions.remove_from_list"),
- icon: <ListMinus size={18} />,
+ icon: <ListMinus size={18} className="size-[18px]" />,
action: () => setIsRemoveFromListDialogOpen(true),
isPending: removeBookmarkFromListMutator.isPending,
hidden:
@@ -183,49 +183,61 @@ export default function BulkBookmarksAction() {
},
{
name: t("actions.add_to_list"),
- icon: <List size={18} />,
+ icon: <List size={18} className="size-[18px]" />,
action: () => setManageListsModalOpen(true),
isPending: false,
hidden: !isBulkEditEnabled,
},
{
name: t("actions.edit_tags"),
- icon: <Hash size={18} />,
+ icon: <Hash size={18} className="size-[18px]" />,
action: () => setBulkTagModalOpen(true),
isPending: false,
hidden: !isBulkEditEnabled,
},
{
name: alreadyFavourited ? t("actions.unfavorite") : t("actions.favorite"),
- icon: <FavouritedActionIcon favourited={!!alreadyFavourited} size={18} />,
+ icon: (
+ <FavouritedActionIcon
+ favourited={!!alreadyFavourited}
+ size={18}
+ className="size-[18px]"
+ />
+ ),
action: () => updateBookmarks({ favourited: !alreadyFavourited }),
isPending: updateBookmarkMutator.isPending,
hidden: !isBulkEditEnabled,
},
{
name: alreadyArchived ? t("actions.unarchive") : t("actions.archive"),
- icon: <ArchivedActionIcon size={18} archived={!!alreadyArchived} />,
+ icon: (
+ <ArchivedActionIcon
+ size={18}
+ className="size-[18px]"
+ archived={!!alreadyArchived}
+ />
+ ),
action: () => updateBookmarks({ archived: !alreadyArchived }),
isPending: updateBookmarkMutator.isPending,
hidden: !isBulkEditEnabled,
},
{
name: t("actions.preserve_offline_archive"),
- icon: <FileDown size={18} />,
+ icon: <FileDown size={18} className="size-[18px]" />,
action: () => recrawlBookmarks(true),
isPending: recrawlBookmarkMutator.isPending,
hidden: !isBulkEditEnabled,
},
{
name: t("actions.refresh"),
- icon: <RotateCw size={18} />,
+ icon: <RotateCw size={18} className="size-[18px]" />,
action: () => recrawlBookmarks(false),
isPending: recrawlBookmarkMutator.isPending,
hidden: !isBulkEditEnabled,
},
{
name: t("actions.delete"),
- icon: <Trash2 size={18} color="red" />,
+ icon: <Trash2 size={18} className="size-[18px]" color="red" />,
action: () => setIsDeleteDialogOpen(true),
hidden: !isBulkEditEnabled,
},
@@ -235,7 +247,8 @@ export default function BulkBookmarksAction() {
: t("actions.select_all"),
icon: (
<p className="flex items-center gap-2">
- ( <CheckCheck size={18} /> {selectedBookmarks.length} )
+ ( <CheckCheck size={18} className="size-[18px]" />{" "}
+ {selectedBookmarks.length} )
</p>
),
action: () =>
@@ -245,7 +258,7 @@ export default function BulkBookmarksAction() {
},
{
name: t("actions.close_bulk_edit"),
- icon: <X size={18} />,
+ icon: <X size={18} className="size-[18px]" />,
action: () => setIsBulkEditEnabled(false),
alwaysEnable: true,
hidden: !isBulkEditEnabled,
diff --git a/apps/web/components/dashboard/ErrorFallback.tsx b/apps/web/components/dashboard/ErrorFallback.tsx
index 7e4ce0d6..5cb3f10a 100644
--- a/apps/web/components/dashboard/ErrorFallback.tsx
+++ b/apps/web/components/dashboard/ErrorFallback.tsx
@@ -26,13 +26,13 @@ export default function ErrorFallback() {
<div className="space-y-3">
<Button className="w-full" onClick={() => window.location.reload()}>
- <RefreshCw className="mr-2 h-4 w-4" />
+ <RefreshCw className="h-4 w-4" />
Try Again
</Button>
<Link href="/" className="block">
<Button variant="outline" className="w-full">
- <Home className="mr-2 h-4 w-4" />
+ <Home className="h-4 w-4" />
Go Home
</Button>
</Link>
diff --git a/apps/web/components/dashboard/SortOrderToggle.tsx b/apps/web/components/dashboard/SortOrderToggle.tsx
index e417175a..769d6dcb 100644
--- a/apps/web/components/dashboard/SortOrderToggle.tsx
+++ b/apps/web/components/dashboard/SortOrderToggle.tsx
@@ -42,9 +42,15 @@ export default function SortOrderToggle() {
delayDuration={100}
variant="ghost"
>
- {currentSort === "relevance" && <ListFilter size={18} />}
- {currentSort === "asc" && <SortAsc size={18} />}
- {currentSort === "desc" && <SortDesc size={18} />}
+ {currentSort === "relevance" && (
+ <ListFilter className="size-[18px]" size={18} />
+ )}
+ {currentSort === "asc" && (
+ <SortAsc className="size-[18px]" size={18} />
+ )}
+ {currentSort === "desc" && (
+ <SortDesc className="size-[18px]" size={18} />
+ )}
</ButtonWithTooltip>
</DropdownMenuTrigger>
<DropdownMenuContent className="w-fit">
diff --git a/apps/web/components/dashboard/ViewOptions.tsx b/apps/web/components/dashboard/ViewOptions.tsx
index 4c10801f..da374cb3 100644
--- a/apps/web/components/dashboard/ViewOptions.tsx
+++ b/apps/web/components/dashboard/ViewOptions.tsx
@@ -135,7 +135,7 @@ export default function ViewOptions() {
delayDuration={100}
variant="ghost"
>
- <Settings size={18} />
+ <Settings className="size-[18px]" size={18} />
</ButtonWithTooltip>
</DropdownMenuTrigger>
<DropdownMenuContent className="w-56">
diff --git a/apps/web/components/dashboard/bookmarks/BookmarkActionBar.tsx b/apps/web/components/dashboard/bookmarks/BookmarkActionBar.tsx
index 8fbb8701..6b42171b 100644
--- a/apps/web/components/dashboard/bookmarks/BookmarkActionBar.tsx
+++ b/apps/web/components/dashboard/bookmarks/BookmarkActionBar.tsx
@@ -25,7 +25,10 @@ export default function BookmarkActionBar({
)}
<Link
href={`/dashboard/preview/${bookmark.id}`}
- className={cn(buttonVariants({ variant: "ghost" }), "px-2")}
+ className={cn(
+ buttonVariants({ variant: "ghost" }),
+ "px-2 has-[>svg]:px-2",
+ )}
>
<Maximize2 size={16} />
</Link>
diff --git a/apps/web/components/dashboard/bookmarks/BookmarkOptions.tsx b/apps/web/components/dashboard/bookmarks/BookmarkOptions.tsx
index 360f6ad8..2006eb15 100644
--- a/apps/web/components/dashboard/bookmarks/BookmarkOptions.tsx
+++ b/apps/web/components/dashboard/bookmarks/BookmarkOptions.tsx
@@ -514,8 +514,11 @@ export default function BookmarkOptions({ bookmark }: { bookmark: ZBookmark }) {
/>
<DropdownMenu>
<DropdownMenuTrigger asChild>
- <Button variant="ghost" className="px-1 focus-visible:ring-0">
- <MoreHorizontal />
+ <Button
+ variant="ghost"
+ className="px-1 focus-visible:ring-0 has-[>svg]:px-1"
+ >
+ <MoreHorizontal className="size-6" />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent
diff --git a/apps/web/components/dashboard/bookmarks/TagsEditor.tsx b/apps/web/components/dashboard/bookmarks/TagsEditor.tsx
index 2c3d7b1c..c3de2b73 100644
--- a/apps/web/components/dashboard/bookmarks/TagsEditor.tsx
+++ b/apps/web/components/dashboard/bookmarks/TagsEditor.tsx
@@ -388,7 +388,7 @@ export function TagsEditor({
variant="ghost"
size="sm"
onClick={createTag}
- className="h-auto p-1"
+ className="h-auto p-1 has-[>svg]:px-1"
>
<Plus className="h-4 w-4" />
</Button>
diff --git a/apps/web/components/dashboard/cleanups/TagDuplicationDetention.tsx b/apps/web/components/dashboard/cleanups/TagDuplicationDetention.tsx
index 2c958af9..47aaa579 100644
--- a/apps/web/components/dashboard/cleanups/TagDuplicationDetention.tsx
+++ b/apps/web/components/dashboard/cleanups/TagDuplicationDetention.tsx
@@ -102,13 +102,13 @@ function ApplyAllButton({ suggestions }: { suggestions: Suggestion[] }) {
variant="destructive"
onClick={() => applyAll(setDialogOpen)}
>
- <Check className="mr-2 size-4" />
+ <Check className="size-4" />
{t("actions.apply_all")}
</ActionButton>
)}
>
<Button variant="destructive">
- <Check className="mr-2 size-4" />
+ <Check className="size-4" />
{t("actions.apply_all")}
</Button>
</ActionConfirmingDialog>
@@ -183,7 +183,7 @@ function SuggestionRow({
})
}
>
- <Combine className="mr-2 size-4" />
+ <Combine className="size-4" />
{t("actions.merge")}
</ActionButton>
@@ -191,7 +191,7 @@ function SuggestionRow({
variant={"secondary"}
onClick={() => deleteSuggestion(suggestion)}
>
- <X className="mr-2 size-4" />
+ <X className="size-4" />
{t("actions.ignore")}
</Button>
</TableCell>
diff --git a/apps/web/components/dashboard/lists/BookmarkListSelector.tsx b/apps/web/components/dashboard/lists/BookmarkListSelector.tsx
index 4b6fd0a1..ef56ae52 100644
--- a/apps/web/components/dashboard/lists/BookmarkListSelector.tsx
+++ b/apps/web/components/dashboard/lists/BookmarkListSelector.tsx
@@ -170,7 +170,7 @@ function BookmarkListSingleSelector({
disabled={disabled}
>
{selectedListName || placeholder}
- <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+ <ChevronsUpDown className="h-4 w-4 shrink-0 opacity-50" />
</Button>
</ListSelectorComponent>
);
diff --git a/apps/web/components/dashboard/lists/EditListModal.tsx b/apps/web/components/dashboard/lists/EditListModal.tsx
index 72e33330..9302a018 100644
--- a/apps/web/components/dashboard/lists/EditListModal.tsx
+++ b/apps/web/components/dashboard/lists/EditListModal.tsx
@@ -326,7 +326,7 @@ export function EditListModal({
form.setValue("parentId", "");
}}
>
- <X />
+ <X className="size-6" />
</Button>
</div>
<FormMessage />
diff --git a/apps/web/components/dashboard/lists/ListHeader.tsx b/apps/web/components/dashboard/lists/ListHeader.tsx
index 975f0417..3cfd11fb 100644
--- a/apps/web/components/dashboard/lists/ListHeader.tsx
+++ b/apps/web/components/dashboard/lists/ListHeader.tsx
@@ -103,7 +103,7 @@ export default function ListHeader({
<div className="flex shrink-0 items-center">
<ListOptions list={list}>
<Button variant="ghost">
- <MoreHorizontal />
+ <MoreHorizontal className="size-6" />
</Button>
</ListOptions>
</div>
diff --git a/apps/web/components/dashboard/lists/MergeListModal.tsx b/apps/web/components/dashboard/lists/MergeListModal.tsx
index b22cd1a2..7746fef7 100644
--- a/apps/web/components/dashboard/lists/MergeListModal.tsx
+++ b/apps/web/components/dashboard/lists/MergeListModal.tsx
@@ -180,7 +180,7 @@ export function MergeListModal({
form.resetField("targetId");
}}
>
- <X />
+ <X className="size-6" />
</Button>
</div>
<FormMessage />
diff --git a/apps/web/components/dashboard/lists/PendingInvitationsCard.tsx b/apps/web/components/dashboard/lists/PendingInvitationsCard.tsx
index 7c13dbeb..0fe57ce5 100644
--- a/apps/web/components/dashboard/lists/PendingInvitationsCard.tsx
+++ b/apps/web/components/dashboard/lists/PendingInvitationsCard.tsx
@@ -111,7 +111,7 @@ function InvitationRow({ invitation }: { invitation: Invitation }) {
<Loader2 className="h-4 w-4 animate-spin" />
) : (
<>
- <X className="mr-1 h-4 w-4" />
+ <X className="h-4 w-4" />
{t("lists.invitations.decline")}
</>
)}
@@ -127,7 +127,7 @@ function InvitationRow({ invitation }: { invitation: Invitation }) {
<Loader2 className="h-4 w-4 animate-spin" />
) : (
<>
- <Check className="mr-1 h-4 w-4" />
+ <Check className="h-4 w-4" />
{t("lists.invitations.accept")}
</>
)}
diff --git a/apps/web/components/dashboard/preview/ActionBar.tsx b/apps/web/components/dashboard/preview/ActionBar.tsx
index 6514fd8b..9b582981 100644
--- a/apps/web/components/dashboard/preview/ActionBar.tsx
+++ b/apps/web/components/dashboard/preview/ActionBar.tsx
@@ -67,7 +67,7 @@ export default function ActionBar({ bookmark }: { bookmark: ZBookmark }) {
setEditBookmarkDialogOpen(true);
}}
>
- <Pencil size={18} strokeWidth={1.5} />
+ <Pencil className="size-[18px]" size={18} strokeWidth={1.5} />
</Button>
</TooltipTrigger>
<TooltipContent side="bottom">{t("actions.edit")}</TooltipContent>
@@ -87,6 +87,7 @@ export default function ActionBar({ bookmark }: { bookmark: ZBookmark }) {
}}
>
<FavouritedActionIcon
+ className="size-[18px]"
favourited={bookmark.favourited}
size={18}
strokeWidth={1.5}
@@ -114,6 +115,7 @@ export default function ActionBar({ bookmark }: { bookmark: ZBookmark }) {
}}
>
<ArchivedActionIcon
+ className="size-[18px]"
archived={bookmark.archived}
size={18}
strokeWidth={1.5}
@@ -137,7 +139,7 @@ export default function ActionBar({ bookmark }: { bookmark: ZBookmark }) {
size="none"
onClick={() => setDeleteBookmarkDialogOpen(true)}
>
- <Trash2 size={18} strokeWidth={1.5} />
+ <Trash2 className="size-[18px]" size={18} strokeWidth={1.5} />
</Button>
</TooltipTrigger>
<TooltipContent side="bottom">{t("actions.delete")}</TooltipContent>
diff --git a/apps/web/components/dashboard/preview/AttachmentBox.tsx b/apps/web/components/dashboard/preview/AttachmentBox.tsx
index 2c785c0f..3140af29 100644
--- a/apps/web/components/dashboard/preview/AttachmentBox.tsx
+++ b/apps/web/components/dashboard/preview/AttachmentBox.tsx
@@ -240,7 +240,7 @@ export default function AttachmentBox({
)
}
>
- <Trash2 className="mr-2 size-4" />
+ <Trash2 className="size-4" />
Delete
</ActionButton>
)}
diff --git a/apps/web/components/dashboard/preview/ReaderSettingsPopover.tsx b/apps/web/components/dashboard/preview/ReaderSettingsPopover.tsx
index f37b8263..0f12cdd1 100644
--- a/apps/web/components/dashboard/preview/ReaderSettingsPopover.tsx
+++ b/apps/web/components/dashboard/preview/ReaderSettingsPopover.tsx
@@ -154,7 +154,7 @@ export default function ReaderSettingsPopover({
className="h-5 w-5 text-muted-foreground hover:text-foreground"
onClick={() => clearLocalOverride("fontFamily")}
>
- <X className="h-3 w-3" />
+ <X className="size-3" />
</Button>
</TooltipTrigger>
<TooltipContent>
@@ -229,7 +229,7 @@ export default function ReaderSettingsPopover({
className="h-5 w-5 text-muted-foreground hover:text-foreground"
onClick={() => clearLocalOverride("fontSize")}
>
- <X className="h-3 w-3" />
+ <X className="size-3" />
</Button>
</TooltipTrigger>
<TooltipContent>
@@ -252,7 +252,7 @@ export default function ReaderSettingsPopover({
<Button
variant="outline"
size="icon"
- className="h-7 w-7 bg-transparent"
+ className="h-7 w-7 bg-transparent dark:bg-transparent"
onClick={() =>
updateSession({
fontSize: Math.max(
@@ -263,7 +263,7 @@ export default function ReaderSettingsPopover({
})
}
>
- <Minus className="h-3 w-3" />
+ <Minus className="size-3" />
</Button>
<Slider
value={[settings.fontSize]}
@@ -283,7 +283,7 @@ export default function ReaderSettingsPopover({
<Button
variant="outline"
size="icon"
- className="h-7 w-7 bg-transparent"
+ className="h-7 w-7 bg-transparent dark:bg-transparent"
onClick={() =>
updateSession({
fontSize: Math.min(
@@ -294,7 +294,7 @@ export default function ReaderSettingsPopover({
})
}
>
- <Plus className="h-3 w-3" />
+ <Plus className="size-3" />
</Button>
</div>
</div>
@@ -323,7 +323,7 @@ export default function ReaderSettingsPopover({
className="h-5 w-5 text-muted-foreground hover:text-foreground"
onClick={() => clearLocalOverride("lineHeight")}
>
- <X className="h-3 w-3" />
+ <X className="size-3" />
</Button>
</TooltipTrigger>
<TooltipContent>
@@ -346,7 +346,7 @@ export default function ReaderSettingsPopover({
<Button
variant="outline"
size="icon"
- className="h-7 w-7 bg-transparent"
+ className="h-7 w-7 bg-transparent dark:bg-transparent"
onClick={() =>
updateSession({
lineHeight: Math.max(
@@ -360,7 +360,7 @@ export default function ReaderSettingsPopover({
})
}
>
- <Minus className="h-3 w-3" />
+ <Minus className="size-3" />
</Button>
<Slider
value={[settings.lineHeight]}
@@ -380,7 +380,7 @@ export default function ReaderSettingsPopover({
<Button
variant="outline"
size="icon"
- className="h-7 w-7 bg-transparent"
+ className="h-7 w-7 bg-transparent dark:bg-transparent"
onClick={() =>
updateSession({
lineHeight: Math.min(
@@ -394,7 +394,7 @@ export default function ReaderSettingsPopover({
})
}
>
- <Plus className="h-3 w-3" />
+ <Plus className="size-3" />
</Button>
</div>
</div>
@@ -410,7 +410,7 @@ export default function ReaderSettingsPopover({
className="w-full"
onClick={() => clearSession()}
>
- <RotateCcw className="mr-2 h-4 w-4" />
+ <RotateCcw className="h-4 w-4" />
{t("settings.info.reader_settings.reset_preview")}
</Button>
@@ -422,7 +422,7 @@ export default function ReaderSettingsPopover({
disabled={isSaving}
onClick={() => saveToDevice()}
>
- <Laptop className="mr-2 h-4 w-4" />
+ <Laptop className="h-4 w-4" />
{t("settings.info.reader_settings.save_to_device")}
</Button>
<Button
@@ -432,7 +432,7 @@ export default function ReaderSettingsPopover({
disabled={isSaving}
onClick={() => saveToServer()}
>
- <Globe className="mr-2 h-4 w-4" />
+ <Globe className="h-4 w-4" />
{t("settings.info.reader_settings.save_to_all_devices")}
</Button>
</div>
diff --git a/apps/web/components/dashboard/preview/SavedPageOverview.tsx b/apps/web/components/dashboard/preview/SavedPageOverview.tsx
index c46e80fb..0d4bf5e2 100644
--- a/apps/web/components/dashboard/preview/SavedPageOverview.tsx
+++ b/apps/web/components/dashboard/preview/SavedPageOverview.tsx
@@ -77,7 +77,7 @@ export default function SavedPageOverview({
<div className="flex flex-nowrap items-center gap-2">
<Button asChild size="sm">
<Link href={link.url} target="_blank" rel="noreferrer">
- <ExternalLink className="mr-2 size-4" />
+ <ExternalLink className="size-4" />
{t("preview.view_original")}
</Link>
</Button>
@@ -87,7 +87,7 @@ export default function SavedPageOverview({
size="sm"
onClick={() => onSelectSection("cached")}
>
- <BookOpen className="mr-2 size-4" />
+ <BookOpen className="size-4" />
{t("preview.try_reader_view")}
</Button>
) : null}
diff --git a/apps/web/components/dashboard/rules/RuleEngineActionBuilder.tsx b/apps/web/components/dashboard/rules/RuleEngineActionBuilder.tsx
index 82ed3304..2b6289b1 100644
--- a/apps/web/components/dashboard/rules/RuleEngineActionBuilder.tsx
+++ b/apps/web/components/dashboard/rules/RuleEngineActionBuilder.tsx
@@ -192,7 +192,7 @@ export function ActionBuilder({ value, onChange }: ActionBuilderProps) {
variant="ghost"
size="sm"
onClick={() => handleRemoveAction(index)}
- className="h-7 w-7 p-0"
+ className="h-7 w-7 p-0 has-[>svg]:px-0"
>
<Trash2 className="h-4 w-4 text-red-500" />
</Button>
@@ -209,7 +209,7 @@ export function ActionBuilder({ value, onChange }: ActionBuilderProps) {
onClick={handleAddAction}
className="w-full"
>
- <PlusCircle className="mr-2 h-4 w-4" />
+ <PlusCircle className="h-4 w-4" />
Add Action
</Button>
</div>
diff --git a/apps/web/components/dashboard/rules/RuleEngineConditionBuilder.tsx b/apps/web/components/dashboard/rules/RuleEngineConditionBuilder.tsx
index d8a27cf2..83972bc0 100644
--- a/apps/web/components/dashboard/rules/RuleEngineConditionBuilder.tsx
+++ b/apps/web/components/dashboard/rules/RuleEngineConditionBuilder.tsx
@@ -295,7 +295,7 @@ export function ConditionBuilder({
});
}}
>
- <PlusCircle className="mr-2 h-4 w-4" />
+ <PlusCircle className="h-4 w-4" />
Add Condition
</Button>
</div>
@@ -373,7 +373,11 @@ export function ConditionBuilder({
<div className="flex items-center justify-between">
<div className="flex items-center">
<CollapsibleTrigger asChild>
- <Button variant="ghost" size="sm" className="h-7 w-7 p-1">
+ <Button
+ variant="ghost"
+ size="sm"
+ className="h-7 w-7 p-1 has-[>svg]:px-1"
+ >
{isOpen ? (
<ChevronDown className="h-4 w-4" />
) : (
@@ -393,7 +397,7 @@ export function ConditionBuilder({
variant="ghost"
size="sm"
onClick={onRemove}
- className="h-7 w-7 p-0"
+ className="h-7 w-7 p-0 has-[>svg]:px-0"
>
<Trash2 className="h-4 w-4 text-red-500" />
</Button>
@@ -415,7 +419,7 @@ export function ConditionBuilder({
variant="ghost"
size="sm"
onClick={onRemove}
- className="h-7 w-7 p-0"
+ className="h-7 w-7 p-0 has-[>svg]:px-0"
>
<Trash2 className="h-4 w-4 text-red-500" />
</Button>
diff --git a/apps/web/components/dashboard/rules/RuleEngineRuleEditor.tsx b/apps/web/components/dashboard/rules/RuleEngineRuleEditor.tsx
index 250c17f1..e2ed313c 100644
--- a/apps/web/components/dashboard/rules/RuleEngineRuleEditor.tsx
+++ b/apps/web/components/dashboard/rules/RuleEngineRuleEditor.tsx
@@ -189,11 +189,11 @@ export function RuleEditor({ rule, onCancel }: RuleEditorProps) {
<div className="flex justify-end space-x-2 pt-4">
<Button type="button" variant="outline" onClick={onCancel}>
- <X className="mr-2 h-4 w-4" />
+ <X className="h-4 w-4" />
{t("actions.cancel")}
</Button>
<ActionButton loading={isCreating || isUpdating} type="submit">
- <Save className="mr-2 h-4 w-4" />
+ <Save className="h-4 w-4" />
{t("settings.rules.save_rule")}
</ActionButton>
</div>
diff --git a/apps/web/components/dashboard/rules/RuleEngineRuleList.tsx b/apps/web/components/dashboard/rules/RuleEngineRuleList.tsx
index ce654052..92888c6e 100644
--- a/apps/web/components/dashboard/rules/RuleEngineRuleList.tsx
+++ b/apps/web/components/dashboard/rules/RuleEngineRuleList.tsx
@@ -122,7 +122,7 @@ export default function RuleList({
setDialogOpen(true);
}}
>
- <Trash2 className="mr-2 h-4 w-4" />
+ <Trash2 className="h-4 w-4" />
{t("actions.delete")}
</ActionButton>
)}
diff --git a/apps/web/components/dashboard/tags/AllTagsView.tsx b/apps/web/components/dashboard/tags/AllTagsView.tsx
index a58b9183..03092910 100644
--- a/apps/web/components/dashboard/tags/AllTagsView.tsx
+++ b/apps/web/components/dashboard/tags/AllTagsView.tsx
@@ -298,11 +298,11 @@ export default function AllTagsView() {
variant="outline"
className="flex-shrink-0 bg-background"
>
- <ArrowDownAZ className="mr-2 size-4" />
+ <ArrowDownAZ className="size-4" />
<span className="hidden text-sm font-medium sm:inline">
{sortLabels[sortBy]}
</span>
- <ChevronDown className="ml-2 size-4" />
+ <ChevronDown className="size-4" />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end" className="w-48">
diff --git a/apps/web/components/dashboard/tags/BulkTagAction.tsx b/apps/web/components/dashboard/tags/BulkTagAction.tsx
index c8061a1f..6241bba3 100644
--- a/apps/web/components/dashboard/tags/BulkTagAction.tsx
+++ b/apps/web/components/dashboard/tags/BulkTagAction.tsx
@@ -72,7 +72,8 @@ export default function BulkTagAction() {
: t("actions.select_all"),
icon: (
<p className="flex items-center gap-2">
- ( <CheckCheck size={18} /> {selectedTagIds.length} )
+ ( <CheckCheck size={18} className="size-[18px]" />{" "}
+ {selectedTagIds.length} )
</p>
),
action: () =>
@@ -81,12 +82,12 @@ export default function BulkTagAction() {
},
{
name: t("actions.delete"),
- icon: <Trash2 size={18} color="red" />,
+ icon: <Trash2 size={18} className="size-[18px]" color="red" />,
action: () => setIsDeleteDialogOpen(true),
},
{
name: t("actions.close_bulk_edit"),
- icon: <X size={18} />,
+ icon: <X size={18} className="size-[18px]" />,
action: () => setIsBulkEditEnabled(false),
alwaysEnable: true,
},
diff --git a/apps/web/components/dashboard/tags/CreateTagModal.tsx b/apps/web/components/dashboard/tags/CreateTagModal.tsx
index e5cf4a45..96125878 100644
--- a/apps/web/components/dashboard/tags/CreateTagModal.tsx
+++ b/apps/web/components/dashboard/tags/CreateTagModal.tsx
@@ -91,7 +91,7 @@ export function CreateTagModal() {
>
<DialogTrigger asChild>
<Button variant="outline" className="bg-background">
- <Plus className="mr-2 size-4" />
+ <Plus className="size-4" />
{t("tags.create_tag")}
</Button>
</DialogTrigger>
diff --git a/apps/web/components/dashboard/tags/TagAutocomplete.tsx b/apps/web/components/dashboard/tags/TagAutocomplete.tsx
index 80cc265d..b12913ab 100644
--- a/apps/web/components/dashboard/tags/TagAutocomplete.tsx
+++ b/apps/web/components/dashboard/tags/TagAutocomplete.tsx
@@ -84,7 +84,7 @@ export function TagAutocomplete({
<div className="flex w-full items-center justify-between">
<span>{selectedTag.name}</span>
<X
- className="h-4 w-4 shrink-0 cursor-pointer opacity-50 hover:opacity-100"
+ className="!pointer-events-auto h-4 w-4 shrink-0 cursor-pointer opacity-50 hover:opacity-100"
onClick={(e) => {
e.stopPropagation();
clearSelection();
@@ -94,7 +94,7 @@ export function TagAutocomplete({
) : (
"Select a tag..."
)}
- <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+ <ChevronsUpDown className="h-4 w-4 shrink-0 opacity-50" />
</Button>
</PopoverTrigger>
<PopoverContent className="w-[--radix-popover-trigger-width] p-0">
diff --git a/apps/web/components/dashboard/tags/TagHeader.tsx b/apps/web/components/dashboard/tags/TagHeader.tsx
index e56d3049..281a416e 100644
--- a/apps/web/components/dashboard/tags/TagHeader.tsx
+++ b/apps/web/components/dashboard/tags/TagHeader.tsx
@@ -65,7 +65,7 @@ export default function TagHeader({
<div className="flex shrink-0 items-center">
<TagOptions tag={tag}>
<Button variant="ghost">
- <MoreHorizontal />
+ <MoreHorizontal className="size-6" />
</Button>
</TagOptions>
</div>
diff --git a/apps/web/components/invite/InviteAcceptForm.tsx b/apps/web/components/invite/InviteAcceptForm.tsx
index 613f55c3..d51aeb4b 100644
--- a/apps/web/components/invite/InviteAcceptForm.tsx
+++ b/apps/web/components/invite/InviteAcceptForm.tsx
@@ -293,7 +293,7 @@ export default function InviteAcceptForm({ token }: InviteAcceptFormProps) {
>
{form.formState.isSubmitting || acceptInviteMutation.isPending ? (
<>
- <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+ <Loader2 className="h-4 w-4 animate-spin" />
Creating Account...
</>
) : (
diff --git a/apps/web/components/settings/AISettings.tsx b/apps/web/components/settings/AISettings.tsx
index fa1348ba..feab0731 100644
--- a/apps/web/components/settings/AISettings.tsx
+++ b/apps/web/components/settings/AISettings.tsx
@@ -206,7 +206,7 @@ export function AIPreferences() {
<div className="flex justify-end pt-4">
<ActionButton type="submit" loading={isPending} variant="default">
- <Save className="mr-2 size-4" />
+ <Save className="size-4" />
{t("actions.save")}
</ActionButton>
</div>
@@ -549,7 +549,7 @@ export function PromptEditor() {
variant="default"
className="items-center"
>
- <Plus className="mr-2 size-4" />
+ <Plus className="size-4" />
{t("actions.add")}
</ActionButton>
</form>
@@ -675,7 +675,7 @@ export function PromptRow({ prompt }: { prompt: ZPrompt }) {
type="submit"
className="items-center"
>
- <Save className="mr-2 size-4" />
+ <Save className="size-4" />
{t("actions.save")}
</ActionButton>
<ActionButton
@@ -685,7 +685,7 @@ export function PromptRow({ prompt }: { prompt: ZPrompt }) {
className="items-center"
type="button"
>
- <Trash2 className="mr-2 size-4" />
+ <Trash2 className="size-4" />
{t("actions.delete")}
</ActionButton>
</form>
diff --git a/apps/web/components/settings/AddApiKey.tsx b/apps/web/components/settings/AddApiKey.tsx
index c1d11655..6ee39d21 100644
--- a/apps/web/components/settings/AddApiKey.tsx
+++ b/apps/web/components/settings/AddApiKey.tsx
@@ -74,7 +74,7 @@ function ScopeDescriptionPopover({
className="h-6 w-6 text-muted-foreground hover:text-foreground"
aria-label={ariaLabel}
>
- <HelpCircle className="h-3.5 w-3.5" />
+ <HelpCircle className="size-3.5" />
</Button>
</PopoverTrigger>
<PopoverContent align="start" className="w-72">
@@ -394,7 +394,7 @@ export default function AddApiKey({ isAdmin }: { isAdmin: boolean }) {
<Dialog open={dialogOpen} onOpenChange={handleOpenChange}>
<DialogTrigger asChild>
<Button>
- <PlusCircle className="mr-2 h-4 w-4" />
+ <PlusCircle className="h-4 w-4" />
{t("settings.api_keys.new_api_key")}
</Button>
</DialogTrigger>
diff --git a/apps/web/components/settings/BackupSettings.tsx b/apps/web/components/settings/BackupSettings.tsx
index a6bddbed..3a1d5859 100644
--- a/apps/web/components/settings/BackupSettings.tsx
+++ b/apps/web/components/settings/BackupSettings.tsx
@@ -197,7 +197,7 @@ function BackupConfigurationForm() {
loading={isUpdating}
className="items-center"
>
- <Save className="mr-2 size-4" />
+ <Save className="size-4" />
{t("settings.backups.configuration.save_settings")}
</ActionButton>
</form>
@@ -319,7 +319,7 @@ function BackupRow({ backup }: { backup: z.infer<typeof zBackupSchema> }) {
className="items-center"
type="button"
>
- <Trash2 className="mr-2 size-4" />
+ <Trash2 className="size-4" />
{t("settings.backups.list.actions.delete_backup")}
</ActionButton>
)}
@@ -376,7 +376,7 @@ function BackupsList() {
variant="default"
className="items-center"
>
- <Play className="mr-2 size-4" />
+ <Play className="size-4" />
{t("settings.backups.list.create_backup_now")}
</ActionButton>
}
diff --git a/apps/web/components/settings/ChangePassword.tsx b/apps/web/components/settings/ChangePassword.tsx
index 2ea710c1..484b21d2 100644
--- a/apps/web/components/settings/ChangePassword.tsx
+++ b/apps/web/components/settings/ChangePassword.tsx
@@ -107,7 +107,7 @@ export function ChangePassword() {
type="button"
variant="ghost"
size="sm"
- className="absolute right-0 top-0 h-full px-3 py-2 hover:bg-transparent"
+ className="absolute right-0 top-0 h-full px-3 py-2 hover:bg-transparent has-[>svg]:px-3 dark:hover:bg-transparent"
aria-label={
showCurrentPassword ? "Hide password" : "Show password"
}
@@ -153,7 +153,7 @@ export function ChangePassword() {
type="button"
variant="ghost"
size="sm"
- className="absolute right-0 top-0 h-full px-3 py-2 hover:bg-transparent"
+ className="absolute right-0 top-0 h-full px-3 py-2 hover:bg-transparent has-[>svg]:px-3 dark:hover:bg-transparent"
aria-label={
showNewPassword ? "Hide password" : "Show password"
}
@@ -198,7 +198,7 @@ export function ChangePassword() {
type="button"
variant="ghost"
size="sm"
- className="absolute right-0 top-0 h-full px-3 py-2 hover:bg-transparent"
+ className="absolute right-0 top-0 h-full px-3 py-2 hover:bg-transparent has-[>svg]:px-3 dark:hover:bg-transparent"
aria-label={
showConfirmPassword ? "Hide password" : "Show password"
}
diff --git a/apps/web/components/settings/DeleteAccount.tsx b/apps/web/components/settings/DeleteAccount.tsx
index 90f52b57..c19b23f7 100644
--- a/apps/web/components/settings/DeleteAccount.tsx
+++ b/apps/web/components/settings/DeleteAccount.tsx
@@ -160,7 +160,7 @@ export function DeleteAccount() {
type="button"
variant="ghost"
size="sm"
- className="absolute right-0 top-0 h-full px-3 py-2 hover:bg-transparent"
+ className="absolute right-0 top-0 h-full px-3 py-2 hover:bg-transparent has-[>svg]:px-3 dark:hover:bg-transparent"
onClick={() => setShowPassword(!showPassword)}
>
{showPassword ? (
@@ -185,13 +185,13 @@ export function DeleteAccount() {
loading={deleteAccountMutation.isPending}
onClick={form.handleSubmit(onSubmit)}
>
- <Trash2 className="mr-2 h-4 w-4" />
+ <Trash2 className="h-4 w-4" />
Delete Account
</ActionButton>
)}
>
<Button variant="destructiveOutline">
- <Trash2 className="mr-2 h-4 w-4" />
+ <Trash2 className="h-4 w-4" />
Delete Account
</Button>
</ActionConfirmingDialog>
diff --git a/apps/web/components/settings/DeleteApiKey.tsx b/apps/web/components/settings/DeleteApiKey.tsx
index b4cf7eea..05025c3e 100644
--- a/apps/web/components/settings/DeleteApiKey.tsx
+++ b/apps/web/components/settings/DeleteApiKey.tsx
@@ -53,7 +53,7 @@ export default function DeleteApiKey({
)}
>
<Button variant="ghost" title={t("actions.delete")}>
- <Trash size={18} />
+ <Trash className="size-[18px]" size={18} />
</Button>
</ActionConfirmingDialog>
);
diff --git a/apps/web/components/settings/FeedSettings.tsx b/apps/web/components/settings/FeedSettings.tsx
index 07870e78..2c822d8d 100644
--- a/apps/web/components/settings/FeedSettings.tsx
+++ b/apps/web/components/settings/FeedSettings.tsx
@@ -101,7 +101,7 @@ export function FeedsEditorDialog() {
<Dialog open={open} onOpenChange={setOpen}>
<DialogTrigger asChild>
<Button>
- <CirclePlus className="mr-2 size-4" />
+ <CirclePlus className="size-4" />
{t("settings.feeds.add_a_subscription")}
</Button>
</DialogTrigger>
@@ -186,7 +186,7 @@ export function FeedsEditorDialog() {
variant="default"
className="items-center"
>
- <Plus className="mr-2 size-4" />
+ <Plus className="size-4" />
Add
</ActionButton>
</DialogFooter>
@@ -336,7 +336,7 @@ export function EditFeedDialog({ feed }: { feed: ZFeed }) {
type="submit"
className="items-center"
>
- <Save className="mr-2 size-4" />
+ <Save className="size-4" />
{t("actions.save")}
</ActionButton>
</DialogFooter>
@@ -455,7 +455,7 @@ export function FeedRow({ feed }: { feed: ZFeed }) {
className="items-center"
type="button"
>
- <Trash2 className="mr-2 size-4" />
+ <Trash2 className="size-4" />
{t("actions.delete")}
</ActionButton>
)}
diff --git a/apps/web/components/settings/ImportExport.tsx b/apps/web/components/settings/ImportExport.tsx
index 7937688e..13a90b45 100644
--- a/apps/web/components/settings/ImportExport.tsx
+++ b/apps/web/components/settings/ImportExport.tsx
@@ -123,7 +123,7 @@ function ExportButton() {
onClick={onExport}
disabled={isFetching}
>
- {isFetching && <Loader2 className="mr-2 animate-spin" />}
+ {isFetching && <Loader2 className="size-6 animate-spin" />}
<p>Export</p>
</Button>
</CardContent>
diff --git a/apps/web/components/settings/ImportSessionCard.tsx b/apps/web/components/settings/ImportSessionCard.tsx
index eaac8f53..eb4c0075 100644
--- a/apps/web/components/settings/ImportSessionCard.tsx
+++ b/apps/web/components/settings/ImportSessionCard.tsx
@@ -255,7 +255,7 @@ export function ImportSessionCard({ session }: ImportSessionCardProps) {
{stats.status !== "archived" && (
<Button variant="outline" size="sm" asChild>
<Link href={`/settings/import/${session.id}`}>
- <ExternalLink className="mr-1 h-4 w-4" />
+ <ExternalLink className="h-4 w-4" />
{t("settings.import_sessions.view_details")}
</Link>
</Button>
@@ -269,7 +269,7 @@ export function ImportSessionCard({ session }: ImportSessionCardProps) {
}
disabled={pauseSession.isPending}
>
- <Pause className="mr-1 h-4 w-4" />
+ <Pause className="h-4 w-4" />
{t("settings.import_sessions.pause_session")}
</Button>
)}
@@ -301,7 +301,7 @@ export function ImportSessionCard({ session }: ImportSessionCardProps) {
)}
>
<Button size="sm" disabled={finalizeSession.isPending}>
- <Play className="mr-1 h-4 w-4" />
+ <Play className="h-4 w-4" />
{t("settings.import_sessions.finalize_staging")}
</Button>
</ActionConfirmingDialog>
@@ -315,7 +315,7 @@ export function ImportSessionCard({ session }: ImportSessionCardProps) {
}
disabled={resumeSession.isPending}
>
- <Play className="mr-1 h-4 w-4" />
+ <Play className="h-4 w-4" />
{t("settings.import_sessions.resume_session")}
</Button>
)}
@@ -349,7 +349,7 @@ export function ImportSessionCard({ session }: ImportSessionCardProps) {
size="sm"
disabled={deleteSession.isPending}
>
- <Trash2 className="mr-1 h-4 w-4" />
+ <Trash2 className="h-4 w-4" />
{t("actions.delete")}
</Button>
</ActionConfirmingDialog>
diff --git a/apps/web/components/settings/ImportSessionDetail.tsx b/apps/web/components/settings/ImportSessionDetail.tsx
index 49199006..074e304d 100644
--- a/apps/web/components/settings/ImportSessionDetail.tsx
+++ b/apps/web/components/settings/ImportSessionDetail.tsx
@@ -439,7 +439,7 @@ export default function ImportSessionDetail({
}
disabled={pauseSession.isPending}
>
- <Pause className="mr-1 h-4 w-4" />
+ <Pause className="h-4 w-4" />
{t("settings.import_sessions.pause_session")}
</Button>
)}
@@ -471,7 +471,7 @@ export default function ImportSessionDetail({
)}
>
<Button size="sm" disabled={finalizeSession.isPending}>
- <Play className="mr-1 h-4 w-4" />
+ <Play className="h-4 w-4" />
{t("settings.import_sessions.finalize_staging")}
</Button>
</ActionConfirmingDialog>
@@ -485,7 +485,7 @@ export default function ImportSessionDetail({
}
disabled={resumeSession.isPending}
>
- <Play className="mr-1 h-4 w-4" />
+ <Play className="h-4 w-4" />
{t("settings.import_sessions.resume_session")}
</Button>
)}
@@ -517,7 +517,7 @@ export default function ImportSessionDetail({
size="sm"
disabled={deleteSession.isPending}
>
- <Trash2 className="mr-1 h-4 w-4" />
+ <Trash2 className="h-4 w-4" />
{t("actions.delete")}
</Button>
</ActionConfirmingDialog>
diff --git a/apps/web/components/settings/ReaderSettings.tsx b/apps/web/components/settings/ReaderSettings.tsx
index e36da2a4..e39b0dfa 100644
--- a/apps/web/components/settings/ReaderSettings.tsx
+++ b/apps/web/components/settings/ReaderSettings.tsx
@@ -158,7 +158,7 @@ export default function ReaderSettings() {
onClick={handleClearLocalOverrides}
className="w-fit"
>
- <Laptop className="mr-2 h-4 w-4" />
+ <Laptop className="h-4 w-4" />
{t("settings.info.reader_settings.clear_local_overrides")}
</Button>
</AlertDescription>
@@ -272,7 +272,7 @@ export default function ReaderSettings() {
className="w-full"
disabled={!!clientConfig.demoMode}
>
- <RotateCcw className="mr-2 h-4 w-4" />
+ <RotateCcw className="h-4 w-4" />
{t("settings.info.reader_settings.clear_defaults")}
</Button>
)}
diff --git a/apps/web/components/settings/SubscriptionSettings.tsx b/apps/web/components/settings/SubscriptionSettings.tsx
index 3ab66593..fdfc8ab7 100644
--- a/apps/web/components/settings/SubscriptionSettings.tsx
+++ b/apps/web/components/settings/SubscriptionSettings.tsx
@@ -273,7 +273,7 @@ export default function SubscriptionSettings() {
className="shadow-md transition-all hover:scale-[1.02] hover:shadow-lg active:scale-[0.98]"
>
{isLoading && (
- <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+ <Loader2 className="h-4 w-4 animate-spin" />
)}
{t("settings.subscription.subscribe_now")}
</Button>
@@ -288,9 +288,7 @@ export default function SubscriptionSettings() {
disabled={isLoading}
variant="outline"
>
- {isLoading && (
- <Loader2 className="mr-2 h-4 w-4 animate-spin" />
- )}
+ {isLoading && <Loader2 className="h-4 w-4 animate-spin" />}
{t("settings.subscription.manage_billing")}
</Button>
</div>
diff --git a/apps/web/components/settings/UserAvatar.tsx b/apps/web/components/settings/UserAvatar.tsx
index f83f8ece..efa48656 100644
--- a/apps/web/components/settings/UserAvatar.tsx
+++ b/apps/web/components/settings/UserAvatar.tsx
@@ -96,7 +96,7 @@ export default function UserAvatar() {
loading={upload.isPending}
disabled={isBusy}
>
- <Upload className="mr-2 h-4 w-4" />
+ <Upload className="h-4 w-4" />
{image
? t("settings.info.avatar.change")
: t("settings.info.avatar.upload")}
@@ -131,7 +131,7 @@ export default function UserAvatar() {
)}
>
<Button type="button" variant="outline" disabled={!image || isBusy}>
- <X className="mr-2 h-4 w-4" />
+ <X className="h-4 w-4" />
{t("settings.info.avatar.remove")}
</Button>
</ActionConfirmingDialog>
diff --git a/apps/web/components/settings/WebhookEventSelector.tsx b/apps/web/components/settings/WebhookEventSelector.tsx
index 6321b8a0..3884e8fb 100644
--- a/apps/web/components/settings/WebhookEventSelector.tsx
+++ b/apps/web/components/settings/WebhookEventSelector.tsx
@@ -35,7 +35,7 @@ export function WebhookEventSelector({
className="w-full justify-between"
>
{value.length > 0 ? value.join(", ") : "Select events"}
- <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+ <ChevronsUpDown className="h-4 w-4 shrink-0 opacity-50" />
</Button>
</PopoverTrigger>
<PopoverContent>
diff --git a/apps/web/components/settings/WebhookSettings.tsx b/apps/web/components/settings/WebhookSettings.tsx
index dedf5104..b00d5f3a 100644
--- a/apps/web/components/settings/WebhookSettings.tsx
+++ b/apps/web/components/settings/WebhookSettings.tsx
@@ -94,7 +94,7 @@ export function WebhooksEditorDialog() {
<Dialog open={open} onOpenChange={setOpen}>
<DialogTrigger asChild>
<Button>
- <PlusCircle className="mr-2 size-4" />
+ <PlusCircle className="size-4" />
{t("settings.webhooks.create_webhook")}
</Button>
</DialogTrigger>
@@ -173,7 +173,7 @@ export function WebhooksEditorDialog() {
variant="default"
className="items-center"
>
- <Plus className="mr-2 size-4" />
+ <Plus className="size-4" />
Add
</ActionButton>
</DialogFooter>
@@ -223,7 +223,7 @@ export function EditWebhookDialog({ webhook }: { webhook: ZWebhook }) {
<Dialog open={open} onOpenChange={setOpen}>
<DialogTrigger asChild>
<Button variant="secondary">
- <Edit className="mr-2 size-4" />
+ <Edit className="size-4" />
{t("actions.edit")}
</Button>
</DialogTrigger>
@@ -298,7 +298,7 @@ export function EditWebhookDialog({ webhook }: { webhook: ZWebhook }) {
type="submit"
className="items-center"
>
- <Save className="mr-2 size-4" />
+ <Save className="size-4" />
{t("actions.save")}
</ActionButton>
</DialogFooter>
@@ -354,7 +354,7 @@ export function EditTokenDialog({ webhook }: { webhook: ZWebhook }) {
<Dialog open={open} onOpenChange={setOpen}>
<DialogTrigger asChild>
<Button variant="secondary">
- <KeyRound className="mr-2 size-4" />
+ <KeyRound className="size-4" />
{webhook.hasToken
? t("settings.webhooks.edit_auth_token")
: t("settings.webhooks.add_auth_token")}
@@ -419,7 +419,7 @@ export function EditTokenDialog({ webhook }: { webhook: ZWebhook }) {
})}
className="items-center"
>
- <Trash2 className="mr-2 size-4" />
+ <Trash2 className="size-4" />
{t("actions.delete")}
</ActionButton>
<ActionButton
@@ -430,7 +430,7 @@ export function EditTokenDialog({ webhook }: { webhook: ZWebhook }) {
type="submit"
className="items-center"
>
- <Save className="mr-2 size-4" />
+ <Save className="size-4" />
{t("actions.save")}
</ActionButton>
</DialogFooter>
@@ -473,13 +473,13 @@ export function WebhookRow({ webhook }: { webhook: ZWebhook }) {
className="items-center"
type="button"
>
- <Trash2 className="mr-2 size-4" />
+ <Trash2 className="size-4" />
{t("actions.delete")}
</ActionButton>
)}
>
<Button variant="destructive" disabled={isDeleting}>
- <Trash2 className="mr-2 size-4" />
+ <Trash2 className="size-4" />
{t("actions.delete")}
</Button>
</ActionConfirmingDialog>
diff --git a/apps/web/components/ui/action-button.tsx b/apps/web/components/ui/action-button.tsx
index b7cd9b3d..83ad65eb 100644
--- a/apps/web/components/ui/action-button.tsx
+++ b/apps/web/components/ui/action-button.tsx
@@ -23,7 +23,7 @@ const ActionButton = React.forwardRef<HTMLButtonElement, ActionButtonProps>(
ref,
) => {
const clientConfig = useClientConfig();
- spinner ||= <LoadingSpinner />;
+ spinner ||= <LoadingSpinner className="size-6" />;
if (!ignoreDemoMode && clientConfig.demoMode) {
disabled = true;
} else if (disabled !== undefined) {
diff --git a/apps/web/components/wrapped/ShareButton.tsx b/apps/web/components/wrapped/ShareButton.tsx
index 048cafea..242e93bc 100644
--- a/apps/web/components/wrapped/ShareButton.tsx
+++ b/apps/web/components/wrapped/ShareButton.tsx
@@ -76,7 +76,7 @@ export function ShareButton({
disabled={isGenerating}
size="icon"
variant="ghost"
- className="h-10 w-10 rounded-full bg-white/10 text-slate-100 hover:bg-white/20"
+ className="h-10 w-10 rounded-full bg-white/10 text-slate-100 hover:bg-white/20 dark:hover:bg-white/20"
aria-label={isNativeShareAvailable ? "Share" : "Download"}
title={isNativeShareAvailable ? "Share" : "Download"}
>
diff --git a/packages/shared-react/components/ui/button.tsx b/packages/shared-react/components/ui/button.tsx
index a6c0ef59..a431d94f 100644
--- a/packages/shared-react/components/ui/button.tsx
+++ b/packages/shared-react/components/ui/button.tsx
@@ -5,7 +5,7 @@ import { Slot } from "@radix-ui/react-slot";
import { cva } from "class-variance-authority";
const buttonVariants = cva(
- "inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:pointer-events-none disabled:opacity-50 aria-[invalid=true]:border-destructive aria-[invalid=true]:ring-destructive/20 dark:aria-[invalid=true]:ring-destructive/40",
+ "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all focus-visible:outline-none focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:pointer-events-none disabled:opacity-50 aria-[invalid=true]:border-destructive aria-[invalid=true]:ring-destructive/20 dark:aria-[invalid=true]:ring-destructive/40 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
{
variants: {
variant: {
@@ -16,11 +16,11 @@ const buttonVariants = cva(
destructiveOutline:
"border border-destructive bg-transparent text-destructive hover:bg-destructive/90 hover:text-destructive-foreground dark:hover:bg-destructive/60",
outline:
- "border border-input bg-background hover:bg-accent hover:text-accent-foreground",
+ "border border-input bg-background shadow-sm hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:hover:bg-input/50",
secondary:
"bg-secondary text-secondary-foreground hover:bg-secondary/80",
ghost:
- "hover:bg-accent hover:text-accent-foreground focus-visible:ring-0",
+ "hover:bg-accent hover:text-accent-foreground focus-visible:ring-0 dark:hover:bg-accent/50",
ghostDestructive:
"text-destructive hover:bg-destructive/10 hover:text-destructive focus-visible:ring-0 dark:hover:bg-destructive/20",
border: "border border-input hover:bg-accent",
@@ -28,9 +28,9 @@ const buttonVariants = cva(
},
size: {
none: "",
- default: "h-10 px-4 py-2",
- sm: "h-9 rounded-md px-3",
- lg: "h-11 rounded-md px-8",
+ default: "h-10 px-4 py-2 has-[>svg]:px-3",
+ sm: "h-9 gap-1.5 rounded-md px-3 has-[>svg]:px-2.5",
+ lg: "h-11 rounded-md px-8 has-[>svg]:px-6",
icon: "size-10",
"icon-sm": "size-8",
"icon-xs": "size-6",