diff --git a/packages/design-system/README.md b/packages/design-system/README.md index 26fdeaf3d15..92ca68bccac 100644 --- a/packages/design-system/README.md +++ b/packages/design-system/README.md @@ -34,6 +34,30 @@ For the palette and fonts without the Tailwind layers or icon plugins: @import '@comfyorg/design-system/css/base.css'; ``` +## Baseline for other apps + +An app with its own Tailwind build and global styles, such as Comfy Desktop, +imports the baseline instead of `style.css`, which adds ComfyUI's app-wide rules: + +```css +@import 'tailwindcss'; +@import '@comfyorg/design-system/css/baseline.css'; + +:root { + --background: oklch(0.19 0.003 285); + --primary: var(--foreground); +} +``` + +The baseline holds the palette, the semantic colors components use, their icon +plugins, stacking layers, text sizes, shadows and scrollbar utilities, and +registers the compiled component sources for Tailwind. Override only the +variables that differ: `--background`, `--foreground`, `--card`, `--popover`, +`--primary`, `--secondary`, `--muted`, `--muted-foreground`, `--accent`, +`--destructive`, `--border`, `--input`, `--ring`, `--warning` and +`--shadow-color`. The host provides fonts. Published consumers still import +`components.css`, as described under [Vue components](#vue-components). + ## Exports | Path | Contents | @@ -41,6 +65,7 @@ For the palette and fonts without the Tailwind layers or icon plugins: | `./css/style.css` | Full theme — palette, fonts, Tailwind layers, icon plugins | | `./css/theme.css` | Full theme without automatic component source registration | | `./css/base.css` | Palette and fonts only | +| `./css/baseline.css` | Component colors, plugins, tokens and utilities for apps other than ComfyUI | | `./css/_palette.css` | Color variables | | `./css/fonts.css` | Font faces | | `./css/_deprecated-aliases.css` | Deprecated variable names kept for extensions; scheduled for removal | diff --git a/packages/design-system/src/css/_baseline.css b/packages/design-system/src/css/_baseline.css new file mode 100644 index 00000000000..cdb46e45e73 --- /dev/null +++ b/packages/design-system/src/css/_baseline.css @@ -0,0 +1,143 @@ +@import './_palette.css'; +@import 'tw-animate-css'; + +@plugin "./iconifyDynamicPlugin.ts"; + +@plugin "./lucideStrokePlugin.js"; + +@custom-variant touch (@media (hover: none)); + +@theme { + --z-index-panel: 1100; + --z-index-education: 1500; + --z-index-onboarding: 1600; + --z-index-overlay: 1700; + --z-index-tour: 1800; + --z-index-toast: 9999; + --z-index-blocking: 10000; + + --text-2xs: 0.625rem; + --text-2xs--line-height: calc(1 / 0.625); + + --text-3xs: 0.5625rem; + --text-3xs--line-height: calc(1 / 0.5625); + + --color-credit: #ddbd31; + --color-warning-foreground: var(--color-charcoal-800); + + --shadow-2xs: 0 1px 1px var(--shadow-color); + --shadow-xs: 0 1px 2px var(--shadow-color); + --shadow-sm: 0 1px 4px var(--shadow-color); + --shadow-md: 1px 1px 8px 0 var(--shadow-color); + --shadow-lg: 0 2px 16px 0 var(--shadow-color); + --shadow-xl: 0 8px 24px var(--shadow-color); + --shadow-2xl: 0 24px 80px var(--shadow-color); + --drop-shadow-xs: 0 1px 1px var(--shadow-color); + --drop-shadow-sm: 1px 1px 4px var(--shadow-color); + --drop-shadow-md: 1px 1px 8px var(--shadow-color); + --drop-shadow-lg: 0 9px 7px var(--shadow-color); + + --color-success: var(--color-jade-600); +} + +:root { + color-scheme: dark; + + --background: var(--color-charcoal-800); + --foreground: var(--color-white); + --card: var(--color-charcoal-600); + --primary: var(--color-azure-600); + --secondary: var(--color-charcoal-600); + --muted: var(--color-charcoal-300); + --muted-foreground: var(--color-smoke-800); + --accent: var(--color-charcoal-400); + --destructive: var(--color-coral-700); + --border: var(--color-charcoal-200); + --ring: var(--muted-foreground); + --popover: var(--background); + --input: var(--accent); + + --warning: var(--color-gold-600); + --shadow-color: rgb(0 0 0 / 0.4); +} + +@theme inline { + --color-background: var(--background); + --color-foreground: var(--foreground); + --color-card: var(--card); + --color-popover: var(--popover); + --color-primary: var(--primary); + --color-secondary: var(--secondary); + --color-muted: var(--muted); + --color-muted-foreground: var(--muted-foreground); + --color-accent: var(--accent); + --color-destructive: var(--destructive); + --color-border: var(--border); + --color-input: var(--input); + --color-ring: var(--ring); + --color-warning: var(--warning); +} + +@layer base { + *, + ::before, + ::after { + box-sizing: border-box; + border-color: var(--border); + } + + button, + input, + select, + optgroup, + textarea, + ::file-selector-button { + font: inherit; + font-feature-settings: inherit; + font-variation-settings: inherit; + letter-spacing: inherit; + color: inherit; + } +} + +@utility highlight { + background-color: color-mix(in srgb, currentColor 20%, transparent); + font-weight: 700; + border-radius: 0.25rem; +} + +@utility scrollbar-hide { + scrollbar-width: none; + &::-webkit-scrollbar { + width: 1px; + } + &::-webkit-scrollbar-thumb { + background-color: transparent; + } +} + +@utility scrollbar-custom { + overflow-y: auto; + scrollbar-width: thin; + scrollbar-color: var(--muted) transparent; + + &::-webkit-scrollbar { + width: 10px; + height: 10px; + background-color: transparent; + } + &::-webkit-scrollbar-track { + background: transparent; + } + &::-webkit-scrollbar-thumb { + background: var(--muted); + border-radius: 9999px; + border: 2px solid transparent; + } + &::-webkit-scrollbar-thumb:hover { + background: var(--muted); + } + &::-webkit-scrollbar-corner { + background: transparent; + } +} diff --git a/packages/design-system/src/css/baseline.css b/packages/design-system/src/css/baseline.css new file mode 100644 index 00000000000..dd6e38978d2 --- /dev/null +++ b/packages/design-system/src/css/baseline.css @@ -0,0 +1,3 @@ +@import './_baseline.css'; + +@source '../../dist'; diff --git a/packages/design-system/src/css/theme.css b/packages/design-system/src/css/theme.css index 551fdb6b58c..8d5af418653 100644 --- a/packages/design-system/src/css/theme.css +++ b/packages/design-system/src/css/theme.css @@ -1,17 +1,12 @@ @layer theme, base, components, utilities; @import './fonts.css'; -@import './_palette.css'; +@import './_baseline.css'; @import './_deprecated-aliases.css'; @import './_legacy-palette.css'; @import 'tailwindcss/theme' layer(theme); @import 'tailwindcss/preflight' layer(base); @import 'tailwindcss/utilities' layer(utilities); -@import 'tw-animate-css'; - -@plugin "./iconifyDynamicPlugin.ts"; - -@plugin "./lucideStrokePlugin.js"; @layer base { *, @@ -27,50 +22,15 @@ /* Badge icon names are built at runtime, so the scanner cannot find them. */ @source inline("icon-mask-[comfy--{3d-decomp,ai-model,anthropic,batch-images-node,bfl,bria,brightness-contrast,bytedance,canny,canny-to-image,canny-to-video,channels,chromatic-aberration,claude,comfy-c,comfy-logo,credits,depth-to-image,depth-to-video,dial,elevenlabs,extensions-blocks,file-output,frames-to-video,gemini,get-video-components,glow,grain,grok,hitpaw,ideogram,image-ai-edit,image-batch,image-blur,image-canny,image-captioning,image-collage,image-compare,image-depth,image-edit,image-inpaint,image-invert,image-outpaint,image-outpainting,image-remove-background,image-rotate,image-select-object-segmentation,image-shader,image-sharpen,image-to-3d,image-to-image,image-to-layers,image-to-video,image-upscale,image-vectorize,kling,load-3d,load-audio,load-video,lora-loader,ltxv,luma,magnific,mask,meshy,minimax,moonvalley-marey,node,open-ai-chat-node,openai,pin,pixverse,play,pose-to-image,pose-to-video,quiver,recraft,reve,rodin,runway,save-3d,save-audio,save-video,send,sora,stability-ai,template,tencent,text-prompt-enhance,text-to-3d,text-to-audio,text-to-image,text-to-video,topaz,tripo,veo,video-captioning,video-edit,video-enhance,video-extract-frame,video-inpaint,video-interpolation,video-select-object-segmentation,video-slice,video-split-screen,video-trim,video-upscale,vidu,voice-clone,wan,wavespeed,workflow}]"); -@custom-variant touch (@media (hover: none)); @custom-variant triangle-icons (@container style(--node-icon-style: triangle)); @theme { - --z-index-panel: 1100; - --z-index-education: 1500; - --z-index-onboarding: 1600; - --z-index-overlay: 1700; - --z-index-tour: 1800; - --z-index-toast: 9999; - --z-index-blocking: 10000; - - --shadow-2xs: 0 1px 1px var(--shadow-color); - --shadow-xs: 0 1px 2px var(--shadow-color); - --shadow-sm: 0 1px 4px var(--shadow-color); - --shadow-md: 1px 1px 8px 0 var(--shadow-color); - --shadow-lg: 0 2px 16px 0 var(--shadow-color); - --shadow-xl: 0 8px 24px var(--shadow-color); - --shadow-2xl: 0 24px 80px var(--shadow-color); - --drop-shadow-xs: 0 1px 1px var(--shadow-color); - --drop-shadow-sm: 1px 1px 4px var(--shadow-color); - --drop-shadow-md: 1px 1px 8px var(--shadow-color); - --drop-shadow-lg: 0 9px 7px var(--shadow-color); --shadow-inset-highlight: inset 0 1px 0 0 rgb(from white r g b / 0.1); - --text-2xs: 0.625rem; - --text-2xs--line-height: calc(1 / 0.625); - - --text-3xs: 0.5625rem; - --text-3xs--line-height: calc(1 / 0.5625); - - --color-credit: #ddbd31; - --color-bypass: #6a246a; - --color-warning-foreground: var(--color-charcoal-800); - --color-success: var(--color-jade-600); } :root { - color-scheme: dark; - - --background: var(--color-charcoal-800); - --foreground: var(--color-white); - --card: var(--color-charcoal-600); --node-foreground: var(--color-smoke-700); --node-header: var(--color-charcoal-700); --node-border: var(--color-charcoal-100); @@ -81,48 +41,19 @@ --node-widget-radius: 0.375rem; --node-widget-border-width: 0; --node-widget-gap: 0.25rem; - --primary: var(--color-azure-600); - --secondary: var(--color-charcoal-600); - --muted: var(--color-charcoal-300); - --muted-foreground: var(--color-smoke-800); - --accent: var(--color-charcoal-400); - --destructive: var(--color-coral-700); - --border: var(--color-charcoal-200); - --ring: var(--muted-foreground); - --popover: var(--background); - --input: var(--accent); --node: var(--card); --default-transition-duration: 0.1s; --comfy-topbar-height: 2.5rem; --workflow-tabs-height: 2.375rem; --comfy-textarea-font-size: 10px; - - --warning: var(--color-gold-600); - --shadow-color: rgb(0 0 0 / 0.4); } @theme inline { - --color-background: var(--background); - --color-foreground: var(--foreground); - --color-card: var(--card); --color-node: var(--node); --color-node-foreground: var(--node-foreground); --color-node-header: var(--node-header); --color-node-border: var(--node-border); - --color-popover: var(--popover); - --color-primary: var(--primary); - --color-secondary: var(--secondary); - --color-muted: var(--muted); - --color-muted-foreground: var(--muted-foreground); - --color-accent: var(--accent); - --color-destructive: var(--destructive); - --color-border: var(--border); - --color-input: var(--input); - --color-ring: var(--ring); - - /* Semantic tokens */ - --color-warning: var(--warning); } @utility floating-panel { @@ -132,56 +63,6 @@ box-shadow: var(--shadow-inset-highlight), theme(boxShadow.lg); } -@utility highlight { - background-color: color-mix(in srgb, currentColor 20%, transparent); - font-weight: 700; - border-radius: 0.25rem; -} - -@utility scrollbar-hide { - scrollbar-width: none; - &::-webkit-scrollbar { - width: 1px; - } - &::-webkit-scrollbar-thumb { - background-color: transparent; - } -} - -/* ===================== Scrollbar Utilities (Tailwind) ===================== - Usage: Add `scrollbar-custom` class to scrollable containers. - The scrollbar styling adapts to light/dark theme automatically. -============================================================================ */ - -@utility scrollbar-custom { - overflow-y: auto; - /* Firefox */ - scrollbar-width: thin; - scrollbar-color: var(--muted) transparent; - - /* WebKit */ - &::-webkit-scrollbar { - width: 10px; - height: 10px; - background-color: transparent; - } - &::-webkit-scrollbar-track { - background: transparent; - } - &::-webkit-scrollbar-thumb { - background: var(--muted); - border-radius: 9999px; - border: 2px solid transparent; - } - &::-webkit-scrollbar-thumb:hover { - background: var(--muted); - } - &::-webkit-scrollbar-corner { - background: transparent; - } -} -/* =================== End Custom Scrollbar (cross-browser) =================== */ - /* Everthing below here to be cleaned up over time. */ :root[data-palette-switching] * { diff --git a/packages/design-system/tests/css-consumer/baseline-theme.css b/packages/design-system/tests/css-consumer/baseline-theme.css new file mode 100644 index 00000000000..fdf6b0b1ca7 --- /dev/null +++ b/packages/design-system/tests/css-consumer/baseline-theme.css @@ -0,0 +1,6 @@ +@import 'tailwindcss' source(none); +@import '@comfyorg/design-system/css/baseline.css'; + +:root { + --background: oklch(0.19 0.003 285); +} diff --git a/packages/design-system/tests/css-consumer/verifyStyles.ts b/packages/design-system/tests/css-consumer/verifyStyles.ts index e37535b172b..5a973769af4 100644 --- a/packages/design-system/tests/css-consumer/verifyStyles.ts +++ b/packages/design-system/tests/css-consumer/verifyStyles.ts @@ -2,6 +2,9 @@ import assert from 'node:assert/strict' import { readFileSync, readdirSync } from 'node:fs' import { createRequire } from 'node:module' +import tailwindcss from '@tailwindcss/vite' +import { build } from 'vite' + const require = createRequire( import.meta.resolve('@comfyorg/design-system/css/style.css') ) @@ -16,6 +19,33 @@ const css = readdirSync('dist/assets') assert.match(css, /\.bg-secondary\s*\{/) assert.match(css, /--background:/) + +const baselineBuild = await build({ + configFile: false, + plugins: [tailwindcss()], + logLevel: 'error', + build: { write: false, rolldownOptions: { input: 'baseline-theme.css' } } +}) +assert(!Array.isArray(baselineBuild) && 'output' in baselineBuild) +const baselineCss = baselineBuild.output + .filter((file) => file.type === 'asset' && file.fileName.endsWith('.css')) + .map((file) => (file.type === 'asset' ? file.source.toString() : '')) + .join('\n') + +const effectiveBackground = [ + ...baselineCss.matchAll(/--background:\s*([^;}]+)/g) +] + .at(-1)?.[1] + ?.trim() +assert.match( + effectiveBackground ?? '', + /^oklch\((?:0?\.19|19%)\s+0?\.003\s+285\)$/ +) +assert.match(baselineCss, /\.bg-secondary\s*\{[^}]*var\(--secondary\)/) +assert.match(baselineCss, /\.icon-\\\[lucide--check\\\]\s*\{/) +assert.match(baselineCss, /\.z-overlay\s*\{/) +assert.doesNotMatch(baselineCss, /body\s*\{[^}]*overflow:\s*hidden/) +assert.doesNotMatch(baselineCss, /#vue-app\s*\{/) process.stdout.write( - 'Packed CSS compiles without Vue, Reka, or VueUse installed.\n' + 'Packed CSS and the baseline compile without Vue, Reka, or VueUse installed.\n' ) diff --git a/src/platform/theme/themeService.test.ts b/src/platform/theme/themeService.test.ts index bd0db79cd9a..4848bd0c15c 100644 --- a/src/platform/theme/themeService.test.ts +++ b/src/platform/theme/themeService.test.ts @@ -270,17 +270,19 @@ describe('useThemeService theme variables', () => { 'css' ) const paletteCss = readFileSync(join(cssDir, '_palette.css'), 'utf8') - const themeCss = readFileSync(join(cssDir, 'theme.css'), 'utf8') const palette = Object.fromEntries( [...paletteCss.matchAll(/--color-([\w-]+):\s*(#[0-9a-f]{6});/gi)].map( ([, name, hex]) => [name, hex.toLowerCase()] ) ) palette.white = '#ffffff' - const rootBlock = themeCss.slice( - themeCss.indexOf(':root {'), - themeCss.indexOf('}', themeCss.indexOf(':root {')) - ) + const rootBlock = ['_baseline.css', 'theme.css'] + .map((file) => { + const css = readFileSync(join(cssDir, file), 'utf8') + const start = css.indexOf(':root {') + return css.slice(start, css.indexOf('}', start)) + }) + .join('\n') const stylesheetDefaults = Object.fromEntries( [...rootBlock.matchAll(/--([\w-]+):\s*([^;]+);/g)].map( ([, token, value]) => [