Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Overview card styling

Marcus Farrellb8d23dd5fe82
diff --git a/apps/web/ui/partners/overview/blocks/commissions-block.tsx b/apps/web/ui/partners/overview/blocks/commissions-block.tsx
index 07fdd3c2db..fb2659451e 100644
--- a/apps/web/ui/partners/overview/blocks/commissions-block.tsx
+++ b/apps/web/ui/partners/overview/blocks/commissions-block.tsx
@@ -2,13 +2,13 @@ import useWorkspace from "@/lib/swr/use-workspace";
import { CommissionResponse } from "@/lib/types";
import { AnalyticsContext } from "@/ui/analytics/analytics-provider";
import { PartnerAvatar } from "@/ui/partners/partner-avatar";
-import { ArrowRight, LoadingSpinner, StatusBadge } from "@dub/ui";
+import { LoadingSpinner, StatusBadge } from "@dub/ui";
import { currencyFormatter, fetcher } from "@dub/utils";
-import Link from "next/link";
import { useContext } from "react";
import useSWR from "swr";
import { CommissionStatusBadges } from "../../commission-status-badges";
import { ProgramOverviewBlock } from "../program-overview-block";
+import { ProgramOverviewRow } from "../program-overview-row";
export function CommissionsBlock() {
const { slug: workspaceSlug } = useWorkspace();
@@ -27,8 +27,10 @@ export function CommissionsBlock() {
<ProgramOverviewBlock
title="Recent commissions"
viewAllHref={`/${workspaceSlug}/program/commissions`}
+ className="pb-3.5"
+ contentClassName="px-3"
>
- <div className="divide-border-subtle @2xl:h-60 flex h-auto flex-col divide-y">
+ <div className="@2xl:h-[257px] flex h-auto flex-col">
{isLoading ? (
<div className="flex size-full items-center justify-center py-4">
<LoadingSpinner />
@@ -46,15 +48,13 @@ export function CommissionsBlock() {
const badge = CommissionStatusBadges[status];
return (
- <Link
+ <ProgramOverviewRow
key={id}
href={`/${workspaceSlug}/program/commissions/${id}`}
- className="text-content-default group flex h-10 items-center justify-between text-xs font-medium"
>
<div className="flex min-w-0 items-center gap-2">
<PartnerAvatar partner={partner} className="size-4" />
<span className="min-w-0 truncate">{partner.name}</span>
- <ArrowRight className="text-content-emphasis size-2.5 -translate-x-0.5 opacity-0 transition-[opacity,transform] group-hover:translate-x-0 group-hover:opacity-100 [&_*]:stroke-2" />
</div>
<div className="flex items-center gap-2">
@@ -70,7 +70,7 @@ export function CommissionsBlock() {
{currencyFormatter(earnings)}
</span>
</div>
- </Link>
+ </ProgramOverviewRow>
);
})
)}
diff --git a/apps/web/ui/partners/overview/blocks/conversion-block.tsx b/apps/web/ui/partners/overview/blocks/conversion-block.tsx
index 86d247afab..7bf5348939 100644
--- a/apps/web/ui/partners/overview/blocks/conversion-block.tsx
+++ b/apps/web/ui/partners/overview/blocks/conversion-block.tsx
@@ -70,7 +70,7 @@ export function ConversionBlock() {
</div>
) : (
<div className="flex size-full flex-col">
- <div className="px-6">
+ <div className="px-5">
<span className="text-content-emphasis block text-xl font-medium">
{formatPercentage(
(steps.at(
@@ -86,7 +86,7 @@ export function ConversionBlock() {
{steps.map((step) => (
<div
key={step.id}
- className="flex flex-col px-6 text-xs font-medium"
+ className="flex flex-col px-5 text-xs font-medium"
>
<div className="text-content-muted">{step.label}</div>
<span className="text-content-emphasis">
diff --git a/apps/web/ui/partners/overview/blocks/countries-block.tsx b/apps/web/ui/partners/overview/blocks/countries-block.tsx
index 568a47536d..1ae302cad3 100644
--- a/apps/web/ui/partners/overview/blocks/countries-block.tsx
+++ b/apps/web/ui/partners/overview/blocks/countries-block.tsx
@@ -3,13 +3,13 @@ import useProgram from "@/lib/swr/use-program";
import useWorkspace from "@/lib/swr/use-workspace";
import { AnalyticsContext } from "@/ui/analytics/analytics-provider";
import { CountryFlag } from "@/ui/shared/country-flag";
-import { ArrowRight, Link4, LoadingSpinner, useRouterStuff } from "@dub/ui";
+import { Link4, LoadingSpinner, useRouterStuff } from "@dub/ui";
import { COUNTRIES, currencyFormatter, fetcher, nFormatter } from "@dub/utils";
-import Link from "next/link";
import { useContext } from "react";
import useSWR from "swr";
import { ExceededEventsLimit } from "../exceeded-events-limit";
import { ProgramOverviewBlock } from "../program-overview-block";
+import { ProgramOverviewRow } from "../program-overview-row";
export function CountriesBlock() {
const { slug: workspaceSlug, exceededEvents } = useWorkspace();
@@ -43,8 +43,10 @@ export function CountriesBlock() {
include: ["interval", "start", "end"],
},
)}`}
+ className="pb-3.5"
+ contentClassName="px-3"
>
- <div className="divide-border-subtle @2xl:h-60 flex h-auto flex-col divide-y">
+ <div className="@2xl:h-[257px] flex h-auto flex-col">
{exceededEvents ? (
<ExceededEventsLimit />
) : isLoading ? (
@@ -61,7 +63,7 @@ export function CountriesBlock() {
</div>
) : (
data?.slice(0, 6).map(({ country, leads, saleAmount }) => (
- <Link
+ <ProgramOverviewRow
key={country}
href={`/${workspaceSlug}/program/analytics${getQueryString(
{ country },
@@ -69,7 +71,6 @@ export function CountriesBlock() {
include: ["interval", "start", "end"],
},
)}`}
- className="text-content-default group flex h-10 items-center justify-between text-xs font-medium"
>
<div className="flex min-w-0 items-center gap-2">
{country === "(direct)" ? (
@@ -80,7 +81,6 @@ export function CountriesBlock() {
<span className="min-w-0 truncate">
{COUNTRIES?.[country] ?? country}
</span>
- <ArrowRight className="text-content-emphasis size-2.5 -translate-x-0.5 opacity-0 transition-[opacity,transform] group-hover:translate-x-0 group-hover:opacity-100 [&_*]:stroke-2" />
</div>
<span>
@@ -88,7 +88,7 @@ export function CountriesBlock() {
? nFormatter(leads, { full: true })
: currencyFormatter(saleAmount)}
</span>
- </Link>
+ </ProgramOverviewRow>
))
)}
</div>
diff --git a/apps/web/ui/partners/overview/blocks/links-block.tsx b/apps/web/ui/partners/overview/blocks/links-block.tsx
index c93316c08e..c04af4b6cd 100644
--- a/apps/web/ui/partners/overview/blocks/links-block.tsx
+++ b/apps/web/ui/partners/overview/blocks/links-block.tsx
@@ -2,7 +2,7 @@ import { editQueryString } from "@/lib/analytics/utils";
import useProgram from "@/lib/swr/use-program";
import useWorkspace from "@/lib/swr/use-workspace";
import { AnalyticsContext } from "@/ui/analytics/analytics-provider";
-import { ArrowRight, LinkLogo, LoadingSpinner, useRouterStuff } from "@dub/ui";
+import { LinkLogo, LoadingSpinner, useRouterStuff } from "@dub/ui";
import {
currencyFormatter,
fetcher,
@@ -10,11 +10,11 @@ import {
getPrettyUrl,
nFormatter,
} from "@dub/utils";
-import Link from "next/link";
import { useContext } from "react";
import useSWR from "swr";
import { ExceededEventsLimit } from "../exceeded-events-limit";
import { ProgramOverviewBlock } from "../program-overview-block";
+import { ProgramOverviewRow } from "../program-overview-row";
export function LinksBlock() {
const { slug: workspaceSlug, exceededEvents } = useWorkspace();
@@ -51,8 +51,10 @@ export function LinksBlock() {
include: ["interval", "start", "end"],
},
)}`}
+ className="pb-3.5"
+ contentClassName="px-3"
>
- <div className="divide-border-subtle @2xl:h-60 flex h-auto flex-col divide-y">
+ <div className="@2xl:h-[257px] flex h-auto flex-col">
{exceededEvents ? (
<ExceededEventsLimit />
) : isLoading ? (
@@ -71,10 +73,9 @@ export function LinksBlock() {
data
?.slice(0, 6)
.map(({ shortLink, url, domain, key, leads, saleAmount }) => (
- <Link
+ <ProgramOverviewRow
key={shortLink}
href={`/${workspaceSlug}/links/${domain}/${key}`}
- className="text-content-default group flex h-10 items-center justify-between text-xs font-medium"
>
<div className="flex min-w-0 items-center gap-2">
<LinkLogo
@@ -84,7 +85,6 @@ export function LinksBlock() {
<span className="min-w-0 truncate">
{getPrettyUrl(shortLink)}
</span>
- <ArrowRight className="text-content-emphasis size-2.5 -translate-x-0.5 opacity-0 transition-[opacity,transform] group-hover:translate-x-0 group-hover:opacity-100 [&_*]:stroke-2" />
</div>
<span>
@@ -92,7 +92,7 @@ export function LinksBlock() {
? nFormatter(leads, { full: true })
: currencyFormatter(saleAmount)}
</span>
- </Link>
+ </ProgramOverviewRow>
))
)}
</div>
diff --git a/apps/web/ui/partners/overview/blocks/partners-block.tsx b/apps/web/ui/partners/overview/blocks/partners-block.tsx
index f8db967812..5f006dc1c1 100644
--- a/apps/web/ui/partners/overview/blocks/partners-block.tsx
+++ b/apps/web/ui/partners/overview/blocks/partners-block.tsx
@@ -5,12 +5,12 @@ import { PartnerProps } from "@/lib/types";
import { AnalyticsContext } from "@/ui/analytics/analytics-provider";
import { ExceededEventsLimit } from "@/ui/partners/overview/exceeded-events-limit";
import { PartnerAvatar } from "@/ui/partners/partner-avatar";
-import { ArrowRight, LoadingSpinner } from "@dub/ui";
+import { LoadingSpinner } from "@dub/ui";
import { currencyFormatter, fetcher, nFormatter } from "@dub/utils";
-import Link from "next/link";
import { useContext } from "react";
import useSWR from "swr";
import { ProgramOverviewBlock } from "../program-overview-block";
+import { ProgramOverviewRow } from "../program-overview-row";
export function PartnersBlock() {
const { slug: workspaceSlug, exceededEvents } = useWorkspace();
@@ -38,8 +38,10 @@ export function PartnersBlock() {
<ProgramOverviewBlock
title={`Top partners by ${program?.primaryRewardEvent === "lead" ? "leads" : "revenue"}`}
viewAllHref={`/${workspaceSlug}/program/partners`}
+ className="pb-3.5"
+ contentClassName="px-3"
>
- <div className="divide-border-subtle @2xl:h-60 flex h-auto flex-col divide-y">
+ <div className="@2xl:h-[257px] flex h-auto flex-col">
{exceededEvents ? (
<ExceededEventsLimit />
) : isLoading ? (
@@ -56,15 +58,13 @@ export function PartnersBlock() {
</div>
) : (
data?.slice(0, 6).map((partner) => (
- <Link
+ <ProgramOverviewRow
key={partner.partnerId}
href={`/${workspaceSlug}/program/partners/${partner.partnerId}`}
- className="text-content-default group flex h-10 items-center justify-between text-xs font-medium"
>
<div className="flex min-w-0 items-center gap-2">
<PartnerAvatar partner={partner.partner} className="size-4" />
<span className="min-w-0 truncate">{partner.partner.name}</span>
- <ArrowRight className="text-content-emphasis size-2.5 -translate-x-0.5 opacity-0 transition-[opacity,transform] group-hover:translate-x-0 group-hover:opacity-100 [&_*]:stroke-2" />
</div>
<span>
@@ -72,7 +72,7 @@ export function PartnersBlock() {
? nFormatter(partner.leads, { full: true })
: currencyFormatter(partner.saleAmount)}
</span>
- </Link>
+ </ProgramOverviewRow>
))
)}
</div>
diff --git a/apps/web/ui/partners/overview/blocks/sale-type-block.tsx b/apps/web/ui/partners/overview/blocks/sale-type-block.tsx
index 884124828d..89b31e9922 100644
--- a/apps/web/ui/partners/overview/blocks/sale-type-block.tsx
+++ b/apps/web/ui/partners/overview/blocks/sale-type-block.tsx
@@ -89,7 +89,7 @@ export function SaleTypeBlock() {
Failed to load data
</div>
) : (
- <div className="flex size-full flex-col gap-6 px-6 pb-6">
+ <div className="flex size-full flex-col gap-6 px-5 pb-5">
<span className="text-content-emphasis block text-xl font-medium">
{nFormatter(totalEvents, {
full: totalEvents < 99999,
diff --git a/apps/web/ui/partners/overview/blocks/traffic-sources-block.tsx b/apps/web/ui/partners/overview/blocks/traffic-sources-block.tsx
index 20b73c89fd..0de99331a4 100644
--- a/apps/web/ui/partners/overview/blocks/traffic-sources-block.tsx
+++ b/apps/web/ui/partners/overview/blocks/traffic-sources-block.tsx
@@ -2,24 +2,18 @@ import { editQueryString } from "@/lib/analytics/utils";
import useProgram from "@/lib/swr/use-program";
import useWorkspace from "@/lib/swr/use-workspace";
import { AnalyticsContext } from "@/ui/analytics/analytics-provider";
-import {
- ArrowRight,
- BlurImage,
- Link4,
- LoadingSpinner,
- useRouterStuff,
-} from "@dub/ui";
+import { BlurImage, Link4, LoadingSpinner, useRouterStuff } from "@dub/ui";
import {
currencyFormatter,
fetcher,
GOOGLE_FAVICON_URL,
nFormatter,
} from "@dub/utils";
-import Link from "next/link";
import { useContext } from "react";
import useSWR from "swr";
import { ExceededEventsLimit } from "../exceeded-events-limit";
import { ProgramOverviewBlock } from "../program-overview-block";
+import { ProgramOverviewRow } from "../program-overview-row";
export function TrafficSourcesBlock() {
const { slug: workspaceSlug, exceededEvents } = useWorkspace();
@@ -53,8 +47,10 @@ export function TrafficSourcesBlock() {
include: ["interval", "start", "end"],
},
)}`}
+ className="pb-3.5"
+ contentClassName="px-3"
>
- <div className="divide-border-subtle @2xl:h-60 flex h-auto flex-col divide-y">
+ <div className="@2xl:h-[257px] flex h-auto flex-col">
{exceededEvents ? (
<ExceededEventsLimit />
) : isLoading ? (
@@ -71,7 +67,7 @@ export function TrafficSourcesBlock() {
</div>
) : (
data?.slice(0, 6).map(({ referer, leads, saleAmount }) => (
- <Link
+ <ProgramOverviewRow
key={referer}
href={`/${workspaceSlug}/program/analytics${getQueryString(
{ referer },
@@ -79,7 +75,6 @@ export function TrafficSourcesBlock() {
include: ["interval", "start", "end"],
},
)}`}
- className="text-content-default group flex h-10 items-center justify-between text-xs font-medium"
>
<div className="flex min-w-0 items-center gap-2">
{referer === "(direct)" ? (
@@ -96,7 +91,6 @@ export function TrafficSourcesBlock() {
<span className="min-w-0 truncate">
{referer === "(direct)" ? "Direct" : referer}
</span>
- <ArrowRight className="text-content-emphasis size-2.5 -translate-x-0.5 opacity-0 transition-[opacity,transform] group-hover:translate-x-0 group-hover:opacity-100 [&_*]:stroke-2" />
</div>
<span>
@@ -104,7 +98,7 @@ export function TrafficSourcesBlock() {
? nFormatter(leads, { full: true })
: currencyFormatter(saleAmount)}
</span>
- </Link>
+ </ProgramOverviewRow>
))
)}
</div>
diff --git a/apps/web/ui/partners/overview/program-overview-block.tsx b/apps/web/ui/partners/overview/program-overview-block.tsx
index 76140f231e..668f60d7a2 100644
--- a/apps/web/ui/partners/overview/program-overview-block.tsx
+++ b/apps/web/ui/partners/overview/program-overview-block.tsx
@@ -16,8 +16,8 @@ export function ProgramOverviewBlock({
contentClassName?: string;
}>) {
return (
- <ProgramOverviewCard className={cn("flex h-full flex-col py-6", className)}>
- <div className="flex justify-between gap-3 px-6">
+ <ProgramOverviewCard className={cn("flex h-full flex-col py-5", className)}>
+ <div className="flex justify-between gap-3 px-5">
<h2 className="text-content-emphasis text-sm font-medium">{title}</h2>
{viewAllHref && (
<ButtonLink
@@ -29,7 +29,7 @@ export function ProgramOverviewBlock({
</ButtonLink>
)}
</div>
- <div className={cn("mt-4 grow px-6", contentClassName)}>{children}</div>
+ <div className={cn("mt-4 grow px-5", contentClassName)}>{children}</div>
</ProgramOverviewCard>
);
}
diff --git a/apps/web/ui/partners/overview/program-overview-card.tsx b/apps/web/ui/partners/overview/program-overview-card.tsx
index 166e4306c1..cdf644242a 100644
--- a/apps/web/ui/partners/overview/program-overview-card.tsx
+++ b/apps/web/ui/partners/overview/program-overview-card.tsx
@@ -8,7 +8,7 @@ export function ProgramOverviewCard({
return (
<div
className={cn(
- "border-border-subtle rounded-[0.625rem] border bg-white",
+ "border-border-subtle rounded-xl border bg-white",
className,
)}
>
diff --git a/apps/web/ui/partners/overview/program-overview-row.tsx b/apps/web/ui/partners/overview/program-overview-row.tsx
new file mode 100644
index 0000000000..4287fb62af
--- /dev/null
+++ b/apps/web/ui/partners/overview/program-overview-row.tsx
@@ -0,0 +1,20 @@
+import { cn } from "@dub/utils";
+import Link from "next/link";
+import { ComponentProps } from "react";
+
+export function ProgramOverviewRow({
+ className,
+ ...rest
+}: ComponentProps<typeof Link>) {
+ return (
+ <Link
+ className={cn(
+ "text-content-default hover:bg-bg-subtle relative flex h-[42px] shrink-0 items-center justify-between gap-3 rounded-lg px-2 text-xs font-medium transition-colors",
+ // Inset divider sits in the 1px gap above the row, so the hover fill never covers it
+ "before:bg-neutral-150 mt-px before:absolute before:inset-x-2 before:-top-px before:h-px first:mt-0 first:before:hidden",
+ className,
+ )}
+ {...rest}
+ />
+ );
+}
diff --git a/packages/tailwind-config/tailwind.config.ts b/packages/tailwind-config/tailwind.config.ts
index 59ea2d6d8b..01c3f6ca38 100644
--- a/packages/tailwind-config/tailwind.config.ts
+++ b/packages/tailwind-config/tailwind.config.ts
@@ -214,6 +214,10 @@ const config: Config = {
},
},
colors: {
+ // Merged into Tailwind's default neutral scale
+ neutral: {
+ 150: "#ededed",
+ },
brown: {
50: "#fdf8f6",
100: "#f2e8e5",