Skip to content

Commit 22aa2eb

Browse files
committed
Merge remote-tracking branch 'origin/main' into blove/pricing-licensing-journey
# Conflicts: # apps/website/src/styles/marketing.css
2 parents 20ab282 + 5a4a81a commit 22aa2eb

6 files changed

Lines changed: 116 additions & 125 deletions

File tree

apps/website/src/styles/chrome.css

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@
77
* these in @layer would let utilities win and change rendering.
88
*
99
* Migration: docs/superpowers/plans/2026-08-29-inline-style-substrate-migration.md
10-
*
11-
* Font-family exception: see the top of ui.css for the next/font
12-
* shadowing rationale. Verbatim raw-stack literals below
13-
* ('Inter, sans-serif', 'var(--font-mono,"JetBrains Mono",monospace)',
14-
* 'var(--font-garamond,"EB Garamond",Georgia,serif)') are intentional.
10+
* Fonts: unified onto the next/font vars — see the font note atop ui.css.
1511
*/
1612

1713
/* One nav height. The fixed nav measures 58px (px-6 py-4) and 81px at the md
@@ -175,7 +171,7 @@
175171
padding: 10px 0;
176172
font-size: 15px;
177173
font-weight: 500;
178-
font-family: Inter, sans-serif;
174+
font-family: var(--font-inter);
179175
background: transparent;
180176
color: var(--color-text-muted);
181177
border: none;
@@ -210,7 +206,7 @@
210206
line-height: 24px;
211207
min-height: 44px;
212208
text-decoration: none;
213-
font-family: Inter, sans-serif;
209+
font-family: var(--font-inter);
214210
color: var(--color-text-secondary);
215211
background: transparent;
216212
}
@@ -232,7 +228,7 @@
232228
flex: 1;
233229
text-align: center;
234230
padding: 8px 0;
235-
font-family: var(--font-mono,"JetBrains Mono",monospace);
231+
font-family: var(--font-mono);
236232
font-size: 0.75rem;
237233
font-weight: 600;
238234
background: transparent;
@@ -256,7 +252,7 @@
256252
color: var(--color-accent);
257253
background: var(--color-accent-surface);
258254
text-decoration: none;
259-
font-family: Inter, sans-serif;
255+
font-family: var(--font-inter);
260256
font-weight: 600;
261257
}
262258
.nav-mobile-section-toggle {
@@ -271,7 +267,7 @@
271267
padding: 12px 14px;
272268
min-height: 48px;
273269
border-radius: 8px;
274-
font-family: Inter, sans-serif;
270+
font-family: var(--font-inter);
275271
font-size: 16px;
276272
line-height: 24px;
277273
color: var(--color-text-primary);
@@ -293,7 +289,7 @@
293289
min-height: 48px;
294290
color: var(--color-text-secondary);
295291
text-decoration: none;
296-
font-family: Inter, sans-serif;
292+
font-family: var(--font-inter);
297293
}
298294
.nav-mobile-github-link {
299295
display: flex;
@@ -304,7 +300,7 @@
304300
min-height: 48px;
305301
color: var(--color-text-secondary);
306302
text-decoration: none;
307-
font-family: Inter, sans-serif;
303+
font-family: var(--font-inter);
308304
font-size: 16px;
309305
}
310306
.nav-mobile-cta-wrap {
@@ -352,7 +348,7 @@
352348
padding: 4px;
353349
}
354350
.toast-eyebrow {
355-
font-family: var(--font-mono,"JetBrains Mono",monospace);
351+
font-family: var(--font-mono);
356352
font-size: 0.62rem;
357353
text-transform: uppercase;
358354
letter-spacing: 0.1em;
@@ -361,7 +357,7 @@
361357
margin-bottom: 8px;
362358
}
363359
.toast-title {
364-
font-family: var(--font-garamond,"EB Garamond",Georgia,serif);
360+
font-family: var(--font-garamond);
365361
font-size: 1.05rem;
366362
font-weight: 700;
367363
color: var(--color-text-primary);
@@ -383,7 +379,7 @@
383379
background: none;
384380
border: none;
385381
cursor: pointer;
386-
font-family: var(--font-mono,"JetBrains Mono",monospace);
382+
font-family: var(--font-mono);
387383
font-size: 0.68rem;
388384
color: var(--color-text-muted);
389385
text-decoration: underline;
@@ -400,7 +396,7 @@
400396
padding: 8px 12px;
401397
font-size: 0.82rem;
402398
color: var(--color-text-primary);
403-
font-family: Inter, sans-serif;
399+
font-family: var(--font-inter);
404400
outline: none;
405401
margin-bottom: 10px;
406402
}
@@ -413,7 +409,7 @@
413409
font-size: 0.7rem;
414410
color: var(--color-text-muted);
415411
text-decoration: underline;
416-
font-family: Inter, sans-serif;
412+
font-family: var(--font-inter);
417413
}
418414
.toast-success-text {
419415
font-size: 0.85rem;

apps/website/src/styles/docs.css

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
}
6464

6565
.docs-prose [data-rehype-pretty-code-figure] code {
66-
font-family: var(--font-mono), monospace;
66+
font-family: var(--font-mono);
6767
font-size: inherit;
6868
background: none !important;
6969
padding: 0 !important;
@@ -90,7 +90,7 @@
9090
* table columns squeeze below the chip width and wrap `agent` as agen/t. */
9191
word-break: normal;
9292
overflow-wrap: break-word;
93-
font-family: var(--font-mono), monospace;
93+
font-family: var(--font-mono);
9494
font-size: 0.85em;
9595
background: var(--color-accent-surface);
9696
color: var(--color-accent);
@@ -255,7 +255,7 @@
255255
color: var(--color-accent);
256256
}
257257
.ag-ui-arch-box-title {
258-
font-family: "JetBrains Mono", monospace;
258+
font-family: var(--font-mono);
259259
font-size: 0.95rem;
260260
font-weight: 600;
261261
color: var(--color-text-primary);
@@ -360,13 +360,7 @@
360360
/*
361361
* mdx components (components/docs/mdx/*.tsx) — presentation for the MDX
362362
* content components authored inside docs pages.
363-
*
364-
* Font-family exception: see the top of ui.css for the next/font shadowing
365-
* rationale. `tokens.typography.fontSans/fontMono/fontSerif` are raw stacks
366-
* and are copied through verbatim below ('Inter, system-ui, sans-serif',
367-
* '"JetBrains Mono", monospace', '"EB Garamond", Georgia, serif');
368-
* `tokens.typography.body.family` is already `var(--font-inter)` and is
369-
* copied through as the var.
363+
* Fonts: unified onto the next/font vars — see the font note atop ui.css.
370364
*/
371365

372366
/* mdx — Callout */
@@ -408,7 +402,7 @@
408402
height: 20px;
409403
border-radius: var(--radius-full);
410404
color: var(--color-text-inverted);
411-
font-family: "JetBrains Mono", monospace;
405+
font-family: var(--font-mono);
412406
font-size: 11px;
413407
font-weight: 700;
414408
flex-shrink: 0;
@@ -426,7 +420,7 @@
426420
background: var(--color-angular-red);
427421
}
428422
.mdx-callout-title {
429-
font-family: Inter, system-ui, sans-serif;
423+
font-family: var(--font-inter);
430424
font-size: 15px;
431425
color: var(--color-text-primary);
432426
font-weight: 600;
@@ -460,7 +454,7 @@
460454
border-radius: var(--radius-full);
461455
background: var(--color-accent);
462456
color: var(--color-text-inverted);
463-
font-family: "JetBrains Mono", monospace;
457+
font-family: var(--font-mono);
464458
font-size: 14px;
465459
font-weight: 700;
466460
display: inline-flex;
@@ -490,7 +484,7 @@
490484
padding-bottom: 8px;
491485
}
492486
.mdx-step-title {
493-
font-family: Inter, system-ui, sans-serif;
487+
font-family: var(--font-inter);
494488
font-size: 17px;
495489
font-weight: 600;
496490
color: var(--color-text-primary);
@@ -539,7 +533,7 @@
539533
margin-bottom: 6px;
540534
}
541535
.mdx-card-title {
542-
font-family: "EB Garamond", Georgia, serif;
536+
font-family: var(--font-garamond);
543537
font-weight: 700;
544538
font-size: 0.95rem;
545539
color: var(--color-text-primary);
@@ -570,7 +564,7 @@
570564
}
571565
.mdx-tab-button {
572566
padding: 10px 18px;
573-
font-family: "JetBrains Mono", monospace;
567+
font-family: var(--font-mono);
574568
font-size: 0.8rem;
575569
font-weight: 400;
576570
color: var(--color-text-secondary);
@@ -637,7 +631,7 @@
637631
}
638632
.mdx-codegroup-tab {
639633
padding: 8px 14px;
640-
font-family: "JetBrains Mono", monospace;
634+
font-family: var(--font-mono);
641635
font-size: 0.7rem;
642636
font-weight: 400;
643637
color: var(--color-text-secondary);
@@ -698,14 +692,14 @@
698692
margin-bottom: 8px;
699693
}
700694
.mdx-chip-title {
701-
font-family: Inter, system-ui, sans-serif;
695+
font-family: var(--font-inter);
702696
font-size: 13px;
703697
font-weight: 600;
704698
color: var(--color-text-primary);
705699
margin-bottom: 4px;
706700
}
707701
.mdx-chip-signal {
708-
font-family: "JetBrains Mono", monospace;
702+
font-family: var(--font-mono);
709703
font-size: 10px;
710704
color: var(--color-accent);
711705
}
@@ -760,7 +754,7 @@
760754
min-width: 0;
761755
}
762756
.docs-sidebar-lib-trigger-label {
763-
font-family: "JetBrains Mono", monospace;
757+
font-family: var(--font-mono);
764758
font-size: 0.8rem;
765759
}
766760
.docs-sidebar-lib-caret {
@@ -792,7 +786,7 @@
792786
min-width: 0;
793787
}
794788
.docs-sidebar-lib-item-title {
795-
font-family: "JetBrains Mono", monospace;
789+
font-family: var(--font-mono);
796790
font-weight: 600;
797791
color: var(--color-text-primary);
798792
font-size: 0.8rem;
@@ -853,7 +847,7 @@
853847
font-size: 0.8rem;
854848
}
855849
.docs-sidebar-search-kbd {
856-
font-family: "JetBrains Mono", ui-monospace, monospace;
850+
font-family: var(--font-mono);
857851
font-size: 0.65rem;
858852
color: var(--color-text-muted);
859853
background: var(--color-surface-dim);
@@ -1008,7 +1002,7 @@
10081002
/* Typography on the LIST, not the links: the separators are siblings of the
10091003
* links inside each li, and when only the links carried 13px the first two
10101004
* separators inherited body's 16px/24px and floated 3px high (findings §3). */
1011-
font-family: Inter, system-ui, sans-serif;
1005+
font-family: var(--font-inter);
10121006
font-size: 13px;
10131007
line-height: 1.5;
10141008
}
@@ -1042,7 +1036,7 @@
10421036
min-width: 0;
10431037
}
10441038
.docs-page-header-label {
1045-
font-family: "JetBrains Mono", monospace;
1039+
font-family: var(--font-mono);
10461040
font-size: 11px;
10471041
letter-spacing: 0.08em;
10481042
text-transform: uppercase;
@@ -1077,7 +1071,7 @@
10771071
align-items: center;
10781072
gap: 7px;
10791073
padding: 7px 12px;
1080-
font-family: Inter, system-ui, sans-serif;
1074+
font-family: var(--font-inter);
10811075
font-size: 13px;
10821076
font-weight: 500;
10831077
color: var(--color-text-secondary);
@@ -1149,7 +1143,7 @@
11491143
width: 100%;
11501144
text-align: left;
11511145
padding: 8px 12px;
1152-
font-family: Inter, system-ui, sans-serif;
1146+
font-family: var(--font-inter);
11531147
font-size: 13px;
11541148
color: var(--color-text-primary);
11551149
background: transparent;
@@ -1591,7 +1585,7 @@
15911585
margin-bottom: 8px;
15921586
}
15931587
.docs-prevnext-title {
1594-
font-family: Inter, system-ui, sans-serif;
1588+
font-family: var(--font-inter);
15951589
font-size: 16px;
15961590
font-weight: 600;
15971591
color: var(--color-accent);

0 commit comments

Comments
 (0)