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.

fix a bunch of light/dark mode colors

Steven Tey7a6b5aebb0be
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-submission-details-sheet.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-submission-details-sheet.tsx
index 6da499c3f3..6288a771b9 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-submission-details-sheet.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-submission-details-sheet.tsx
@@ -25,7 +25,6 @@ import {
ChevronLeft,
ChevronRight,
CopyButton,
- DynamicTooltipWrapper,
Sheet,
StatusBadge,
Tooltip,
@@ -277,12 +276,10 @@ function BountySubmissionDetailsSheetContent({
label: "Criteria",
value:
criteriaTexts.length > 1 ? (
- <DynamicTooltipWrapper
- tooltipProps={{
- // remove first item from criteriaTexts
- content: criteriaTexts.slice(1).join("\n"),
- align: "end",
- }}
+ <Tooltip
+ // remove first item from criteriaTexts
+ content={criteriaTexts.slice(1).join("\n")}
+ align="end"
>
<div
className={cn(
@@ -292,7 +289,7 @@ function BountySubmissionDetailsSheetContent({
>
{`${bountyInfo.socialMetrics.minCount} ${bountyInfo.socialMetrics.metric}`}
</div>
- </DynamicTooltipWrapper>
+ </Tooltip>
) : (
`${bountyInfo.socialMetrics.minCount} ${bountyInfo.socialMetrics.metric}`
),
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/invoices/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/invoices/page-client.tsx
index cbc0316026..af440d2218 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/invoices/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/invoices/page-client.tsx
@@ -157,9 +157,11 @@ const InvoiceCard = ({
const badge = PayoutStatusBadges[invoice.status];
return (
<DynamicTooltipWrapper
- {...(invoice.failedReason
- ? { tooltipProps: { content: invoice.failedReason } }
- : null)}
+ tooltipProps={
+ invoice.failedReason
+ ? { content: invoice.failedReason }
+ : undefined
+ }
>
<StatusBadge
icon={invoice.status === "failed" ? AlertCircle : null}
@@ -222,9 +224,11 @@ const InvoiceCard = ({
const badge = PayoutStatusBadges[invoice.status];
return (
<DynamicTooltipWrapper
- {...(invoice.failedReason
- ? { tooltipProps: { content: invoice.failedReason } }
- : null)}
+ tooltipProps={
+ invoice.failedReason
+ ? { content: invoice.failedReason }
+ : undefined
+ }
>
<StatusBadge
icon={invoice.status === "failed" ? AlertCircle : null}
diff --git a/apps/web/ui/partners/bounties/bounty-status-badge.tsx b/apps/web/ui/partners/bounties/bounty-status-badge.tsx
index 46c849dbc2..69044e5966 100644
--- a/apps/web/ui/partners/bounties/bounty-status-badge.tsx
+++ b/apps/web/ui/partners/bounties/bounty-status-badge.tsx
@@ -93,41 +93,25 @@ export function BountyStatusBadge({ bounty }: { bounty: PartnerBountyProps }) {
return (
<div className="absolute left-2 top-2 z-10">
{status === "expired" && endsAtFormatted && (
- <StatusBadge
- variant="error"
- icon={null}
- className="bg-bg-error text-content-error text-xs font-semibold"
- >
+ <StatusBadge variant="error" icon={null}>
Expired {endsAtFormatted}
</StatusBadge>
)}
{status === "expiring_soon" && endsAtFormatted && (
- <StatusBadge
- variant="warning"
- icon={null}
- className="bg-bg-attention text-content-attention text-xs font-semibold"
- >
+ <StatusBadge variant="warning" icon={null}>
Expiring soon {endsAtFormatted}
</StatusBadge>
)}
{status === "completed" && completedAtFormatted && (
- <StatusBadge
- variant="success"
- icon={null}
- className="bg-bg-success text-content-success text-xs font-semibold"
- >
+ <StatusBadge variant="success" icon={null}>
Completed {completedAtFormatted}
</StatusBadge>
)}
{status === "new" && (
- <StatusBadge
- variant="new"
- icon={null}
- className="bg-bg-info text-content-info text-xs font-semibold"
- >
+ <StatusBadge variant="new" icon={null}>
New
</StatusBadge>
)}
diff --git a/apps/web/ui/partners/commission-status-badges.tsx b/apps/web/ui/partners/commission-status-badges.tsx
index b9fb3a5eaf..59765a6058 100644
--- a/apps/web/ui/partners/commission-status-badges.tsx
+++ b/apps/web/ui/partners/commission-status-badges.tsx
@@ -30,7 +30,7 @@ export const CommissionStatusBadges = {
pending: {
label: "Pending",
variant: "pending",
- className: "text-orange-600 bg-orange-100",
+ className: "text-content-attention bg-bg-attention",
icon: CircleHalfDottedClock,
tooltip: (data: CommissionTooltipDataProps) =>
data.variant === "partner"
@@ -40,7 +40,7 @@ export const CommissionStatusBadges = {
processed: {
label: "Processed",
variant: "new",
- className: "text-blue-600 bg-blue-100",
+ className: "text-content-info bg-bg-info",
icon: CircleHalfDottedClock,
tooltip: (data: CommissionTooltipDataProps) => {
const title = `This commission has been processed and ${data.variant === "partner" && data.program?.minPayoutAmount ? `will be paid out once your payout total reaches the program's minimum payout amount of ${currencyFormatter(data.program?.minPayoutAmount)}` : "is now eligible for payout"}.`;
@@ -56,14 +56,14 @@ export const CommissionStatusBadges = {
paid: {
label: "Paid",
variant: "success",
- className: "text-green-600 bg-green-100",
+ className: "text-content-success bg-bg-success",
icon: CircleCheck,
tooltip: (_: CommissionTooltipDataProps) => null,
},
fraud: {
label: "Fraud",
variant: "error",
- className: "text-red-600 bg-red-100",
+ className: "text-content-error bg-bg-error",
icon: ShieldAlert,
tooltip: (data: CommissionTooltipDataProps) => {
const title = `This commission was flagged as fraudulent.${data.variant === "partner" ? " If you believe this is incorrect, " : ""}`;
@@ -80,7 +80,7 @@ export const CommissionStatusBadges = {
duplicate: {
label: "Duplicate",
variant: "error",
- className: "text-red-600 bg-red-100",
+ className: "text-content-error bg-bg-error",
icon: Duplicate,
tooltip: (data: CommissionTooltipDataProps) => {
const title = `This commission was flagged as duplicate.${data.variant === "partner" ? " If you believe this is incorrect, " : ""}`;
@@ -97,7 +97,7 @@ export const CommissionStatusBadges = {
refunded: {
label: "Refunded",
variant: "error",
- className: "text-red-600 bg-red-100",
+ className: "text-content-error bg-bg-error",
icon: CircleXmark,
tooltip: (data: CommissionTooltipDataProps) => {
const title = `This commission was refunded.${data.variant === "partner" ? " If you believe this is incorrect, " : ""}`;
@@ -114,7 +114,7 @@ export const CommissionStatusBadges = {
canceled: {
label: "Canceled",
variant: "neutral",
- className: "text-gray-600 bg-gray-100",
+ className: "text-content-muted bg-bg-muted",
icon: CircleXmark,
tooltip: (data: CommissionTooltipDataProps) => {
const title = `This commission was canceled.${data.variant === "partner" ? " If you believe this is incorrect, " : ""}`;
@@ -132,7 +132,7 @@ export const CommissionStatusBadges = {
hold: {
label: "On Hold",
variant: "error",
- className: "text-red-600 bg-red-100",
+ className: "text-content-error bg-bg-error",
icon: ShieldAlert,
tooltip: (data: CommissionTooltipDataProps) => {
if (data.variant === "partner") {
diff --git a/packages/tailwind-config/tailwind.config.ts b/packages/tailwind-config/tailwind.config.ts
index c9072a8c46..86985e1d8c 100644
--- a/packages/tailwind-config/tailwind.config.ts
+++ b/packages/tailwind-config/tailwind.config.ts
@@ -221,18 +221,19 @@ const config: Config = {
"bg-muted": "rgb(var(--bg-muted, 250 250 250) / <alpha-value>)",
"bg-inverted": "rgb(var(--bg-inverted, 23 23 23) / <alpha-value>)",
- "bg-info": "rgb(var(--bg-info, 191 219 254) / <alpha-value>)",
+ "bg-info": "rgb(var(--bg-info, 219 234 254) / <alpha-value>)",
"bg-success": "rgb(var(--bg-success, 220 252 231) / <alpha-value>)",
"bg-attention": "rgb(var(--bg-attention, 255 237 213) / <alpha-value>)",
+ "bg-warning": "rgb(var(--bg-warning, 254 249 195) / <alpha-value>)",
"bg-error": "rgb(var(--bg-error, 254 226 226) / <alpha-value>)",
"border-emphasis":
"rgb(var(--border-emphasis, 163 163 163) / <alpha-value>)",
"border-default":
"rgb(var(--border-default, 212 212 212) / <alpha-value>)",
+ "border-muted": "rgb(var(--border-muted, 245 245 245) / <alpha-value>)",
"border-subtle":
"rgb(var(--border-subtle, 229 229 229) / <alpha-value>)",
- "border-muted": "rgb(var(--border-muted, 245 245 245) / <alpha-value>)",
"content-inverted":
"rgb(var(--content-inverted, 255 255 255) / <alpha-value>)",
@@ -245,12 +246,14 @@ const config: Config = {
"content-emphasis":
"rgb(var(--content-emphasis, 23 23 23) / <alpha-value>)",
- "content-info": "rgb(var(--content-info, 29 78 216) / <alpha-value>)",
+ "content-info": "rgb(var(--content-info, 37 99 235) / <alpha-value>)",
"content-success":
- "rgb(var(--content-success, 21 128 61) / <alpha-value>)",
+ "rgb(var(--content-success, 22 163 74) / <alpha-value>)",
"content-attention":
- "rgb(var(--content-attention, 194 65 12) / <alpha-value>)",
- "content-error": "rgb(var(--content-error, 185 28 28) / <alpha-value>)",
+ "rgb(var(--content-attention, 234 88 12) / <alpha-value>)",
+ "content-warning":
+ "rgb(var(--content-warning, 202 138 4) / <alpha-value>)",
+ "content-error": "rgb(var(--content-error, 220 38 38) / <alpha-value>)",
},
dropShadow: {
"card-hover": ["0 8px 12px #222A350d", "0 32px 80px #2f30370f"],
diff --git a/packages/tailwind-config/themes.css b/packages/tailwind-config/themes.css
index e72afa373a..3789e41787 100644
--- a/packages/tailwind-config/themes.css
+++ b/packages/tailwind-config/themes.css
@@ -6,9 +6,10 @@
--bg-emphasis: 229 229 229;
--bg-inverted: 23 23 23;
- --bg-info: 191 219 254;
+ --bg-info: 219 234 254;
--bg-success: 220 252 231;
--bg-attention: 255 237 213;
+ --bg-warning: 254 249 195;
--bg-error: 254 226 226;
--border-emphasis: 163 163 163;
@@ -22,10 +23,11 @@
--content-default: 64 64 64;
--content-emphasis: 23 23 23;
- --content-info: 29 78 216;
- --content-success: 21 128 61;
- --content-attention: 194 65 12;
- --content-error: 185 28 28;
+ --content-info: 37 99 235;
+ --content-success: 22 163 74;
+ --content-attention: 234 88 12;
+ --content-warning: 202 138 4;
+ --content-error: 220 38 38;
}
.dark {
@@ -35,10 +37,11 @@
--bg-emphasis: 64 64 64;
--bg-inverted: 250 250 250;
- --bg-info: 29 78 216;
- --bg-success: 21 128 61;
- --bg-attention: 194 65 12;
- --bg-error: 185 28 28;
+ --bg-info: 23 37 84;
+ --bg-success: 5 46 22;
+ --bg-attention: 67 20 7;
+ --bg-warning: 66 32 6;
+ --bg-error: 69 10 10;
--border-muted: 38 38 38;
--border-subtle: 64 64 64;
@@ -51,8 +54,9 @@
--content-default: 212 212 212;
--content-emphasis: 250 250 250;
- --content-info: 191 219 254;
- --content-success: 220 252 231;
- --content-attention: 255 237 213;
- --content-error: 254 226 226;
+ --content-info: 147 197 253;
+ --content-success: 134 239 172;
+ --content-attention: 253 186 116;
+ --content-warning: 253 224 71;
+ --content-error: 252 165 165;
}
diff --git a/packages/ui/src/button.tsx b/packages/ui/src/button.tsx
index 5163975fe6..7be3b2864b 100644
--- a/packages/ui/src/button.tsx
+++ b/packages/ui/src/button.tsx
@@ -10,7 +10,7 @@ export const buttonVariants = cva("transition-all", {
primary:
"border-black bg-black dark:bg-white dark:border-white text-content-inverted hover:bg-inverted hover:ring-4 hover:ring-border-subtle",
secondary: cn(
- "border-border-subtle bg-white dark:bg-black text-content-emphasis hover:bg-bg-muted focus-visible:border-border-emphasis outline-none",
+ "border-border-subtle bg-bg-default text-content-emphasis hover:bg-bg-muted focus-visible:border-border-emphasis outline-none",
"data-[state=open]:border-border-emphasis data-[state=open]:ring-4 data-[state=open]:ring-border-subtle",
),
outline: "border-transparent text-content-default hover:bg-neutral-900/5",
@@ -107,7 +107,7 @@ const Button = forwardRef<HTMLButtonElement, ButtonProps>(
className={cn(
"group flex h-10 w-full items-center justify-center gap-2 whitespace-nowrap rounded-md border px-4 text-sm",
props.disabled || loading
- ? "cursor-not-allowed border-neutral-200 bg-neutral-100 text-neutral-400 outline-none"
+ ? "border-border-subtle bg-bg-subtle text-content-subtle cursor-not-allowed outline-none"
: buttonVariants({ variant }),
className,
)}
diff --git a/packages/ui/src/status-badge.tsx b/packages/ui/src/status-badge.tsx
index 273f7d5f56..5435722585 100644
--- a/packages/ui/src/status-badge.tsx
+++ b/packages/ui/src/status-badge.tsx
@@ -19,7 +19,7 @@ const statusBadgeVariants = cva(
new: "bg-bg-info text-content-info",
success: "bg-bg-success text-content-success",
pending: "bg-bg-attention text-content-attention",
- warning: "bg-bg-attention text-content-attention",
+ warning: "bg-bg-warning text-content-warning",
error: "bg-bg-error text-content-error",
},
size: {
@@ -63,7 +63,9 @@ function StatusBadge({
icon !== null ? icon ?? defaultIcons[variant ?? "neutral"] : null;
return (
- <DynamicTooltipWrapper tooltipProps={{ content: tooltip }}>
+ <DynamicTooltipWrapper
+ tooltipProps={tooltip ? { content: tooltip } : undefined}
+ >
<span
className={cn(
statusBadgeVariants({ variant, size }),