diff --git a/src/app/globals.css b/src/app/globals.css index 863b6819..be30e123 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -18,9 +18,8 @@ --card-foreground: 224 71.4% 4.1%; --popover: 0 0% 100%; --popover-foreground: 224 71.4% 4.1%; - --primary-v2: 225 89% 79%; - --primary-v2-hover: 224 100% 89%; - --primary: 262.1 83.3% 57.8%; + --primary: 225 89% 79%; + --primary-hover: 224 100% 89%; --primary-foreground: 210 20% 98%; --secondary: 220 14.3% 95.9%; --secondary-foreground: 220.9 39.3% 11%; @@ -46,7 +45,6 @@ --card-foreground: 210 20% 98%; --popover: 224 71.4% 4.1%; --popover-foreground: 210 20% 98%; - --primary: 263.4 70% 50.4%; --primary-foreground: 210 20% 98%; --secondary: 215 27.9% 16.9%; --secondary-foreground: 210 20% 98%; diff --git a/src/app/page.tsx b/src/app/page.tsx index 21baa1b7..acebbfe2 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -112,7 +112,7 @@ export default function Page() {
@@ -215,7 +215,7 @@ export default function Page() { } @@ -254,7 +254,7 @@ export default function Page() { } diff --git a/src/components/form/LoginForm.tsx b/src/components/form/LoginForm.tsx index 7f28c975..cee436f6 100644 --- a/src/components/form/LoginForm.tsx +++ b/src/components/form/LoginForm.tsx @@ -265,7 +265,7 @@ export const LoginForm = () => { {l('no-account')}{' '} {p('signup')} diff --git a/src/components/form/SignUpForm.tsx b/src/components/form/SignUpForm.tsx index 422cfd5d..d7ba0d7c 100644 --- a/src/components/form/SignUpForm.tsx +++ b/src/components/form/SignUpForm.tsx @@ -186,7 +186,7 @@ export function SignUpForm() { {s('already')}{' '} {p('login')} @@ -374,7 +374,7 @@ export function SignUpForm() { {chunks} @@ -383,7 +383,7 @@ export function SignUpForm() { {chunks} diff --git a/src/components/form/WaitlistForm.tsx b/src/components/form/WaitlistForm.tsx index ce7068e4..6c4370a0 100644 --- a/src/components/form/WaitlistForm.tsx +++ b/src/components/form/WaitlistForm.tsx @@ -144,7 +144,7 @@ export const WaitlistForm: FC<{ type="button" onClick={() => setView('sign-up')} disabled={loading} - className="my-4 w-full text-center font-medium text-primary-v2 transition-colors hover:text-primary-v2-hover" + className="my-4 w-full text-center font-medium text-primary transition-colors hover:text-primary-hover" > {w('referral')} @@ -156,7 +156,7 @@ export const WaitlistForm: FC<{ setView('sign-up'); }} disabled={loading} - className="w-full text-center font-medium text-primary-v2 transition-colors hover:text-primary-v2-hover" + className="w-full text-center font-medium text-primary transition-colors hover:text-primary-hover" > {w('subscriber')} diff --git a/src/components/ui/badge.tsx b/src/components/ui/badge.tsx index c06fbe56..a5835018 100644 --- a/src/components/ui/badge.tsx +++ b/src/components/ui/badge.tsx @@ -9,7 +9,7 @@ const badgeVariants = cva( variants: { variant: { default: - 'border-transparent bg-primary text-primary-foreground shadow hover:bg-primary/80', + 'border-transparent bg-primary text-black shadow hover:bg-primary-hover', secondary: 'border-transparent bg-secondary text-secondary-foreground hover:bg-secondary/80', destructive: diff --git a/src/components/ui/button-v2.tsx b/src/components/ui/button-v2.tsx index 3ef1b8dc..60496000 100644 --- a/src/components/ui/button-v2.tsx +++ b/src/components/ui/button-v2.tsx @@ -9,7 +9,7 @@ const buttonVariants = cva( { variants: { variant: { - primary: 'text-black bg-primary-v2 hover:bg-primary-v2-hover', + primary: 'text-black bg-primary hover:bg-primary-hover', secondary: 'text-black dark:bg-white bg-slate-300', }, size: { diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsx index b6f17f16..04e267d7 100644 --- a/src/components/ui/button.tsx +++ b/src/components/ui/button.tsx @@ -9,8 +9,7 @@ const buttonVariants = cva( { variants: { variant: { - default: - 'bg-primary text-primary-foreground shadow hover:bg-primary/90', + default: 'bg-primary text-black shadow hover:bg-primary-hover', destructive: 'bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90', outline: diff --git a/src/components/ui/checkbox.tsx b/src/components/ui/checkbox.tsx index 228506ea..4a8537ab 100644 --- a/src/components/ui/checkbox.tsx +++ b/src/components/ui/checkbox.tsx @@ -13,7 +13,7 @@ const Checkbox = React.forwardRef< diff --git a/src/components/ui/tooltip.tsx b/src/components/ui/tooltip.tsx index 69de9ac7..c97bfd64 100644 --- a/src/components/ui/tooltip.tsx +++ b/src/components/ui/tooltip.tsx @@ -19,7 +19,7 @@ const TooltipContent = React.forwardRef< ref={ref} sideOffset={sideOffset} className={cn( - 'z-50 overflow-hidden rounded-md bg-primary px-3 py-1.5 text-xs text-primary-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2', + 'z-50 overflow-hidden rounded-md bg-primary px-3 py-1.5 text-xs text-black animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2', className )} {...props} diff --git a/tailwind.config.ts b/tailwind.config.ts index 10260af1..67b3f331 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -24,12 +24,9 @@ const config = { ring: 'hsl(var(--ring))', background: 'hsl(var(--background))', foreground: 'hsl(var(--foreground))', - ['primary-v2']: { - DEFAULT: 'hsl(var(--primary-v2))', - hover: 'hsl(var(--primary-v2-hover))', - }, primary: { DEFAULT: 'hsl(var(--primary))', + hover: 'hsl(var(--primary-hover))', foreground: 'hsl(var(--primary-foreground))', }, secondary: {