Repository navigation
refactor(design-system): move the brand layer into the package - #14790
christian-byrne merged 6 commits into
Conversation
Brand colours and the brand typeface were declared in three places at once — _palette.css, style.css and the website's own @theme — so the same value existed under different names with nothing keeping them equal. Collapse them into a single brand layer the package owns. - _brand.css holds every brand colour and both brand font tokens - brand-fonts.css holds the PP Formula faces, loaded by base.css only - base.css is now the brand surface; style.css is base plus product - the website declares site-specific values and nothing else - 82 mauve stroke literals, 12 PP Formula literals and the dead Google Fonts Inter import are gone - brandColors.test.ts fails if any token is declared in two of the three files
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: ASSERTIVE Plan: Pro Plus Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Comment |
🎭 Playwright: ✅ 1982 passed, 0 failed · 1 flaky📊 Browser Reports
🎨 Storybook: ✅ Built — View Storybook📦 Bundle Size
⚡ Performance Report
Absolute values
Raw data{
"timestamp": "2026-08-23T01:30:20.811Z",
"gitSha": "85ad0cd4fefee3e39a57acb995ac24edc4a7cc8d",
"branch": "glary/design-system-consolidate-brand",
"measurements": [
{
"name": "canvas-idle",
"durationMs": 2034.2789999999695,
"styleRecalcs": 8,
"styleRecalcDurationMs": 7.4079999999999995,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 475.862,
"heapDeltaBytes": 19973668,
"heapUsedBytes": 81729892,
"domNodes": -283,
"jsHeapTotalBytes": 3923968,
"scriptDurationMs": 6.478,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.670000000000012,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "canvas-idle",
"durationMs": 2032.5740000000678,
"styleRecalcs": 7,
"styleRecalcDurationMs": 6.016000000000001,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 475.938,
"heapDeltaBytes": -3612000,
"heapUsedBytes": 58033272,
"domNodes": -285,
"jsHeapTotalBytes": 4448256,
"scriptDurationMs": 5.95,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-mouse-sweep",
"durationMs": 1773.4329999999545,
"styleRecalcs": 72,
"styleRecalcDurationMs": 33.214999999999996,
"layouts": 12,
"layoutDurationMs": 3.124,
"taskDurationMs": 840.9499999999999,
"heapDeltaBytes": -5648868,
"heapUsedBytes": 57102972,
"domNodes": -281,
"jsHeapTotalBytes": 5234688,
"scriptDurationMs": 111.53200000000001,
"eventListeners": -153,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "canvas-mouse-sweep",
"durationMs": 1873.9309999999705,
"styleRecalcs": 74,
"styleRecalcDurationMs": 37.667,
"layouts": 12,
"layoutDurationMs": 3.746,
"taskDurationMs": 875.958,
"heapDeltaBytes": -4089144,
"heapUsedBytes": 57841940,
"domNodes": -283,
"jsHeapTotalBytes": 4972544,
"scriptDurationMs": 108.596,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "canvas-zoom-sweep",
"durationMs": 1723.0689999999527,
"styleRecalcs": 30,
"styleRecalcDurationMs": 18.069000000000003,
"layouts": 6,
"layoutDurationMs": 0.604,
"taskDurationMs": 362.174,
"heapDeltaBytes": 3023960,
"heapUsedBytes": 64767320,
"domNodes": 76,
"jsHeapTotalBytes": 4718592,
"scriptDurationMs": 9.402,
"eventListeners": 19,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "canvas-zoom-sweep",
"durationMs": 1730.3470000000516,
"styleRecalcs": 32,
"styleRecalcDurationMs": 16.944,
"layouts": 6,
"layoutDurationMs": 0.644,
"taskDurationMs": 358.861,
"heapDeltaBytes": 2906012,
"heapUsedBytes": 65630844,
"domNodes": 75,
"jsHeapTotalBytes": 4456448,
"scriptDurationMs": 10.497,
"eventListeners": 19,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "dom-widget-clipping",
"durationMs": 683.0730000000358,
"styleRecalcs": 9,
"styleRecalcDurationMs": 6.424000000000001,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 399.6190000000001,
"heapDeltaBytes": 10384376,
"heapUsedBytes": 72387960,
"domNodes": 14,
"jsHeapTotalBytes": 4718592,
"scriptDurationMs": 58.037000000000006,
"eventListeners": 0,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "dom-widget-clipping",
"durationMs": 576.4039999999113,
"styleRecalcs": 10,
"styleRecalcDurationMs": 6.586999999999999,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 362.722,
"heapDeltaBytes": 10377392,
"heapUsedBytes": 71577252,
"domNodes": 16,
"jsHeapTotalBytes": 5242880,
"scriptDurationMs": 57.751999999999995,
"eventListeners": 2,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "large-graph-idle",
"durationMs": 2021.065999999962,
"styleRecalcs": 9,
"styleRecalcDurationMs": 7.771,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 596.224,
"heapDeltaBytes": -14147696,
"heapUsedBytes": 62691240,
"domNodes": -281,
"jsHeapTotalBytes": 3657728,
"scriptDurationMs": 15.988,
"eventListeners": -179,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-idle",
"durationMs": 2037.5859999999193,
"styleRecalcs": 9,
"styleRecalcDurationMs": 8.911999999999999,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 619.271,
"heapDeltaBytes": -4029744,
"heapUsedBytes": 72926072,
"domNodes": -273,
"jsHeapTotalBytes": -12288,
"scriptDurationMs": 13.945999999999996,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333335,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-pan",
"durationMs": 2224.6240000000057,
"styleRecalcs": 69,
"styleRecalcDurationMs": 13.444,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1193.585,
"heapDeltaBytes": -5713160,
"heapUsedBytes": 71920576,
"domNodes": -273,
"jsHeapTotalBytes": -573440,
"scriptDurationMs": 333.749,
"eventListeners": -149,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333335,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "large-graph-pan",
"durationMs": 2195.705999999973,
"styleRecalcs": 69,
"styleRecalcDurationMs": 14.943999999999999,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1247.193,
"heapDeltaBytes": -14229476,
"heapUsedBytes": 63393252,
"domNodes": -284,
"jsHeapTotalBytes": 3657728,
"scriptDurationMs": 337.325,
"eventListeners": -179,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-zoom",
"durationMs": 3202.539999999999,
"styleRecalcs": 64,
"styleRecalcDurationMs": 13.852000000000004,
"layouts": 60,
"layoutDurationMs": 6.944000000000001,
"taskDurationMs": 1408.093,
"heapDeltaBytes": -1429732,
"heapUsedBytes": 77230600,
"domNodes": -275,
"jsHeapTotalBytes": -1847296,
"scriptDurationMs": 389.904,
"eventListeners": -147,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "large-graph-zoom",
"durationMs": 3181.7310000000134,
"styleRecalcs": 63,
"styleRecalcDurationMs": 13.092999999999996,
"layouts": 60,
"layoutDurationMs": 7.034000000000001,
"taskDurationMs": 1403.586,
"heapDeltaBytes": -1091488,
"heapUsedBytes": 77799816,
"domNodes": -276,
"jsHeapTotalBytes": -3158016,
"scriptDurationMs": 388.374,
"eventListeners": -147,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "legacy-node-drag",
"durationMs": 2217.4019999999928,
"styleRecalcs": 46,
"styleRecalcDurationMs": 10.189,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1426.921,
"heapDeltaBytes": 11157720,
"heapUsedBytes": 90736584,
"domNodes": 12,
"jsHeapTotalBytes": 7532544,
"scriptDurationMs": 460.924,
"eventListeners": 186,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "legacy-node-drag",
"durationMs": 2354.049000000032,
"styleRecalcs": 46,
"styleRecalcDurationMs": 9.866,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 1502.397,
"heapDeltaBytes": -15672736,
"heapUsedBytes": 64649128,
"domNodes": -247,
"jsHeapTotalBytes": -274432,
"scriptDurationMs": 461.82700000000006,
"eventListeners": 31,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "minimap-idle",
"durationMs": 2038.0460000000085,
"styleRecalcs": 9,
"styleRecalcDurationMs": 7.588999999999999,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 590.048,
"heapDeltaBytes": -13886316,
"heapUsedBytes": 63894236,
"domNodes": -282,
"jsHeapTotalBytes": 3395584,
"scriptDurationMs": 12.714000000000002,
"eventListeners": -179,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.699999999999818
},
{
"name": "minimap-idle",
"durationMs": 2030.6130000000167,
"styleRecalcs": 8,
"styleRecalcDurationMs": 7.032,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 598.035,
"heapDeltaBytes": -13134588,
"heapUsedBytes": 70249568,
"domNodes": -281,
"jsHeapTotalBytes": 4968448,
"scriptDurationMs": 15.526000000000002,
"eventListeners": -147,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "subgraph-dom-widget-clipping",
"durationMs": 577.9600000000187,
"styleRecalcs": 46,
"styleRecalcDurationMs": 10.086,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 377.58599999999996,
"heapDeltaBytes": 11823232,
"heapUsedBytes": 74275616,
"domNodes": 18,
"jsHeapTotalBytes": 5505024,
"scriptDurationMs": 114.146,
"eventListeners": 8,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-dom-widget-clipping",
"durationMs": 591.4970000000039,
"styleRecalcs": 46,
"styleRecalcDurationMs": 10.525000000000002,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 385.44500000000005,
"heapDeltaBytes": 11634552,
"heapUsedBytes": 74014472,
"domNodes": 18,
"jsHeapTotalBytes": 5505024,
"scriptDurationMs": 118.77600000000001,
"eventListeners": 8,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-idle",
"durationMs": 2010.2940000000444,
"styleRecalcs": 7,
"styleRecalcDurationMs": 5.140000000000001,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 480.11899999999997,
"heapDeltaBytes": 19160748,
"heapUsedBytes": 81720608,
"domNodes": -284,
"jsHeapTotalBytes": 4448256,
"scriptDurationMs": 6.155999999999998,
"eventListeners": -153,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-idle",
"durationMs": 2020.7849999999326,
"styleRecalcs": 9,
"styleRecalcDurationMs": 8.125,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 471.92100000000005,
"heapDeltaBytes": -2311124,
"heapUsedBytes": 60015828,
"domNodes": -282,
"jsHeapTotalBytes": 4448256,
"scriptDurationMs": 5.803000000000001,
"eventListeners": -149,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333335,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "subgraph-mouse-sweep",
"durationMs": 1738.6129999999866,
"styleRecalcs": 77,
"styleRecalcDurationMs": 37.641999999999996,
"layouts": 16,
"layoutDurationMs": 4.554,
"taskDurationMs": 835.016,
"heapDeltaBytes": 6394460,
"heapUsedBytes": 69044368,
"domNodes": -281,
"jsHeapTotalBytes": 4972544,
"scriptDurationMs": 91.996,
"eventListeners": -183,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-mouse-sweep",
"durationMs": 1726.5499999999747,
"styleRecalcs": 76,
"styleRecalcDurationMs": 34.876000000000005,
"layouts": 16,
"layoutDurationMs": 4.715999999999999,
"taskDurationMs": 809.424,
"heapDeltaBytes": -3960968,
"heapUsedBytes": 58092620,
"domNodes": -282,
"jsHeapTotalBytes": 5496832,
"scriptDurationMs": 84.422,
"eventListeners": -151,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.800000000000182
},
{
"name": "subgraph-transition-enter",
"durationMs": 1383.2069999999703,
"styleRecalcs": 17,
"styleRecalcDurationMs": 31.084000000000007,
"layouts": 12,
"layoutDurationMs": 14.127999999999998,
"taskDurationMs": 887.3239999999997,
"heapDeltaBytes": 23843848,
"heapUsedBytes": 98425560,
"domNodes": 13673,
"jsHeapTotalBytes": 12845056,
"scriptDurationMs": 16.698000000000004,
"eventListeners": 2373,
"totalBlockingTimeMs": 141,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "viewport-pan-sweep",
"durationMs": 8328.178999999978,
"styleRecalcs": 251,
"styleRecalcDurationMs": 37.507,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 4171.03,
"heapDeltaBytes": 4881680,
"heapUsedBytes": 81653108,
"domNodes": -236,
"jsHeapTotalBytes": -311296,
"scriptDurationMs": 1077.0689999999997,
"eventListeners": -135,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333332,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "viewport-pan-sweep",
"durationMs": 8493.107000000009,
"styleRecalcs": 250,
"styleRecalcDurationMs": 37.51199999999999,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 4425.048000000001,
"heapDeltaBytes": 2408380,
"heapUsedBytes": 79409772,
"domNodes": -272,
"jsHeapTotalBytes": -573440,
"scriptDurationMs": 1080.4389999999999,
"eventListeners": -135,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "vue-large-graph-idle",
"durationMs": 16834.84900000002,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 16108.477999999997,
"heapDeltaBytes": -43913392,
"heapUsedBytes": 176557952,
"domNodes": -8312,
"jsHeapTotalBytes": -23990272,
"scriptDurationMs": 107.322,
"eventListeners": -16389,
"totalBlockingTimeMs": 0,
"frameDurationMs": 17.776666666666642,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "vue-large-graph-idle",
"durationMs": 16848.33500000002,
"styleRecalcs": 0,
"styleRecalcDurationMs": 0,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 16314.880000000003,
"heapDeltaBytes": -47827096,
"heapUsedBytes": 177994680,
"domNodes": -8312,
"jsHeapTotalBytes": -15249408,
"scriptDurationMs": 102.651,
"eventListeners": -16391,
"totalBlockingTimeMs": 0,
"frameDurationMs": 17.219999999999953,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "vue-large-graph-pan",
"durationMs": 20269.241000000024,
"styleRecalcs": 168,
"styleRecalcDurationMs": 16.573999999999977,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 19745.574,
"heapDeltaBytes": -40267124,
"heapUsedBytes": 180175072,
"domNodes": -8312,
"jsHeapTotalBytes": -26681344,
"scriptDurationMs": 445.38700000000006,
"eventListeners": -16389,
"totalBlockingTimeMs": 83,
"frameDurationMs": 17.780000000000047,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "vue-large-graph-pan",
"durationMs": 20456.133000000023,
"styleRecalcs": 170,
"styleRecalcDurationMs": 15.973000000000015,
"layouts": 0,
"layoutDurationMs": 0,
"taskDurationMs": 19859.085,
"heapDeltaBytes": -47606164,
"heapUsedBytes": 172845156,
"domNodes": -8312,
"jsHeapTotalBytes": -25124864,
"scriptDurationMs": 385.436,
"eventListeners": -16389,
"totalBlockingTimeMs": 36,
"frameDurationMs": 17.77333333333336,
"p95FrameDurationMs": 16.799999999999272
},
{
"name": "workflow-execution",
"durationMs": 110.02899999994042,
"styleRecalcs": 9,
"styleRecalcDurationMs": 14.106,
"layouts": 2,
"layoutDurationMs": 0.4549999999999999,
"taskDurationMs": 75.88399999999999,
"heapDeltaBytes": 3167412,
"heapUsedBytes": 65569844,
"domNodes": 114,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 7.6000000000000005,
"eventListeners": 49,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.666666666666668,
"p95FrameDurationMs": 16.700000000000728
},
{
"name": "workflow-execution",
"durationMs": 452.4210000000721,
"styleRecalcs": 13,
"styleRecalcDurationMs": 17.922,
"layouts": 3,
"layoutDurationMs": 0.568,
"taskDurationMs": 101.893,
"heapDeltaBytes": 4932560,
"heapUsedBytes": 67399764,
"domNodes": 123,
"jsHeapTotalBytes": 0,
"scriptDurationMs": 6.446999999999999,
"eventListeners": 97,
"totalBlockingTimeMs": 0,
"frameDurationMs": 16.66333333333335,
"p95FrameDurationMs": 16.699999999999818
}
]
} |
🌐 Website E2ETip All tests passed.
🔗 Website PreviewWebsite Preview: https://comfy-website-preview-pr-14790.vercel.app This commit: https://website-frontend-5304ors1b-comfyui.vercel.app Last updated: 2026-08-23T01:18:55Z for |
The colour scan only matched literal syntax, so fill="gold" in a brand asset was invisible to both helpers — including the guard that exists to report a colour it cannot read. Read the paint attributes directly instead: their value is a colour unless it is one of the few non-colour keywords, so anything left that does not parse is reported. Verified by injecting fill="gold" into favicon.svg — the suite fails.
Codecov Report❌ Patch coverage is
@@ Coverage Diff @@
## glary/design-system-brand-yellow-f2ff59 #14790 +/- ##
===========================================================================
- Coverage 79.39% 79.38% -0.01%
===========================================================================
Files 2218 2218
Lines 112266 112265 -1
Branches 32457 36764 +4307
===========================================================================
- Hits 89131 89125 -6
- Misses 22653 22661 +8
+ Partials 482 479 -3
Flags with carried forward coverage won't be shown. Click here to find out more.
... and 8 files with indirect coverage changes 🚀 New features to boost your workflow:
|
…-f2ff59' into glary/design-system-consolidate-brand
…-f2ff59' into glary/design-system-consolidate-brand
benceruleanlu
left a comment
There was a problem hiding this comment.
Approving directionally, but can you just take a look to see whether or not we want to actually follow SemVer? Because if we're following SemVer, we made breaking changes, and so maybe we want to bump it to 2.0 instead of 1.1? Up to you.
christian-byrne
left a comment
There was a problem hiding this comment.
Fix merge conflicts.
…-f2ff59' into glary/design-system-consolidate-brand # Conflicts: # apps/website/src/data/brandColors.test.ts
…-f2ff59' into glary/design-system-consolidate-brand
|
Refreshed on top of the updated #14484 branch — clean merge, no conflicts. Head is now This should clear the red Gates green: typecheck, lint, format:check, knip. Still approved, still stacked — merges as soon as 14484 lands. |
Full context for agent readers
The blocking gate is land order, not Codecov: target PR #14484 is still open, Next action remains with DrJKL as #14484's assignee. No queue action was applied. |
ac4dd38
into
glary/design-system-brand-yellow-f2ff59
Stacked on #14484. That PR stops surfaces from restating token values; this one moves the brand layer itself into the package, so there is a single file that owns every brand colour and the brand typeface. - **What**: `_brand.css` (all brand colours + both brand font tokens) and `brand-fonts.css` (the PP Formula faces). `base.css` becomes the brand surface — brand, brand fonts, shared ramps; `style.css` is that plus everything product. `apps/website/src/styles/global.css` drops the 10 brand colours, the 6 PP Formula `@font-face` blocks, both font tokens and the dead Google Fonts Inter import, keeping only site-specific values. 82 mauve stroke literals across three HeroSections, 12 PP Formula literals in `HubspotFormEmbed` and `404.astro`, and the `--brand-yellow` indirection in `style.css` are gone. - **Breaking**: `_palette.css` no longer carries brand tokens and `base.css` no longer loads Inter. Nothing consumes either today — checked. `platform` imports `_palette.css` for the neutral ramps only, and the website never used Inter (its body is `font-formula`), which is what made the Google Fonts import dead. Version bumped to `1.1.0`; platform should move its import to `base.css` when it takes the upgrade. **Why the brand yellow could drift at all.** It was declared in three places under different names, so no single change could keep them equal. The same was true of `--font-formula`, and worse: `_palette.css` said `'PP Formula', 'Inter', sans-serif` while the website said `'PP Formula', sans-serif`, and the website silently won. I kept the Inter fallback in the unified token, because the app bundles only three of the six PP Formula weights (`src/platform/cloud/onboarding/assets`) and leans on Inter for the rest. On comfy.org the fallback is inert — no Inter is served there — so rendering is unchanged on both surfaces. **The test is the part that lasts.** `brandColors.test.ts` now fails if any `--color-*` or `--font-*` token is declared in more than one of `_brand.css`, `_palette.css`, and the website's `@theme`. Documentation alone would not have prevented this; the second declaration always looks reasonable in isolation. **SVG strokes went to utility classes, not `var()`.** `stroke="#4D3762"` became `class="stroke-secondary-mauve"` rather than `stroke="var(--color-secondary-mauve)"` — substitution in SVG presentation attributes was only resolved into SVG2 in Nov 2025 and Chromium is uneven. The two occurrences inside `@keyframes` are real declarations, so those use `var()`. **Verification.** Diffed every emitted `--color-*` / `--font-*` in the built website CSS against the pre-change build: same 34 tokens, same values, only ordering differs plus the intended Inter fallback. Converted stroke counts match one-for-one in the built HTML (cloud 36, cloud/enterprise 39, download 5, zero leftover attributes). Both builds still resolve the full yellow chain to `#f2ff59`, all six PP Formula faces are present in the output, and no `fonts.googleapis` reference survives anywhere in `dist`. Gates: `lint` (0 errors), `format:check`, `typecheck`, `typecheck:website` (0 errors), `knip`, website build (581 pages), 345 website tests, 672 tests across `src/platform/cloud`, `packages/shared-frontend-utils` and `src/components/ui`. **Answers Alexis's question in-repo.** The README now says outright that the package holds two design systems, that the file is what distinguishes them, and that no naming convention reliably does — several token names predate the split. `primary-` is still overloaded across app-semantic roles and brand colours, and `plum-600` / `primary-comfy-plum` remain the same hex under two names. Renaming them is deliberately not in this PR; it is a breaking change for consumers and wants its own decision. **Deliberately left alone.** `--text-2xs` still disagrees between `style.css` (`0.625rem`) and the website (`0.6875rem`). The website's value wins on comfy.org, so aligning it is a visible type change across the site — a designer's call, not a refactor's. The duplicate-declaration test is scoped to the files `base.css` actually pulls in, so it does not paper over this.
Stacked on #14484. That PR stops surfaces from restating token values; this one moves the brand layer itself into the package, so there is a single file that owns every brand colour and the brand typeface. - **What**: `_brand.css` (all brand colours + both brand font tokens) and `brand-fonts.css` (the PP Formula faces). `base.css` becomes the brand surface — brand, brand fonts, shared ramps; `style.css` is that plus everything product. `apps/website/src/styles/global.css` drops the 10 brand colours, the 6 PP Formula `@font-face` blocks, both font tokens and the dead Google Fonts Inter import, keeping only site-specific values. 82 mauve stroke literals across three HeroSections, 12 PP Formula literals in `HubspotFormEmbed` and `404.astro`, and the `--brand-yellow` indirection in `style.css` are gone. - **Breaking**: `_palette.css` no longer carries brand tokens and `base.css` no longer loads Inter. Nothing consumes either today — checked. `platform` imports `_palette.css` for the neutral ramps only, and the website never used Inter (its body is `font-formula`), which is what made the Google Fonts import dead. Version bumped to `1.1.0`; platform should move its import to `base.css` when it takes the upgrade. **Why the brand yellow could drift at all.** It was declared in three places under different names, so no single change could keep them equal. The same was true of `--font-formula`, and worse: `_palette.css` said `'PP Formula', 'Inter', sans-serif` while the website said `'PP Formula', sans-serif`, and the website silently won. I kept the Inter fallback in the unified token, because the app bundles only three of the six PP Formula weights (`src/platform/cloud/onboarding/assets`) and leans on Inter for the rest. On comfy.org the fallback is inert — no Inter is served there — so rendering is unchanged on both surfaces. **The test is the part that lasts.** `brandColors.test.ts` now fails if any `--color-*` or `--font-*` token is declared in more than one of `_brand.css`, `_palette.css`, and the website's `@theme`. Documentation alone would not have prevented this; the second declaration always looks reasonable in isolation. **SVG strokes went to utility classes, not `var()`.** `stroke="#4D3762"` became `class="stroke-secondary-mauve"` rather than `stroke="var(--color-secondary-mauve)"` — substitution in SVG presentation attributes was only resolved into SVG2 in Nov 2025 and Chromium is uneven. The two occurrences inside `@keyframes` are real declarations, so those use `var()`. **Verification.** Diffed every emitted `--color-*` / `--font-*` in the built website CSS against the pre-change build: same 34 tokens, same values, only ordering differs plus the intended Inter fallback. Converted stroke counts match one-for-one in the built HTML (cloud 36, cloud/enterprise 39, download 5, zero leftover attributes). Both builds still resolve the full yellow chain to `#f2ff59`, all six PP Formula faces are present in the output, and no `fonts.googleapis` reference survives anywhere in `dist`. Gates: `lint` (0 errors), `format:check`, `typecheck`, `typecheck:website` (0 errors), `knip`, website build (581 pages), 345 website tests, 672 tests across `src/platform/cloud`, `packages/shared-frontend-utils` and `src/components/ui`. **Answers Alexis's question in-repo.** The README now says outright that the package holds two design systems, that the file is what distinguishes them, and that no naming convention reliably does — several token names predate the split. `primary-` is still overloaded across app-semantic roles and brand colours, and `plum-600` / `primary-comfy-plum` remain the same hex under two names. Renaming them is deliberately not in this PR; it is a breaking change for consumers and wants its own decision. **Deliberately left alone.** `--text-2xs` still disagrees between `style.css` (`0.625rem`) and the website (`0.6875rem`). The website's value wins on comfy.org, so aligning it is a visible type change across the site — a designer's call, not a refactor's. The duplicate-declaration test is scoped to the files `base.css` actually pulls in, so it does not paper over this.
Stacked on #14484. That PR stops surfaces from restating token values; this one moves the brand layer itself into the package, so there is a single file that owns every brand colour and the brand typeface. - **What**: `_brand.css` (all brand colours + both brand font tokens) and `brand-fonts.css` (the PP Formula faces). `base.css` becomes the brand surface — brand, brand fonts, shared ramps; `style.css` is that plus everything product. `apps/website/src/styles/global.css` drops the 10 brand colours, the 6 PP Formula `@font-face` blocks, both font tokens and the dead Google Fonts Inter import, keeping only site-specific values. 82 mauve stroke literals across three HeroSections, 12 PP Formula literals in `HubspotFormEmbed` and `404.astro`, and the `--brand-yellow` indirection in `style.css` are gone. - **Breaking**: `_palette.css` no longer carries brand tokens and `base.css` no longer loads Inter. Nothing consumes either today — checked. `platform` imports `_palette.css` for the neutral ramps only, and the website never used Inter (its body is `font-formula`), which is what made the Google Fonts import dead. Version bumped to `1.1.0`; platform should move its import to `base.css` when it takes the upgrade. **Why the brand yellow could drift at all.** It was declared in three places under different names, so no single change could keep them equal. The same was true of `--font-formula`, and worse: `_palette.css` said `'PP Formula', 'Inter', sans-serif` while the website said `'PP Formula', sans-serif`, and the website silently won. I kept the Inter fallback in the unified token, because the app bundles only three of the six PP Formula weights (`src/platform/cloud/onboarding/assets`) and leans on Inter for the rest. On comfy.org the fallback is inert — no Inter is served there — so rendering is unchanged on both surfaces. **The test is the part that lasts.** `brandColors.test.ts` now fails if any `--color-*` or `--font-*` token is declared in more than one of `_brand.css`, `_palette.css`, and the website's `@theme`. Documentation alone would not have prevented this; the second declaration always looks reasonable in isolation. **SVG strokes went to utility classes, not `var()`.** `stroke="#4D3762"` became `class="stroke-secondary-mauve"` rather than `stroke="var(--color-secondary-mauve)"` — substitution in SVG presentation attributes was only resolved into SVG2 in Nov 2025 and Chromium is uneven. The two occurrences inside `@keyframes` are real declarations, so those use `var()`. **Verification.** Diffed every emitted `--color-*` / `--font-*` in the built website CSS against the pre-change build: same 34 tokens, same values, only ordering differs plus the intended Inter fallback. Converted stroke counts match one-for-one in the built HTML (cloud 36, cloud/enterprise 39, download 5, zero leftover attributes). Both builds still resolve the full yellow chain to `#f2ff59`, all six PP Formula faces are present in the output, and no `fonts.googleapis` reference survives anywhere in `dist`. Gates: `lint` (0 errors), `format:check`, `typecheck`, `typecheck:website` (0 errors), `knip`, website build (581 pages), 345 website tests, 672 tests across `src/platform/cloud`, `packages/shared-frontend-utils` and `src/components/ui`. **Answers Alexis's question in-repo.** The README now says outright that the package holds two design systems, that the file is what distinguishes them, and that no naming convention reliably does — several token names predate the split. `primary-` is still overloaded across app-semantic roles and brand colours, and `plum-600` / `primary-comfy-plum` remain the same hex under two names. Renaming them is deliberately not in this PR; it is a breaking change for consumers and wants its own decision. **Deliberately left alone.** `--text-2xs` still disagrees between `style.css` (`0.625rem`) and the website (`0.6875rem`). The website's value wins on comfy.org, so aligning it is a visible type change across the site — a designer's call, not a refactor's. The duplicate-declaration test is scoped to the files `base.css` actually pulls in, so it does not paper over this.
…brand-layer verdict (Comfy-Org#16796) Docs-only follow-up answering the SemVer question raised on Comfy-Org#14790. **Verdict: the brand-layer move is breaking, and the first release carrying it must be `2.0.0`.** Key facts: - The change removes brand tokens from `_palette.css` and stops `base.css` from loading Inter, changing the package's public styling surface. - `@comfyorg/design-system@1.1.0` was published from `main` on 2026-09-05 without the brand-layer move. - Comfy-Org#14790 remains outside `main`, so its old in-tree `1.1.0` version does not establish a published precedent for the move. - When the brand-layer stack lands, the release carrying that breaking change must be a major bump from the shipped 1.x line. This PR records the policy (exports are part of the public SemVer surface; removing tokens, `@font-face` rules, or exported files is breaking) and the current release precedent in the README's `Releasing` section. It does not change package code or the package version. ## Verification - `npm view @comfyorg/design-system version` reports `1.1.0`. - `main` currently declares `1.1.0` in `packages/design-system/package.json`. - The PR diff is limited to `packages/design-system/README.md`. <!-- authored-by:agent lane-srx-35-1653 --> --------- Co-authored-by: Ryan Di <ryan.weihao.di@gmail.com>
Summary
Stacked on #14484. That PR stops surfaces from restating token values; this one moves the brand layer itself into the package, so there is a single file that owns every brand colour and the brand typeface.
Changes
_brand.css(all brand colours + both brand font tokens) andbrand-fonts.css(the PP Formula faces).base.cssbecomes the brand surface — brand, brand fonts, shared ramps;style.cssis that plus everything product.apps/website/src/styles/global.cssdrops the 10 brand colours, the 6 PP Formula@font-faceblocks, both font tokens and the dead Google Fonts Inter import, keeping only site-specific values. 82 mauve stroke literals across three HeroSections, 12 PP Formula literals inHubspotFormEmbedand404.astro, and the--brand-yellowindirection instyle.cssare gone._palette.cssno longer carries brand tokens andbase.cssno longer loads Inter. Nothing consumes either today — checked.platformimports_palette.cssfor the neutral ramps only, and the website never used Inter (its body isfont-formula), which is what made the Google Fonts import dead. Version bumped to1.1.0; platform should move its import tobase.csswhen it takes the upgrade.Review Focus
Why the brand yellow could drift at all. It was declared in three places under different names, so no single change could keep them equal. The same was true of
--font-formula, and worse:_palette.csssaid'PP Formula', 'Inter', sans-serifwhile the website said'PP Formula', sans-serif, and the website silently won. I kept the Inter fallback in the unified token, because the app bundles only three of the six PP Formula weights (src/platform/cloud/onboarding/assets) and leans on Inter for the rest. On comfy.org the fallback is inert — no Inter is served there — so rendering is unchanged on both surfaces.The test is the part that lasts.
brandColors.test.tsnow fails if any--color-*or--font-*token is declared in more than one of_brand.css,_palette.css, and the website's@theme. Documentation alone would not have prevented this; the second declaration always looks reasonable in isolation.SVG strokes went to utility classes, not
var().stroke="#4D3762"becameclass="stroke-secondary-mauve"rather thanstroke="var(--color-secondary-mauve)"— substitution in SVG presentation attributes was only resolved into SVG2 in Nov 2025 and Chromium is uneven. The two occurrences inside@keyframesare real declarations, so those usevar().Verification. Diffed every emitted
--color-*/--font-*in the built website CSS against the pre-change build: same 34 tokens, same values, only ordering differs plus the intended Inter fallback. Converted stroke counts match one-for-one in the built HTML (cloud 36, cloud/enterprise 39, download 5, zero leftover attributes). Both builds still resolve the full yellow chain to#f2ff59, all six PP Formula faces are present in the output, and nofonts.googleapisreference survives anywhere indist.Gates:
lint(0 errors),format:check,typecheck,typecheck:website(0 errors),knip, website build (581 pages), 345 website tests, 672 tests acrosssrc/platform/cloud,packages/shared-frontend-utilsandsrc/components/ui.Answers Alexis's question in-repo. The README now says outright that the package holds two design systems, that the file is what distinguishes them, and that no naming convention reliably does — several token names predate the split.
primary-is still overloaded across app-semantic roles and brand colours, andplum-600/primary-comfy-plumremain the same hex under two names. Renaming them is deliberately not in this PR; it is a breaking change for consumers and wants its own decision.Deliberately left alone.
--text-2xsstill disagrees betweenstyle.css(0.625rem) and the website (0.6875rem). The website's value wins on comfy.org, so aligning it is a visible type change across the site — a designer's call, not a refactor's. The duplicate-declaration test is scoped to the filesbase.cssactually pulls in, so it does not paper over this.