Skip to content

Commit 7845110

Browse files
icecrasher321icecrasher321
committed
Merge remote-tracking branch 'origin/staging' into feat/func-cli-resolver
2 parents 93c6320 + 3d8b2ed commit 7845110

13 files changed

Lines changed: 78 additions & 44 deletions

‎apps/docs/app/global.css‎

Lines changed: 50 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,17 @@ body.wp-lightbox-open [aria-label="Ask Sim"] {
6565
--surface-5: #f3f3f3;
6666
--surface-6: #e5e5e5;
6767
--surface-active: #ececec;
68-
--border: #dedede;
69-
--border-1: #e0e0e0;
70-
--divider: #ededed;
68+
--border: #d8d8d8;
69+
/** Legacy neutral-border aliases. New work should use --border. */
70+
--border-1: var(--border);
7171
--text-primary: #1a1a1a;
7272
--text-secondary: #525252;
7373
--text-tertiary: #5c5c5c;
74-
--text-body: #3b3b3b;
75-
--text-muted: #707070;
74+
--text-body: #434343;
75+
--text-muted: #7a7a7a;
7676
--text-subtle: #8c8c8c;
77-
--text-icon: #525252;
77+
--text-icon: #5a5a5a;
78+
--text-icon-muted: #5c5c5c;
7879
--text-inverse: #ffffff;
7980
--text-error: #ef4444;
8081
--text-muted-inverse: #a0a0a0;
@@ -84,9 +85,26 @@ body.wp-lightbox-open [aria-label="Ask Sim"] {
8485
--surface-inverted: #1b1b1b;
8586
--surface-inverted-hover: #363636;
8687
--border-inverted: #363636;
87-
--border-muted: #e4e4e4;
88+
--border-muted: var(--border);
8889
--badge-success-bg: #bbf7d0;
8990
--badge-success-text: #15803d;
91+
/* Shared-component tokens: referenced by @sim/emcn and @sim/workflow-renderer.
92+
Undefined here, a var() silently falls back to currentColor. Values mirror
93+
apps/sim/app/_styles/globals.css. */
94+
--border-success: #e0e0e0;
95+
--success: #22c55e;
96+
--error: #dc2626;
97+
--warning: #ea580c;
98+
--caution: #f59e0b;
99+
--text-placeholder: #8d8d8d;
100+
--badge-teal-bg: #99f6e4;
101+
--badge-teal-text: #0f766e;
102+
--badge-cyan-bg: #cffafe;
103+
--badge-cyan-text: #0891b2;
104+
--badge-pink-bg: #fbcfe8;
105+
--badge-pink-text: #be185d;
106+
--badge-blue-secondary-bg: #bae6fd;
107+
--badge-blue-secondary-text: #0369a1;
90108
--badge-blue-bg: #bfdbfe;
91109
--badge-blue-text: #1d4ed8;
92110
--badge-purple-bg: #e9d5ff;
@@ -116,16 +134,17 @@ body.wp-lightbox-open [aria-label="Ask Sim"] {
116134
--surface-5: #363636;
117135
--surface-6: #454545;
118136
--surface-active: #2c2c2c;
119-
--border: #333333;
120-
--border-1: #3d3d3d;
121-
--divider: #393939;
137+
--border: #444444;
138+
/** Legacy neutral-border aliases. New work should use --border. */
139+
--border-1: var(--border);
122140
--text-primary: #e6e6e6;
123141
--text-secondary: #cccccc;
124142
--text-tertiary: #b3b3b3;
125-
--text-body: #cdcdcd;
126-
--text-muted: #787878;
143+
--text-body: #c1c1c1;
144+
--text-muted: #6e6e6e;
127145
--text-subtle: #7d7d7d;
128-
--text-icon: #a0a0a0;
146+
--text-icon: #969696;
147+
--text-icon-muted: #949494;
129148
--text-inverse: #1b1b1b;
130149
--text-error: #ef4444;
131150
--text-muted-inverse: #b3b3b3;
@@ -135,9 +154,26 @@ body.wp-lightbox-open [aria-label="Ask Sim"] {
135154
--surface-inverted: #242424;
136155
--surface-inverted-hover: #363636;
137156
--border-inverted: #3d3d3d;
138-
--border-muted: #424242;
157+
--border-muted: var(--border);
139158
--badge-success-bg: rgba(34, 197, 94, 0.2);
140159
--badge-success-text: #86efac;
160+
/* Shared-component tokens: referenced by @sim/emcn and @sim/workflow-renderer.
161+
Undefined here, a var() silently falls back to currentColor. Values mirror
162+
apps/sim/app/_styles/globals.css. */
163+
--border-success: #575757;
164+
--success: #22c55e;
165+
--error: #f87171;
166+
--warning: #ff6600;
167+
--caution: #f59e0b;
168+
--text-placeholder: #8d8d8d;
169+
--badge-teal-bg: rgba(20, 184, 166, 0.2);
170+
--badge-teal-text: #5eead4;
171+
--badge-cyan-bg: rgba(14, 165, 233, 0.2);
172+
--badge-cyan-text: #7dd3fc;
173+
--badge-pink-bg: rgba(236, 72, 153, 0.2);
174+
--badge-pink-text: #f9a8d4;
175+
--badge-blue-secondary-bg: rgba(51, 180, 255, 0.2);
176+
--badge-blue-secondary-text: #7dd3fc;
141177
--badge-blue-bg: rgba(59, 130, 246, 0.2);
142178
--badge-blue-text: #93c5fd;
143179
--badge-purple-bg: rgba(168, 85, 247, 0.2);

‎apps/docs/components/ai/ask-ai-panel.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ export function AskAIPanel({ locale, open, onClose }: AskAIPanelProps) {
145145
className={cn(
146146
'space-y-3 text-[var(--text-primary)] text-base leading-relaxed',
147147
'[&_a]:text-[var(--text-primary)] [&_a]:underline [&_a]:decoration-dashed [&_a]:underline-offset-4',
148-
'[&_strong]:font-[600]',
149-
'[&_h1]:font-[600] [&_h2]:font-[600] [&_h3]:font-[600] [&_h4]:font-[600]',
148+
'[&_strong]:font-semibold',
149+
'[&_h1]:font-semibold [&_h2]:font-semibold [&_h3]:font-semibold [&_h4]:font-semibold',
150150
'[&_li]:my-1 [&_ol]:my-3 [&_ol]:list-decimal [&_ol]:pl-5 [&_ul]:my-3 [&_ul]:list-disc [&_ul]:pl-5',
151151
'[&_code]:font-mono [&_pre]:my-3 [&_pre]:overflow-x-auto [&_pre]:rounded-lg [&_pre]:bg-[var(--surface-5)] [&_pre]:p-3 [&_pre]:text-small'
152152
)}

‎apps/docs/components/docs-layout/sidebar-components.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const ITEM_BASE =
5656
const ITEM_ACTIVE_MOBILE = 'bg-[var(--surface-active)] font-medium text-[var(--text-primary)]'
5757

5858
const ITEM_DESKTOP =
59-
'lg:mb-[0.0625rem] lg:block lg:rounded-lg lg:px-2.5 lg:py-1.5 lg:font-normal lg:text-[13px] lg:leading-tight'
59+
'lg:mb-[0.0625rem] lg:block lg:rounded-lg lg:px-2.5 lg:py-1.5 lg:font-normal lg:text-small lg:leading-tight'
6060
const ITEM_TEXT = 'lg:text-[var(--text-body)]'
6161
const ITEM_HOVER = 'lg:hover:bg-[var(--surface-3)]'
6262
const ITEM_ACTIVE = 'lg:bg-[var(--surface-active)] lg:font-normal lg:text-[var(--text-body)]'
@@ -144,7 +144,7 @@ export function SidebarFolder({ item, children }: { item: Folder; children: Reac
144144
'flex flex-1 items-center gap-2 rounded-md px-2 py-1.5 text-sm transition-colors',
145145
'text-[var(--text-muted)] hover:bg-[var(--surface-active)] hover:text-[var(--text-body)]',
146146
active && ITEM_ACTIVE_MOBILE,
147-
'lg:block lg:flex-1 lg:rounded-lg lg:px-2.5 lg:py-1.5 lg:text-[13px] lg:leading-tight',
147+
'lg:block lg:flex-1 lg:rounded-lg lg:px-2.5 lg:py-1.5 lg:text-small lg:leading-tight',
148148
FOLDER_TEXT,
149149
!active && FOLDER_HOVER,
150150
active && FOLDER_ACTIVE
@@ -171,7 +171,7 @@ export function SidebarFolder({ item, children }: { item: Folder; children: Reac
171171
className={cn(
172172
'flex flex-1 items-center gap-2 rounded-md px-2 py-1.5 text-sm transition-colors',
173173
'text-[var(--text-muted)] hover:bg-[var(--surface-active)]',
174-
'lg:flex lg:w-full lg:cursor-pointer lg:items-center lg:justify-between lg:rounded-lg lg:px-2.5 lg:py-1.5 lg:text-left lg:text-[13px] lg:leading-tight',
174+
'lg:flex lg:w-full lg:cursor-pointer lg:items-center lg:justify-between lg:rounded-lg lg:px-2.5 lg:py-1.5 lg:text-left lg:text-small lg:leading-tight',
175175
FOLDER_TEXT,
176176
FOLDER_HOVER
177177
)}
@@ -214,7 +214,7 @@ export function SidebarSeparator({ item }: { item: Separator }) {
214214
<p
215215
className={cn(
216216
'font-medium text-[var(--text-muted)] text-xs',
217-
'lg:font-semibold lg:text-[10px] lg:text-[var(--text-muted)] lg:uppercase lg:tracking-[0.06em]'
217+
'lg:font-semibold lg:text-[var(--text-muted)] lg:text-micro lg:uppercase lg:tracking-[0.06em]'
218218
)}
219219
>
220220
{item.name}

‎apps/docs/components/navbar/navbar.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ export function Navbar() {
7777
className={cn(
7878
'-mb-px relative flex items-center border-b text-[14px] tracking-[-0.01em] transition-colors',
7979
isActive
80-
? 'border-[var(--text-muted)] font-[480] text-[var(--text-primary)]'
81-
: 'border-transparent font-[430] text-[var(--text-muted)] hover:border-[var(--border-1)] hover:text-[var(--text-secondary)]'
80+
? 'border-[var(--text-muted)] font-medium text-[var(--text-primary)]'
81+
: 'border-transparent font-normal text-[var(--text-muted)] hover:border-[var(--border-1)] hover:text-[var(--text-secondary)]'
8282
)}
8383
>
8484
{/* Invisible bold text reserves width to prevent layout shift */}
85-
<span className='invisible font-[480]'>{tab.label}</span>
85+
<span className='invisible font-medium'>{tab.label}</span>
8686
<span className='absolute'>{tab.label}</span>
8787
</Link>
8888
)

‎apps/docs/components/page-type-badge.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export function PageTypeBadge({ type, className }: PageTypeBadgeProps) {
4242
return (
4343
<span
4444
className={cn(
45-
'inline-flex items-center gap-1.5 rounded-md px-[9px] py-0.5 font-medium font-season text-[12px] transition-colors',
45+
'inline-flex items-center gap-1.5 rounded-md px-[9px] py-0.5 font-medium font-season text-caption transition-colors',
4646
config.className,
4747
className
4848
)}

‎apps/docs/components/ui/faq.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function FAQItemRow({
3030
type='button'
3131
onClick={onToggle}
3232
aria-expanded={isOpen}
33-
className='flex w-full cursor-pointer items-center gap-3 px-4 py-2.5 text-left font-[470] text-[0.875rem] text-[var(--text-body)] transition-colors hover:bg-[var(--surface-3)]'
33+
className='flex w-full cursor-pointer items-center gap-3 px-4 py-2.5 text-left font-medium text-[0.875rem] text-[var(--text-body)] transition-colors hover:bg-[var(--surface-3)]'
3434
>
3535
<ChevronRight
3636
className={cn(
@@ -79,7 +79,7 @@ export function FAQ({ items, title = 'Common Questions' }: FAQProps) {
7979
type='application/ld+json'
8080
dangerouslySetInnerHTML={{ __html: serializeJsonLd(faqSchema) }}
8181
/>
82-
<h2 className='mb-4 font-[500] text-xl'>{title}</h2>
82+
<h2 className='mb-4 font-medium text-xl'>{title}</h2>
8383
<div className='border-[var(--border)] border-t border-b'>
8484
{items.map((item, index) => (
8585
<div

‎apps/docs/components/ui/search-trigger.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ export function SearchTrigger() {
3434
<Search className={chipContentIconClass} />
3535
<span>Search&hellip;</span>
3636
<kbd className='ml-auto flex items-center'>
37-
<span className='text-[15px]'>⌘</span>
38-
<span className='text-[12px]'>K</span>
37+
<span className='text-base'>⌘</span>
38+
<span className='text-caption'>K</span>
3939
</kbd>
4040
</button>
4141
)

‎apps/docs/components/ui/video-chapters.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export function VideoChapters({ title = 'Chapters', chapters, className }: Video
4343

4444
return (
4545
<aside className={cn('not-prose', className)}>
46-
<p className='mb-2 px-2.5 font-medium text-[0.8125rem] text-[var(--text-muted)]'>{title}</p>
46+
<p className='mb-2 px-2.5 font-medium text-[var(--text-muted)] text-small'>{title}</p>
4747
<ul className='m-0 flex list-none flex-col gap-0.5 p-0'>
4848
{chapters.map((chapter) => (
4949
<li key={chapter.title}>

‎apps/docs/components/ui/video-placeholder.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ export function VideoPlaceholder({
143143

144144
{/* Top-right status pill — only until a video is wired up */}
145145
{!hasVideo && (
146-
<span className='absolute top-6 right-6 z-10 inline-flex items-center gap-2 rounded-full border border-[var(--border-1)] bg-[var(--surface-2)] px-4 py-2 font-medium text-[12px] text-[var(--text-secondary)] uppercase tracking-[0.14em] md:top-8 md:right-8 dark:bg-[var(--surface-1)]'>
146+
<span className='absolute top-6 right-6 z-10 inline-flex items-center gap-2 rounded-full border border-[var(--border-1)] bg-[var(--surface-2)] px-4 py-2 font-medium text-[var(--text-secondary)] text-caption uppercase tracking-[0.14em] md:top-8 md:right-8 dark:bg-[var(--surface-1)]'>
147147
<span className='size-1.5 rounded-full bg-[var(--brand-accent)]' />
148148
{label}
149149
</span>

‎apps/docs/components/ui/what-you-will-learn.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ interface WhatYouWillLearnProps {
1919
export function WhatYouWillLearn({ items, className }: WhatYouWillLearnProps) {
2020
return (
2121
<div className={cn('not-prose', className)}>
22-
<p className='mb-3 font-medium text-[0.8125rem] text-[var(--text-muted)]'>
23-
What you will learn
24-
</p>
22+
<p className='mb-3 font-medium text-[var(--text-muted)] text-small'>What you will learn</p>
2523
<div className='divide-y divide-[var(--border)]'>
2624
{items.map((item) => (
2725
<div key={item.title} className='py-3.5 first:pt-0 last:pb-0'>

0 commit comments

Comments
 (0)