Bundle: Geist fonts, cn() extraction, and design-system doc/token pins (#2432 + #2430 + #2440 + #2431 + #2438) - #2432

Merged

BigSimmo merged 37 commits into

mainfrom

cursor/vendor-geist-021e

Aug 27, 2026

Commits on Aug 27, 2026

fix(ui): raise remaining interactive tap floors

BigSimmo
and
cursoragent
committed
b5d46b3
feat(design-system): compact-meta density policy

BigSimmo
and
cursoragent
committed
6d693e7
refactor(ui): adopt PageHeader on mode pages and Button in sidebar

BigSimmo
and
cursoragent
committed
1fa1ef2
fix(design-system): TSX ratchets (color exemption, type map, spacing)

BigSimmo
and
cursoragent
committed
3948b7a
fix(ui): tokenise globals motion/z, Ward PRM, hash scroll clamp

BigSimmo
and
cursoragent
committed
012821f
Merge branch 'claude/ds-h36-compact-meta' into claude/ds-h36-baseline
BigSimmo
committed
dc85af7
Merge branch 'claude/ds-h36-page-header' into claude/ds-h36-baseline
BigSimmo
committed
374c8d0
Merge branch 'claude/ds-h36-tsx-ratchets' into claude/ds-h36-baseline
BigSimmo
committed
75085f9
Merge branch 'claude/ds-h36-motion-scroll' into claude/ds-h36-baseline
BigSimmo
committed
63b9f34
chore(design-system): refresh contract baseline and adoption

BigSimmo
and
cursoragent
committed
6a72654
test(design-system): pin v2 --text-sm to @theme --text-sm-minus at 13px

cursoragent
and
BigSimmo
committed
d0455d2
docs(design-system): record production text-sm as 13px, not Tailwind 14px

cursoragent
and
BigSimmo
committed
e509265
Merge branch 'main' into claude/ds-h36-baseline
BigSimmo
authored
62f234f
test(design-system): fail closed if the @theme block has no closer

cursoragent
and
BigSimmo
committed
a92a774
fix(fonts): vendor Geist latin WOFF2 instead of next-devtools

cursoragent
and
BigSimmo
committed
84d6fb3
fix(fonts): declare Geist variable weight range 100-900

cursoragent
and
BigSimmo
committed
a396aa5
Merge branch 'main' into claude/ds-h36-baseline
claude
committed
7ab5662
Correct stale Dictionary header recommendation in mockups/README.md
claude
committed
c4c5dcc
Merge branch 'main' into claude/organize-remote-mockups-15wshq
BigSimmo
authored
759747f
fix: reconcile the branch with what actually landed on main
claude
committed
c046d3c
docs(design-system): align SPEC, GATES, and conventions with live type tokens

cursoragent
and
BigSimmo
committed
8c6c249
Merge branch 'main' into claude/ds-h36-baseline
claude
committed
525492b
Merge branch 'main' into claude/ds-h36-baseline
claude
committed
e691247
test(design-system): reject token-shaped per-step type companions

cursoragent
and
BigSimmo
committed
e6c4dd1
Merge origin/main into cursor/fix-ds-sot-drift-b22d

cursoragent
and
BigSimmo
committed
bdd50c6
Merge branch 'main' into cursor/type-catalog-pin-b8b8
BigSimmo
authored
4d7421c
Merge branch 'main' into cursor/vendor-geist-021e
BigSimmo
authored
1284e12
Merge remote-tracking branch 'origin/cursor/type-catalog-pin-b8b8' into bundle-ds
claude
committed
891bcac
Merge remote-tracking branch 'origin/pr-2429' into bundle-ds
claude
committed
4fc120b
Merge remote-tracking branch 'origin/claude/organize-remote-mockups-15wshq' into bundle-ds
claude
committed
1dc0535
refactor(ui): extract cn() into src/lib/cn.ts
claude
committed
327dd4a
Merge remote-tracking branch 'origin/main' into bundle-ds
claude
committed
acc5fff
Merge remote-tracking branch 'origin/main' into bundle-fe
claude
committed
d18b3a2
Merge remote-tracking branch 'origin/cursor/fix-ds-sot-drift-b22d' into bundle-fe
claude
committed
6953e33
Merge branch 'main' into cursor/vendor-geist-021e
BigSimmo
authored
4a3f08c
Merge remote-tracking branch 'origin/main' into cursor/vendor-geist-021e
claude
committed
04d1e1f
Merge branch 'main' into cursor/vendor-geist-021e
BigSimmo
authored
3305f5f