Skip to content

Commit 7cdd19e

Browse files
adithyaakrishnaadithyaakrishna
committed
chore: fix conflicts
1 parent 1ca48b7 commit 7cdd19e

File tree

306 files changed

+3967
-3946
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

306 files changed

+3967
-3946
lines changed

‎apps/sim/app/(auth)/auth-layout-client.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ export default function AuthLayoutClient({ children }: { children: React.ReactNo
1414

1515
return (
1616
<AuthBackground className='dark font-[430] font-season'>
17-
<main className='relative flex min-h-full flex-col text-[#ECECEC]'>
18-
<header className='shrink-0 bg-[#1C1C1C]'>
17+
<main className='relative flex min-h-full flex-col text-[var(--landing-text)]'>
18+
<header className='shrink-0 bg-[var(--text-primary)]'>
1919
<Navbar logoOnly />
2020
</header>
2121
<div className='relative z-30 flex flex-1 items-center justify-center px-4 pb-24'>

‎apps/sim/app/(auth)/components/auth-background.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ type AuthBackgroundProps = {
99
export default function AuthBackground({ className, children }: AuthBackgroundProps) {
1010
return (
1111
<div className={cn('fixed inset-0 overflow-hidden', className)}>
12-
<div className='-z-50 pointer-events-none absolute inset-0 bg-[#1C1C1C]' />
12+
<div className='-z-50 pointer-events-none absolute inset-0 bg-[var(--text-primary)]' />
1313
<AuthBackgroundSVG />
1414
<div className='relative z-20 h-full overflow-auto'>{children}</div>
1515
</div>

‎apps/sim/app/(auth)/components/branded-button.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ export const BrandedButton = forwardRef<HTMLButtonElement, BrandedButtonProps>(
5555
onMouseEnter={handleMouseEnter}
5656
onMouseLeave={handleMouseLeave}
5757
className={cn(
58-
'group inline-flex h-[32px] items-center justify-center gap-[8px] rounded-[5px] border px-[10px] font-[430] font-season text-[14px] transition-colors disabled:cursor-not-allowed disabled:opacity-50',
58+
'group inline-flex h-[32px] items-center justify-center gap-2 rounded-[5px] border px-2.5 font-[430] font-season text-sm transition-colors disabled:cursor-not-allowed disabled:opacity-50',
5959
!hasCustomColor &&
60-
'border-[#FFFFFF] bg-[#FFFFFF] text-black hover:border-[#E0E0E0] hover:bg-[#E0E0E0]',
60+
'border-[var(--white)] bg-[var(--white)] text-black hover:border-[var(--border-1)] hover:bg-[var(--border-1)]',
6161
fullWidth && 'w-full',
6262
className
6363
)}

‎apps/sim/app/(auth)/components/sso-login-button.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export function SSOLoginButton({
3535

3636
const primaryBtnClasses = cn(
3737
primaryClassName || 'branded-button-gradient',
38-
'flex w-full items-center justify-center gap-2 rounded-[10px] border font-medium text-[15px] text-white transition-all duration-200'
38+
'flex w-full items-center justify-center gap-2 rounded-[10px] border font-medium text-base text-white transition-all duration-200'
3939
)
4040

4141
const outlineBtnClasses = cn('w-full rounded-[10px]')

‎apps/sim/app/(auth)/components/status-page-layout.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ export function StatusPageLayout({
1818
}: StatusPageLayoutProps) {
1919
return (
2020
<AuthBackground className='dark font-[430] font-season'>
21-
<main className='relative flex min-h-full flex-col text-[#ECECEC]'>
22-
<header className='shrink-0 bg-[#1C1C1C]'>
21+
<main className='relative flex min-h-full flex-col text-[var(--landing-text)]'>
22+
<header className='shrink-0 bg-[var(--text-primary)]'>
2323
<Navbar logoOnly />
2424
</header>
2525
<div className='relative z-30 flex flex-1 items-center justify-center px-4 pb-24'>
@@ -29,7 +29,7 @@ export function StatusPageLayout({
2929
<h1 className='font-[430] font-season text-[40px] text-white leading-[110%] tracking-[-0.02em]'>
3030
{title}
3131
</h1>
32-
<p className='font-[430] font-season text-[#F6F6F6]/60 text-[18px] leading-[125%] tracking-[0.02em]'>
32+
<p className='font-[430] font-season text-[var(--text-primary)]/60 text-lg leading-[125%] tracking-[0.02em]'>
3333
{description}
3434
</p>
3535
</div>

‎apps/sim/app/(auth)/components/support-footer.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ export function SupportFooter({ position = 'fixed' }: SupportFooterProps) {
1111

1212
return (
1313
<div
14-
className={`right-0 bottom-0 left-0 z-50 pb-8 text-center font-[340] text-[#999] text-[13px] leading-relaxed ${position}`}
14+
className={`right-0 bottom-0 left-0 z-50 pb-8 text-center font-[340] text-[var(--text-subtle)] text-small leading-relaxed ${position}`}
1515
>
1616
Need help?{' '}
1717
<a
1818
href={`mailto:${brandConfig.supportEmail}`}
19-
className='text-[#999] underline-offset-4 transition hover:text-[#ECECEC] hover:underline'
19+
className='text-[var(--text-subtle)] underline-offset-4 transition hover:text-[var(--landing-text)] hover:underline'
2020
>
2121
Contact support
2222
</a>

‎apps/sim/app/(auth)/oauth/consent/page.tsx‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ export default function OAuthConsentPage() {
130130
<h1 className='font-[430] font-season text-[40px] text-white leading-[110%] tracking-[-0.02em]'>
131131
Authorize Application
132132
</h1>
133-
<p className='font-[430] font-season text-[#F6F6F6]/60 text-[18px] leading-[125%] tracking-[0.02em]'>
133+
<p className='font-[430] font-season text-[var(--text-primary)]/60 text-lg leading-[125%] tracking-[0.02em]'>
134134
Loading application details...
135135
</p>
136136
</div>
@@ -145,7 +145,7 @@ export default function OAuthConsentPage() {
145145
<h1 className='font-[430] font-season text-[40px] text-white leading-[110%] tracking-[-0.02em]'>
146146
Authorization Error
147147
</h1>
148-
<p className='font-[430] font-season text-[#F6F6F6]/60 text-[18px] leading-[125%] tracking-[0.02em]'>
148+
<p className='font-[430] font-season text-[var(--text-primary)]/60 text-lg leading-[125%] tracking-[0.02em]'>
149149
{error}
150150
</p>
151151
</div>
@@ -170,11 +170,11 @@ export default function OAuthConsentPage() {
170170
className='rounded-[10px]'
171171
/>
172172
) : (
173-
<div className='flex h-12 w-12 items-center justify-center rounded-[10px] bg-[#2A2A2A] font-medium text-[#999] text-[18px]'>
173+
<div className='flex h-12 w-12 items-center justify-center rounded-[10px] bg-[var(--surface-4)] font-medium text-[var(--text-subtle)] text-lg'>
174174
{(clientName ?? '?').charAt(0).toUpperCase()}
175175
</div>
176176
)}
177-
<ArrowLeftRight className='h-5 w-5 text-[#999]' />
177+
<ArrowLeftRight className='h-5 w-5 text-[var(--text-subtle)]' />
178178
<Image
179179
src='/new/logo/colorized-bg.svg'
180180
alt='Sim'
@@ -188,14 +188,14 @@ export default function OAuthConsentPage() {
188188
<h1 className='font-[430] font-season text-[40px] text-white leading-[110%] tracking-[-0.02em]'>
189189
Authorize Application
190190
</h1>
191-
<p className='font-[430] font-season text-[#F6F6F6]/60 text-[18px] leading-[125%] tracking-[0.02em]'>
192-
<span className='font-medium text-[#ECECEC]'>{clientName}</span> is requesting access to
191+
<p className='font-[430] font-season text-[var(--text-primary)]/60 text-lg leading-[125%] tracking-[0.02em]'>
192+
<span className='font-medium text-[var(--landing-text)]'>{clientName}</span> is requesting access to
193193
your account
194194
</p>
195195
</div>
196196

197197
{session?.user && (
198-
<div className='mt-5 flex items-center gap-3 rounded-lg border border-[#2A2A2A] px-4 py-3'>
198+
<div className='mt-5 flex items-center gap-3 rounded-lg border border-[var(--surface-4)] px-4 py-3'>
199199
{session.user.image ? (
200200
<Image
201201
src={session.user.image}
@@ -206,20 +206,20 @@ export default function OAuthConsentPage() {
206206
unoptimized
207207
/>
208208
) : (
209-
<div className='flex h-8 w-8 items-center justify-center rounded-full bg-[#2A2A2A] font-medium text-[#999] text-[13px]'>
209+
<div className='flex h-8 w-8 items-center justify-center rounded-full bg-[var(--surface-4)] font-medium text-[var(--text-subtle)] text-small'>
210210
{(session.user.name ?? session.user.email ?? '?').charAt(0).toUpperCase()}
211211
</div>
212212
)}
213213
<div className='min-w-0'>
214214
{session.user.name && (
215-
<p className='truncate font-medium text-[14px]'>{session.user.name}</p>
215+
<p className='truncate font-medium text-sm'>{session.user.name}</p>
216216
)}
217-
<p className='truncate text-[#999] text-[13px]'>{session.user.email}</p>
217+
<p className='truncate text-[var(--text-subtle)] text-small'>{session.user.email}</p>
218218
</div>
219219
<button
220220
type='button'
221221
onClick={handleSwitchAccount}
222-
className='ml-auto text-[#999] text-[13px] underline-offset-2 transition-colors hover:text-[#ECECEC] hover:underline'
222+
className='ml-auto text-[var(--text-subtle)] text-small underline-offset-2 transition-colors hover:text-[var(--landing-text)] hover:underline'
223223
>
224224
Switch
225225
</button>
@@ -229,10 +229,10 @@ export default function OAuthConsentPage() {
229229
{scopes.length > 0 && (
230230
<div className='mt-5 w-full max-w-[410px]'>
231231
<div className='rounded-lg border p-4'>
232-
<p className='mb-3 font-medium text-[14px]'>This will allow the application to:</p>
232+
<p className='mb-3 font-medium text-sm'>This will allow the application to:</p>
233233
<ul className='space-y-2'>
234234
{scopes.map((s) => (
235-
<li key={s} className='flex items-start gap-2 font-normal text-[#999] text-[13px]'>
235+
<li key={s} className='flex items-start gap-2 font-normal text-[var(--text-subtle)] text-small'>
236236
<span className='mt-0.5 text-green-500'>&#10003;</span>
237237
<span>{SCOPE_DESCRIPTIONS[s] ?? s}</span>
238238
</li>

‎apps/sim/app/(auth)/reset-password/reset-password-content.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ function ResetPasswordContent() {
7272
<h1 className='font-[430] font-season text-[40px] text-white leading-[110%] tracking-[-0.02em]'>
7373
Reset your password
7474
</h1>
75-
<p className='font-[430] font-season text-[#F6F6F6]/60 text-[18px] leading-[125%] tracking-[0.02em]'>
75+
<p className='font-[430] font-season text-[var(--text-primary)]/60 text-lg leading-[125%] tracking-[0.02em]'>
7676
Enter a new password for your account
7777
</p>
7878
</div>
@@ -87,10 +87,10 @@ function ResetPasswordContent() {
8787
/>
8888
</div>
8989

90-
<div className='pt-6 text-center font-light text-[14px]'>
90+
<div className='pt-6 text-center font-light text-sm'>
9191
<Link
9292
href='/login'
93-
className='font-medium text-[#ECECEC] underline-offset-4 transition hover:text-white hover:underline'
93+
className='font-medium text-[var(--landing-text)] underline-offset-4 transition hover:text-white hover:underline'
9494
>
9595
Back to login
9696
</Link>

‎apps/sim/app/(auth)/reset-password/reset-password-form.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ export function RequestResetForm({
4646
disabled={isSubmitting}
4747
required
4848
/>
49-
<p className='text-[#999] text-sm'>
49+
<p className='text-[var(--text-subtle)] text-sm'>
5050
We'll send a password reset link to this email address.
5151
</p>
5252
</div>
5353

5454
{/* Status message display */}
5555
{statusType && statusMessage && (
5656
<div
57-
className={cn('text-xs', statusType === 'success' ? 'text-[#4CAF50]' : 'text-red-400')}
57+
className={cn('text-xs', statusType === 'success' ? 'text-[var(--success)]' : 'text-red-400')}
5858
>
5959
<p>{statusMessage}</p>
6060
</div>
@@ -162,7 +162,7 @@ export function SetNewPasswordForm({
162162
<button
163163
type='button'
164164
onClick={() => setShowPassword(!showPassword)}
165-
className='-translate-y-1/2 absolute top-1/2 right-3 text-[#999] transition hover:text-[#ECECEC]'
165+
className='-translate-y-1/2 absolute top-1/2 right-3 text-[var(--text-subtle)] transition hover:text-[var(--landing-text)]'
166166
aria-label={showPassword ? 'Hide password' : 'Show password'}
167167
>
168168
{showPassword ? <EyeOff size={18} /> : <Eye size={18} />}
@@ -190,7 +190,7 @@ export function SetNewPasswordForm({
190190
<button
191191
type='button'
192192
onClick={() => setShowConfirmPassword(!showConfirmPassword)}
193-
className='-translate-y-1/2 absolute top-1/2 right-3 text-[#999] transition hover:text-[#ECECEC]'
193+
className='-translate-y-1/2 absolute top-1/2 right-3 text-[var(--text-subtle)] transition hover:text-[var(--landing-text)]'
194194
aria-label={showConfirmPassword ? 'Hide password' : 'Show password'}
195195
>
196196
{showConfirmPassword ? <EyeOff size={18} /> : <Eye size={18} />}
@@ -208,7 +208,7 @@ export function SetNewPasswordForm({
208208
<div
209209
className={cn(
210210
'mt-1 space-y-1 text-xs',
211-
statusType === 'success' ? 'text-[#4CAF50]' : 'text-red-400'
211+
statusType === 'success' ? 'text-[var(--success)]' : 'text-red-400'
212212
)}
213213
>
214214
<p>{statusMessage}</p>

‎apps/sim/app/(auth)/signup/signup-form.tsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ function SignupFormContent({
351351
<h1 className='font-[430] font-season text-[40px] text-white leading-[110%] tracking-[-0.02em]'>
352352
Create an account
353353
</h1>
354-
<p className='font-[430] font-season text-[#F6F6F6]/60 text-[18px] leading-[125%] tracking-[0.02em]'>
354+
<p className='font-[430] font-season text-[var(--text-primary)]/60 text-lg leading-[125%] tracking-[0.02em]'>
355355
Create an account or log in
356356
</p>
357357
</div>
@@ -484,7 +484,7 @@ function SignupFormContent({
484484
<button
485485
type='button'
486486
onClick={() => setShowPassword(!showPassword)}
487-
className='-translate-y-1/2 absolute top-1/2 right-3 text-[#999] transition hover:text-[#ECECEC]'
487+
className='-translate-y-1/2 absolute top-1/2 right-3 text-[var(--text-subtle)] transition hover:text-[var(--landing-text)]'
488488
aria-label={showPassword ? 'Hide password' : 'Show password'}
489489
>
490490
{showPassword ? <EyeOff size={18} /> : <Eye size={18} />}
@@ -551,10 +551,10 @@ function SignupFormContent({
551551
})() && (
552552
<div className='relative my-6 font-light'>
553553
<div className='absolute inset-0 flex items-center'>
554-
<div className='w-full border-[#2A2A2A] border-t' />
554+
<div className='w-full border-[var(--surface-4)] border-t' />
555555
</div>
556556
<div className='relative flex justify-center text-sm'>
557-
<span className='bg-[#1C1C1C] px-4 font-[340] text-[#999]'>Or continue with</span>
557+
<span className='bg-[var(--text-primary)] px-4 font-[340] text-[var(--text-subtle)]'>Or continue with</span>
558558
</div>
559559
</div>
560560
)}
@@ -589,23 +589,23 @@ function SignupFormContent({
589589
</div>
590590
)}
591591

592-
<div className='pt-6 text-center font-light text-[14px]'>
592+
<div className='pt-6 text-center font-light text-sm'>
593593
<span className='font-normal'>Already have an account? </span>
594594
<Link
595595
href={isInviteFlow ? `/login?invite_flow=true&callbackUrl=${redirectUrl}` : '/login'}
596-
className='font-medium text-[#ECECEC] underline-offset-4 transition hover:text-white hover:underline'
596+
className='font-medium text-[var(--landing-text)] underline-offset-4 transition hover:text-white hover:underline'
597597
>
598598
Sign in
599599
</Link>
600600
</div>
601601

602-
<div className='absolute right-0 bottom-0 left-0 px-8 pb-8 text-center font-[340] text-[#999] text-[13px] leading-relaxed sm:px-8 md:px-[44px]'>
602+
<div className='absolute right-0 bottom-0 left-0 px-8 pb-8 text-center font-[340] text-[var(--text-subtle)] text-small leading-relaxed sm:px-8 md:px-[44px]'>
603603
By creating an account, you agree to our{' '}
604604
<Link
605605
href='/terms'
606606
target='_blank'
607607
rel='noopener noreferrer'
608-
className='text-[#999] underline-offset-4 transition hover:text-[#ECECEC] hover:underline'
608+
className='text-[var(--text-subtle)] underline-offset-4 transition hover:text-[var(--landing-text)] hover:underline'
609609
>
610610
Terms of Service
611611
</Link>{' '}
@@ -614,7 +614,7 @@ function SignupFormContent({
614614
href='/privacy'
615615
target='_blank'
616616
rel='noopener noreferrer'
617-
className='text-[#999] underline-offset-4 transition hover:text-[#ECECEC] hover:underline'
617+
className='text-[var(--text-subtle)] underline-offset-4 transition hover:text-[var(--landing-text)] hover:underline'
618618
>
619619
Privacy Policy
620620
</Link>

0 commit comments

Comments
 (0)