Skip to content

Commit 3ceeb2d

Browse files
committed
elusive fixes
1 parent 54b040f commit 3ceeb2d

File tree

6 files changed

+15
-22
lines changed

6 files changed

+15
-22
lines changed

apps/dashboard/app/(main)/billing/components/plan-status-badge.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,5 @@ export function PlanStatusBadge({
1919
if (isScheduled) {
2020
return <Badge variant="secondary">Scheduled</Badge>;
2121
}
22-
return (
23-
<Badge className="bg-primary/10 text-primary" variant="secondary">
24-
Active
25-
</Badge>
26-
);
22+
return <Badge variant="green">Active</Badge>;
2723
}

apps/dashboard/app/(main)/billing/page.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,7 @@ export default function BillingPage() {
133133
<h3 className="font-semibold">Current Plan</h3>
134134
<Badge
135135
variant={
136-
currentProduct?.status === "scheduled"
137-
? "outline"
138-
: "secondary"
136+
currentProduct?.status === "scheduled" ? "outline" : "green"
139137
}
140138
>
141139
{currentProduct?.status === "scheduled"

apps/dashboard/app/(main)/organizations/components/organizations-list.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ function OrganizationRow({
9494
</div>
9595

9696
{isActive && (
97-
<Badge variant="secondary">
97+
<Badge variant="green">
9898
<CheckCircleIcon className="mr-1" size={12} weight="fill" />
9999
Active
100100
</Badge>

apps/dashboard/app/(main)/organizations/invitations/invitations-view.tsx

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -181,40 +181,40 @@ export function InvitationsView({
181181
value={selectedTab}
182182
>
183183
{/* Tabs */}
184-
<div className="border-b px-5">
185-
<TabsList className="h-10 w-full justify-start gap-2 bg-transparent p-0">
184+
<div className="border-b">
185+
<TabsList className="flex h-10 w-full bg-transparent p-0">
186186
<TabsTrigger
187-
className="h-10 rounded-none border-transparent border-b-2 bg-transparent px-3 data-[state=active]:border-primary data-[state=active]:shadow-none"
187+
className="flex flex-1 cursor-pointer items-center justify-center gap-1.5 rounded-none border-transparent border-b-2 bg-transparent data-[state=active]:border-primary data-[state=active]:text-foreground data-[state=inactive]:text-muted-foreground data-[state=active]:shadow-none"
188188
value="pending"
189189
>
190-
<ClockIcon className="mr-1.5" size={14} weight="duotone" />
190+
<ClockIcon className="size-3.5" weight="duotone" />
191191
Pending
192192
{pendingCount > 0 && (
193-
<span className="ml-1.5 rounded-full bg-amber-500/10 px-1.5 py-0.5 text-amber-600 text-xs">
193+
<span className="rounded-full bg-amber-500/10 px-1.5 py-0.5 text-amber-600 text-xs dark:text-amber-500">
194194
{pendingCount}
195195
</span>
196196
)}
197197
</TabsTrigger>
198198
<TabsTrigger
199-
className="h-10 rounded-none border-transparent border-b-2 bg-transparent px-3 data-[state=active]:border-primary data-[state=active]:shadow-none"
199+
className="flex flex-1 cursor-pointer items-center justify-center gap-1.5 rounded-none border-transparent border-b-2 bg-transparent data-[state=active]:border-primary data-[state=active]:text-foreground data-[state=inactive]:text-muted-foreground data-[state=active]:shadow-none"
200200
value="expired"
201201
>
202-
<XIcon className="mr-1.5" size={14} weight="bold" />
202+
<XIcon className="size-3.5" weight="bold" />
203203
Expired
204204
{expiredCount > 0 && (
205-
<span className="ml-1.5 rounded-full bg-muted px-1.5 py-0.5 text-muted-foreground text-xs">
205+
<span className="rounded-full bg-muted px-1.5 py-0.5 text-muted-foreground text-xs">
206206
{expiredCount}
207207
</span>
208208
)}
209209
</TabsTrigger>
210210
<TabsTrigger
211-
className="h-10 rounded-none border-transparent border-b-2 bg-transparent px-3 data-[state=active]:border-primary data-[state=active]:shadow-none"
211+
className="flex flex-1 cursor-pointer items-center justify-center gap-1.5 rounded-none border-transparent border-b-2 bg-transparent data-[state=active]:border-primary data-[state=active]:text-foreground data-[state=inactive]:text-muted-foreground data-[state=active]:shadow-none"
212212
value="accepted"
213213
>
214-
<CheckIcon className="mr-1.5" size={14} weight="bold" />
214+
<CheckIcon className="size-3.5" weight="bold" />
215215
Accepted
216216
{acceptedCount > 0 && (
217-
<span className="ml-1.5 rounded-full bg-green-500/10 px-1.5 py-0.5 text-green-600 text-xs">
217+
<span className="rounded-full bg-green-500/10 px-1.5 py-0.5 text-green-600 text-xs dark:text-green-500">
218218
{acceptedCount}
219219
</span>
220220
)}

apps/dashboard/app/(main)/organizations/members/member-list.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ function MemberRow({
145145
onClick={() =>
146146
onConfirmRemove({ id: member.id, name: member.user.name })
147147
}
148-
size="sm"
149148
variant="outline"
150149
>
151150
<TrashIcon size={14} />

apps/dashboard/components/organizations/api-key-detail-dialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ export function ApiKeyDetailDialog({
173173
{apiKey.prefix}_{apiKey.start}
174174
</SheetDescription>
175175
</div>
176-
<Badge variant="secondary">
176+
<Badge variant={isActive ? "green" : "secondary"}>
177177
{isActive ? "Active" : "Inactive"}
178178
</Badge>
179179
</div>

0 commit comments

Comments
 (0)