Skip to content

Connect, collaborate, and grow with a community of TypeScript developers

feat: add dark style to `secondary` variants (#795)

Eric Lee9c55a951a43f
diff --git a/apps/web/src/app/[locale]/challenge/_components/comments/comment.tsx b/apps/web/src/app/[locale]/challenge/_components/comments/comment.tsx
index e06bc957..360aa43a 100644
--- a/apps/web/src/app/[locale]/challenge/_components/comments/comment.tsx
+++ b/apps/web/src/app/[locale]/challenge/_components/comments/comment.tsx
@@ -474,28 +474,28 @@ function SingleComment({
) : null}
{isAuthor ? (
<Tooltip>
- <TooltipTrigger asChild>
- <CommentDeleteDialog asChild comment={comment}>
+ <CommentDeleteDialog asChild comment={comment}>
+ <TooltipTrigger asChild>
<Button variant="secondary" size="xs">
<Trash2 className="h-3 w-3" />
<span className="sr-only">Delete this comment</span>
</Button>
- </CommentDeleteDialog>
- </TooltipTrigger>
+ </TooltipTrigger>
+ </CommentDeleteDialog>
<TooltipContent>
<p>Delete</p>
</TooltipContent>
</Tooltip>
) : (
<Tooltip>
- <TooltipTrigger asChild>
- <ReportDialog triggerAsChild commentId={comment.id} reportType="COMMENT">
+ <ReportDialog triggerAsChild commentId={comment.id} reportType="COMMENT">
+ <TooltipTrigger asChild>
<Button variant="secondary" size="xs">
<Flag className="h-3 w-3" />
<span className="sr-only">Report this comment</span>
</Button>
- </ReportDialog>
- </TooltipTrigger>
+ </TooltipTrigger>
+ </ReportDialog>
<TooltipContent>
<p>Report</p>
</TooltipContent>
diff --git a/packages/ui/src/components/badge.tsx b/packages/ui/src/components/badge.tsx
index 763256af..8a8e83d5 100644
--- a/packages/ui/src/components/badge.tsx
+++ b/packages/ui/src/components/badge.tsx
@@ -10,7 +10,7 @@ const badgeVariants = cva(
variants: {
variant: {
default: 'bg-primary border-transparent text-primary-foreground',
- secondary: 'bg-secondary border-transparent text-secondary-foreground',
+ secondary: 'bg-secondary border-transparent text-secondary-foreground dark:bg-zinc-700',
destructive: 'bg-destructive border-transparent text-destructive-foreground',
outline: 'text-foreground',
},
diff --git a/packages/ui/src/components/button.tsx b/packages/ui/src/components/button.tsx
index f163f2ba..59aa72e9 100644
--- a/packages/ui/src/components/button.tsx
+++ b/packages/ui/src/components/button.tsx
@@ -12,8 +12,9 @@ const buttonVariants = cva(
default: 'bg-primary text-primary-foreground hover:bg-primary/90',
destructive: 'bg-destructive text-destructive-foreground hover:bg-destructive/90',
outline: 'border border-input hover:bg-accent hover:text-accent-foreground',
- secondary: 'bg-secondary text-secondary-foreground hover:bg-secondary/80',
- ghost: 'hover:bg-accent hover:text-accent-foreground',
+ secondary:
+ 'bg-secondary text-secondary-foreground hover:bg-secondary/80 dark:bg-zinc-700 dark:hover:bg-zinc-900',
+ ghost: 'hover:bg-accent hover:text-accent-foreground dark:hover:bg-zinc-900',
link: 'underline-offset-4 hover:underline text-primary',
},
size: {