Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AMB-182] refactor: remove old primary color #60

Merged
merged 3 commits into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -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%;
Expand All @@ -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%;
secondl1ght marked this conversation as resolved.
Show resolved Hide resolved
--primary-foreground: 210 20% 98%;
--secondary: 215 27.9% 16.9%;
--secondary-foreground: 210 20% 98%;
Expand Down
8 changes: 4 additions & 4 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export default function Page() {

<div className="mb-6 grid gap-6 xl:grid-cols-2">
<CardSection
bg="bg-primary-v2"
bg="bg-primary"
accent="bg-white"
icon="1"
title={p('signup')}
Expand Down Expand Up @@ -195,7 +195,7 @@ export default function Page() {

<div className="space-y-6">
<CardSection
bg="bg-primary-v2"
bg="bg-primary"
accent="bg-white"
icon={
<ShieldCheck className="h-[28px] w-[28px] lg:h-[32px] lg:w-[32px]" />
Expand All @@ -215,7 +215,7 @@ export default function Page() {

<CardSection
bg="bg-white"
accent="bg-primary-v2"
accent="bg-primary"
icon={
<KeyRound className="h-[28px] w-[28px] lg:h-[32px] lg:w-[32px]" />
}
Expand Down Expand Up @@ -254,7 +254,7 @@ export default function Page() {

<CardSection
bg="bg-accent-black"
accent="bg-primary-v2"
accent="bg-primary"
icon={
<LockKeyhole className="h-[28px] w-[28px] lg:h-[32px] lg:w-[32px]" />
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/form/LoginForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ export const LoginForm = () => {
{l('no-account')}{' '}
<Link
href={ROUTES.signup}
className="text-primary-v2 transition-colors hover:text-primary-v2-hover"
className="text-primary transition-colors hover:text-primary-hover"
>
{p('signup')}
</Link>
Expand Down
6 changes: 3 additions & 3 deletions src/components/form/SignUpForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ export function SignUpForm() {
{s('already')}{' '}
<Link
href={ROUTES.login.home}
className="text-primary-v2 transition-colors hover:text-primary-v2-hover"
className="text-primary transition-colors hover:text-primary-hover"
>
{p('login')}
</Link>
Expand Down Expand Up @@ -374,7 +374,7 @@ export function SignUpForm() {
<Link
href={ROUTES.docs.termsOfService}
target="_blank"
className="text-primary-v2 transition-colors hover:text-primary-v2-hover"
className="text-primary transition-colors hover:text-primary-hover"
>
{chunks}
</Link>
Expand All @@ -383,7 +383,7 @@ export function SignUpForm() {
<Link
href={ROUTES.docs.privacyPolicy}
target="_blank"
className="text-primary-v2 transition-colors hover:text-primary-v2-hover"
className="text-primary transition-colors hover:text-primary-hover"
>
{chunks}
</Link>
Expand Down
4 changes: 2 additions & 2 deletions src/components/form/WaitlistForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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')}
</button>
Expand All @@ -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')}
</button>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/badge.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/button-v2.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
3 changes: 1 addition & 2 deletions src/components/ui/button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/checkbox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const Checkbox = React.forwardRef<
<CheckboxPrimitive.Root
ref={ref}
className={cn(
'peer h-6 w-6 shrink-0 rounded-lg border border-primary-v2 shadow focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary-v2',
'peer h-6 w-6 shrink-0 rounded-lg border border-primary shadow focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary',
className
)}
{...props}
Expand Down
4 changes: 2 additions & 2 deletions src/components/ui/progress.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ const Progress = React.forwardRef<
<ProgressPrimitive.Root
ref={ref}
className={cn(
'relative h-2 w-full overflow-hidden rounded-full bg-primary-v2/20',
'relative h-2 w-full overflow-hidden rounded-full bg-primary/20',
className
)}
{...props}
>
<ProgressPrimitive.Indicator
className="h-full w-full flex-1 bg-primary-v2 transition-all"
className="h-full w-full flex-1 bg-primary transition-all"
style={{ transform: `translateX(-${100 - (value || 0)}%)` }}
/>
</ProgressPrimitive.Root>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/tooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 1 addition & 4 deletions tailwind.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
Loading