Skip to content

Commit 6d389ff

Browse files
adithyaakrishnaadithyaakrishna
committed
chore: fix conflicts
1 parent 34bb996 commit 6d389ff

34 files changed

Lines changed: 71 additions & 105 deletions

File tree

‎apps/sim/app/(home)/components/collaboration/collaboration.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ function YouCursor({ x, y, visible }: YouCursorProps) {
143143
<svg width='23.15' height='21.1' viewBox='0 0 17.5 16.4' fill='none'>
144144
<path d={CURSOR_ARROW_MIRRORED_PATH} fill='#33C482' />
145145
</svg>
146-
<div className='absolute top-4 left-[23px] flex items-center rounded bg-[var(--brand-tertiary-2)] px-[5px] py-[3px] font-[420] font-season text-[var(--landing-text-dark)] text-sm leading-[100%] tracking-[-0.02em]'>
146+
<div className='absolute top-4 left-[23px] flex items-center rounded bg-[var(--brand-accent)] px-[5px] py-[3px] font-[420] font-season text-[var(--landing-text-dark)] text-sm leading-[100%] tracking-[-0.02em]'>
147147
You
148148
</div>
149149
</div>
@@ -235,7 +235,7 @@ export default function Collaboration() {
235235
variant='blue'
236236
size='md'
237237
dot
238-
className='bg-[var(--brand-tertiary-2)]/10 font-season text-[var(--brand-tertiary-2)] uppercase tracking-[0.02em]'
238+
className='bg-[var(--brand-accent)]/10 font-season text-[var(--brand-accent)] uppercase tracking-[0.02em]'
239239
>
240240
Teams
241241
</Badge>

‎apps/sim/app/(landing)/components/footer/components/status-indicator.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export function StatusDotIcon({ status, className, ...props }: StatusDotIconProp
3636

3737
const STATUS_COLORS: Record<StatusType, string> = {
3838
operational: 'text-[#10B981] hover:text-[#059669]',
39-
degraded: 'text-[var(--amber)] hover:text-[#D97706]',
39+
degraded: 'text-[var(--caution)] hover:text-[#D97706]',
4040
outage: 'text-[var(--text-error)] hover:text-[var(--error)]',
4141
maintenance: 'text-[#3B82F6] hover:text-[#2563EB]',
4242
loading: 'text-muted-foreground hover:text-foreground',

‎apps/sim/app/_styles/globals.css‎

Lines changed: 18 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -215,10 +215,8 @@ html[data-sidebar-collapsed] .sidebar-container .sidebar-collapse-btn {
215215
--border-success: #e0e0e0;
216216

217217
/* Brand & state */
218-
--brand-400: #8e4cfb;
219218
--brand-secondary: #33b4ff;
220-
--brand-tertiary: #22c55e;
221-
--brand-tertiary-2: #33c482;
219+
--brand-accent: #33c482;
222220
--selection: #1a5cf6;
223221
--warning: #ea580c;
224222

@@ -268,24 +266,12 @@ html[data-sidebar-collapsed] .sidebar-container .sidebar-collapse-btn {
268266
--error: #dc2626;
269267
--error-muted: #fecaca;
270268
--error-emphasis: #b91c1c;
271-
--amber: #f59e0b;
272-
--orange: #ea580c;
273-
--orange-bright: #f97316;
269+
--caution: #f59e0b;
274270
--success: #22c55e;
275-
--teal: #00b0b0;
276271

277272
/* Brand extended */
278273
--brand-knowledge: #00b0b0;
279-
--brand-purple-deep: #601ee0;
280-
--brand-purple: #802fff;
281-
--brand-purple-bright: #8357ff;
282-
--brand-purple-vivid: #8c10ff;
283-
--brand-plum: #611f69;
284-
--brand-blue-dark: #264f78;
285-
--brand-blue-muted: #336699;
286-
--brand-blue: #2f55ff;
287-
--brand-blue-light: #2fa1ff;
288-
--brand-blue-sky: #34b5ff;
274+
--selection-dark: #264f78;
289275

290276
/* Terminal status badges */
291277
--terminal-status-error-bg: #fef2f2;
@@ -332,10 +318,8 @@ html[data-sidebar-collapsed] .sidebar-container .sidebar-collapse-btn {
332318
--border-success: #575757;
333319

334320
/* Brand & state */
335-
--brand-400: #8e4cfb;
336321
--brand-secondary: #33b4ff;
337-
--brand-tertiary: #22c55e;
338-
--brand-tertiary-2: #33c482;
322+
--brand-accent: #33c482;
339323
--selection: #4b83f7;
340324
--warning: #ff6600;
341325

@@ -360,24 +344,12 @@ html[data-sidebar-collapsed] .sidebar-container .sidebar-collapse-btn {
360344
--error: #f87171;
361345
--error-muted: #f6d2d2;
362346
--error-emphasis: #b91c1c;
363-
--amber: #f59e0b;
364-
--orange: #f97316;
365-
--orange-bright: #ff972f;
347+
--caution: #f59e0b;
366348
--success: #22c55e;
367-
--teal: #00b0b0;
368349

369350
/* Brand extended */
370351
--brand-knowledge: #00b0b0;
371-
--brand-purple-deep: #601ee0;
372-
--brand-purple: #802fff;
373-
--brand-purple-bright: #8357ff;
374-
--brand-purple-vivid: #8c10ff;
375-
--brand-plum: #611f69;
376-
--brand-blue-dark: #264f78;
377-
--brand-blue-muted: #336699;
378-
--brand-blue: #2f55ff;
379-
--brand-blue-light: #2fa1ff;
380-
--brand-blue-sky: #34b5ff;
352+
--selection-dark: #264f78;
381353

382354
/* Terminal status badges */
383355
--terminal-status-error-bg: #491515;
@@ -614,13 +586,13 @@ input[type="search"]::-ms-clear {
614586
}
615587

616588
.branded-button-custom {
617-
background: var(--brand-primary-hex) !important;
618-
border-color: var(--brand-primary-hex) !important;
589+
background: var(--brand) !important;
590+
border-color: var(--brand) !important;
619591
}
620592

621593
.branded-button-custom:hover {
622-
background: var(--brand-primary-hover-hex) !important;
623-
border-color: var(--brand-primary-hover-hex) !important;
594+
background: var(--brand-hover) !important;
595+
border-color: var(--brand-hover) !important;
624596
}
625597

626598
/**
@@ -712,12 +684,10 @@ input[type="search"]::-ms-clear {
712684
--base-muted-foreground: #737373;
713685
--gradient-primary: 263 85% 70%;
714686
--gradient-secondary: 336 95% 65%;
715-
--brand-primary-hex: #6f3dfa;
716-
--brand-primary-hover-hex: #6338d9;
717-
--brand-accent-hex: #6f3dfa;
718-
--brand-accent-hover-hex: #6f3dfa;
719-
--brand-background-hex: #ffffff;
720-
--surface-elevated: #202020;
687+
--brand: #6f3dfa;
688+
--brand-hover: #6338d9;
689+
--brand-link: #6f3dfa;
690+
--brand-link-hover: #6f3dfa;
721691
}
722692

723693
.dark {
@@ -751,12 +721,10 @@ input[type="search"]::-ms-clear {
751721
--base-muted-foreground: #a3a3a3;
752722
--gradient-primary: 263 90% 75%;
753723
--gradient-secondary: 336 100% 72%;
754-
--brand-primary-hex: #701ffc;
755-
--brand-primary-hover-hex: #802fff;
756-
--brand-accent-hex: #9d54ff;
757-
--brand-accent-hover-hex: #a66fff;
758-
--brand-background-hex: #0c0c0c;
759-
--surface-elevated: #202020;
724+
--brand: #701ffc;
725+
--brand-hover: #802fff;
726+
--brand-link: #9d54ff;
727+
--brand-link-hover: #a66fff;
760728
}
761729
}
762730

‎apps/sim/app/api/chat/route.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ export async function POST(request: NextRequest) {
165165
// Merge customizations with the additional fields
166166
const mergedCustomizations = {
167167
...(customizations || {}),
168-
primaryColor: customizations?.primaryColor || 'var(--brand-primary-hover-hex)',
168+
primaryColor: customizations?.primaryColor || 'var(--brand-hover)',
169169
welcomeMessage: customizations?.welcomeMessage || 'Hi there! How can I help you today?',
170170
}
171171

‎apps/sim/app/chat/[identifier]/chat.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ export default function ChatClient({ identifier }: { identifier: string }) {
466466
if (authRequired) {
467467
// const title = new URLSearchParams(window.location.search).get('title') || 'chat'
468468
// const primaryColor =
469-
// new URLSearchParams(window.location.search).get('color') || 'var(--brand-primary-hover-hex)'
469+
// new URLSearchParams(window.location.search).get('color') || 'var(--brand-hover)'
470470

471471
if (authRequired === 'password') {
472472
return <PasswordAuth identifier={identifier} onAuthSuccess={handleAuthSuccess} />

‎apps/sim/app/chat/components/auth/email/email-auth.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ export default function EmailAuth({ identifier, onAuthSuccess }: EmailAuthProps)
301301
</span>
302302
) : (
303303
<button
304-
className='font-medium text-[var(--brand-accent-hex)] underline-offset-4 transition hover:text-[var(--brand-accent-hover-hex)] hover:underline'
304+
className='font-medium text-[var(--brand-link)] underline-offset-4 transition hover:text-[var(--brand-link-hover)] hover:underline'
305305
onClick={handleResendOtp}
306306
disabled={isVerifyingOtp || isResendDisabled}
307307
>
@@ -318,7 +318,7 @@ export default function EmailAuth({ identifier, onAuthSuccess }: EmailAuthProps)
318318
setOtpValue('')
319319
setAuthError(null)
320320
}}
321-
className='font-medium text-[var(--brand-accent-hex)] underline-offset-4 transition hover:text-[var(--brand-accent-hover-hex)] hover:underline'
321+
className='font-medium text-[var(--brand-link)] underline-offset-4 transition hover:text-[var(--brand-link-hover)] hover:underline'
322322
>
323323
Change email
324324
</button>

‎apps/sim/app/chat/components/header/header.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ interface ChatHeaderProps {
2020

2121
export function ChatHeader({ chatConfig, starCount }: ChatHeaderProps) {
2222
const brand = useBrandConfig()
23-
const primaryColor = chatConfig?.customizations?.primaryColor || 'var(--brand-primary-hex)'
23+
const primaryColor = chatConfig?.customizations?.primaryColor || 'var(--brand)'
2424
const customImage = chatConfig?.customizations?.imageUrl || chatConfig?.customizations?.logoUrl
2525

2626
return (

‎apps/sim/app/form/[identifier]/components/form-field.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ export function FormField({
141141
className={cn(
142142
'flex cursor-pointer flex-col items-center justify-center rounded-[10px] border-2 border-dashed px-6 py-8 transition-colors',
143143
isDragging
144-
? 'border-[var(--brand-primary-hex)] bg-[var(--brand-primary-hex)]/5'
144+
? 'border-[var(--brand)] bg-[var(--brand)]/5'
145145
: 'border-border hover:border-muted-foreground/50'
146146
)}
147147
>

‎apps/sim/app/form/[identifier]/components/thank-you-screen.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ interface ThankYouScreenProps {
66
primaryColor?: string
77
}
88

9-
/** Default green color matching --brand-tertiary-2 */
9+
/** Default green color matching --brand-accent */
1010
const DEFAULT_THANK_YOU_COLOR = '#33C482'
1111

1212
/** Legacy blue default that should be treated as "no custom color" */

‎apps/sim/app/form/[identifier]/form.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ export default function Form({ identifier }: { identifier: string }) {
221221
[identifier, fetchFormConfig]
222222
)
223223

224-
const primaryColor = formConfig?.customizations?.primaryColor || 'var(--brand-primary-hex)'
224+
const primaryColor = formConfig?.customizations?.primaryColor || 'var(--brand)'
225225

226226
if (isLoading && !authRequired) {
227227
return <FormLoadingState />

0 commit comments

Comments
 (0)