diff --git a/package.json b/package.json index fa8b4f01f..ee7591535 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "yaml": "^2.9.0" }, "devDependencies": { - "@comfyorg/design-system": "^1.2.0", + "@comfyorg/design-system": "1.3.0-alpha.0", "@datadog/datadog-ci": "^5.9.0", "@electron/rebuild": "^3.7.2", "@eslint/js": "^10.0.1", @@ -97,7 +97,7 @@ "@types/semver": "^7.7.1", "@vitejs/plugin-vue": "^6.0.2", "@vue/test-utils": "^2.4.6", - "@vueuse/core": "^13.5.0", + "@vueuse/core": "^14.4.0", "electron": "40.4.1", "electron-builder": "^26.7.0", "electron-vite": "^5.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 340eb33de..f263f8815 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -49,8 +49,8 @@ importers: version: 2.9.0 devDependencies: '@comfyorg/design-system': - specifier: ^1.2.0 - version: 1.2.0(axios@1.13.6)(reka-ui@2.11.0(vue@3.5.44(typescript@5.9.3)))(tailwindcss@4.2.1)(typescript@5.9.3)(vue-component-type-helpers@3.3.13)(vue@3.5.44(typescript@5.9.3)) + specifier: 1.3.0-alpha.0 + version: 1.3.0-alpha.0(@vueuse/core@14.4.0(vue@3.5.44(typescript@5.9.3)))(@vueuse/integrations@14.4.0(axios@1.13.6)(fuse.js@7.5.0)(vue@3.5.44(typescript@5.9.3)))(reka-ui@2.11.0(vue@3.5.44(typescript@5.9.3)))(tailwindcss@4.2.1)(typescript@5.9.3)(vue-component-type-helpers@3.3.13)(vue@3.5.44(typescript@5.9.3)) '@datadog/datadog-ci': specifier: ^5.9.0 version: 5.9.0(@types/node@22.19.12) @@ -82,8 +82,8 @@ importers: specifier: ^2.4.6 version: 2.4.6 '@vueuse/core': - specifier: ^13.5.0 - version: 13.9.0(vue@3.5.44(typescript@5.9.3)) + specifier: ^14.4.0 + version: 14.4.0(vue@3.5.44(typescript@5.9.3)) electron: specifier: 40.4.1 version: 40.4.1 @@ -268,14 +268,20 @@ packages: resolution: {integrity: sha512-WCsemW40Cpc6gouC1SrY6PBaZ+oLRlEVY9XBvZBI7il/HyUrb2nJ505wE1MHEFyDZNnrWDEuy4jL50WVHfTTSQ==} engines: {node: '>=6.9.0'} - '@comfyorg/design-system@1.2.0': - resolution: {integrity: sha512-Iguc/eolrHzMVG0Da+1OC3ujP3yh5bLRms00hRRV1wdaMSFGY7w+ZzfIwPZ0R47bfAroA6IihxOXzHFytkborw==} + '@comfyorg/design-system@1.3.0-alpha.0': + resolution: {integrity: sha512-zGRtfoywLF7mjYE6fFXDAyfxa//29IRsMt7c3cB37NnIWAh1YfVvOMMQjibpQLFaEPdcQJe2nu68MlFOAaKTCw==} peerDependencies: - reka-ui: ^2.11.0 + '@vueuse/core': ^14.4.0 + '@vueuse/integrations': ^14.4.0 + reka-ui: ^2.10.5 tailwindcss: ^4.1.0 vue: ^3.5.40 vue-component-type-helpers: ^3.3.0 peerDependenciesMeta: + '@vueuse/core': + optional: true + '@vueuse/integrations': + optional: true reka-ui: optional: true vue: @@ -1462,11 +1468,6 @@ packages: '@vue/test-utils@2.4.6': resolution: {integrity: sha512-FMxEjOpYNYiFe0GkaHsnJPXFHxQ6m4t8vI/ElPGpMWxZKpmRvQ33OIrvRXemy6yha03RxhOlQuy+gZMC3CQSow==} - '@vueuse/core@13.9.0': - resolution: {integrity: sha512-ts3regBQyURfCE2BcytLqzm8+MmLlo5Ln/KLoxDVcsZ2gzIwVNnQpQOL/UKV8alUqjSZOlpFZcRNsLRqj+OzyA==} - peerDependencies: - vue: ^3.5.0 - '@vueuse/core@14.4.0': resolution: {integrity: sha512-X4WHz1HlCzCBoYXesUkifzzWBAcZgXG8Fi5iNPQg/epdzOB3gu8Fawj3hvuwYR1nGcXGnvxwYYcUC/71++svtQ==} peerDependencies: @@ -1514,17 +1515,9 @@ packages: universal-cookie: optional: true - '@vueuse/metadata@13.9.0': - resolution: {integrity: sha512-1AFRvuiGphfF7yWixZa0KwjYH8ulyjDCC0aFgrGRz8+P4kvDFSdXLVfTk5xAN9wEuD1J6z4/myMoYbnHoX07zg==} - '@vueuse/metadata@14.4.0': resolution: {integrity: sha512-swx/255R6JyHZFJhx845iz5CRWDZdCfvkZOpACWc5+c5WHcG24mv8gUT1WIdFQaHt6dq79rvILd9QnCWiyVm9g==} - '@vueuse/shared@13.9.0': - resolution: {integrity: sha512-e89uuTLMh0U5cZ9iDpEI2senqPGfbPRTHM/0AaQkcxnpqjkZqDYP8rpfm7edOz8s+pOCOROEy1PIveSW8+fL5g==} - peerDependencies: - vue: ^3.5.0 - '@vueuse/shared@14.4.0': resolution: {integrity: sha512-JRgY90Sz8DDtPMsaDflvPMp9xYk69JZAmbuDvAquUVXKr2gEjqtzGNTTthLfckH0BzBqvnu31gb4a8TGLRe79g==} peerDependencies: @@ -4175,14 +4168,12 @@ snapshots: '@babel/helper-string-parser': 7.29.11 '@babel/helper-validator-identifier': 7.29.7 - '@comfyorg/design-system@1.2.0(axios@1.13.6)(reka-ui@2.11.0(vue@3.5.44(typescript@5.9.3)))(tailwindcss@4.2.1)(typescript@5.9.3)(vue-component-type-helpers@3.3.13)(vue@3.5.44(typescript@5.9.3))': + '@comfyorg/design-system@1.3.0-alpha.0(@vueuse/core@14.4.0(vue@3.5.44(typescript@5.9.3)))(@vueuse/integrations@14.4.0(axios@1.13.6)(fuse.js@7.5.0)(vue@3.5.44(typescript@5.9.3)))(reka-ui@2.11.0(vue@3.5.44(typescript@5.9.3)))(tailwindcss@4.2.1)(typescript@5.9.3)(vue-component-type-helpers@3.3.13)(vue@3.5.44(typescript@5.9.3))': dependencies: '@iconify-json/lucide': 1.2.148 '@iconify/tailwind4': 1.2.3(tailwindcss@4.2.1) '@iconify/tools': 5.0.14 '@iconify/utils': 3.1.7 - '@vueuse/core': 14.4.0(vue@3.5.44(typescript@5.9.3)) - '@vueuse/integrations': 14.4.0(axios@1.13.6)(fuse.js@7.5.0)(vue@3.5.44(typescript@5.9.3)) chart.js: 4.6.1 clsx: 2.1.1 cva: 1.0.0-beta.4(typescript@5.9.3) @@ -4193,22 +4184,13 @@ snapshots: tailwindcss: 4.2.1 tw-animate-css: 1.4.0 optionalDependencies: + '@vueuse/core': 14.4.0(vue@3.5.44(typescript@5.9.3)) + '@vueuse/integrations': 14.4.0(axios@1.13.6)(fuse.js@7.5.0)(vue@3.5.44(typescript@5.9.3)) reka-ui: 2.11.0(vue@3.5.44(typescript@5.9.3)) vue: 3.5.44(typescript@5.9.3) vue-component-type-helpers: 3.3.13 transitivePeerDependencies: - - async-validator - - axios - - change-case - - drauu - - focus-trap - - idb-keyval - - jwt-decode - - nprogress - - qrcode - - sortablejs - typescript - - universal-cookie '@cyberalien/svg-utils@1.2.21': dependencies: @@ -5421,13 +5403,6 @@ snapshots: js-beautify: 1.15.4 vue-component-type-helpers: 2.2.12 - '@vueuse/core@13.9.0(vue@3.5.44(typescript@5.9.3))': - dependencies: - '@types/web-bluetooth': 0.0.21 - '@vueuse/metadata': 13.9.0 - '@vueuse/shared': 13.9.0(vue@3.5.44(typescript@5.9.3)) - vue: 3.5.44(typescript@5.9.3) - '@vueuse/core@14.4.0(vue@3.5.44(typescript@5.9.3))': dependencies: '@types/web-bluetooth': 0.0.21 @@ -5443,15 +5418,10 @@ snapshots: optionalDependencies: axios: 1.13.6(debug@4.4.3) fuse.js: 7.5.0 - - '@vueuse/metadata@13.9.0': {} + optional: true '@vueuse/metadata@14.4.0': {} - '@vueuse/shared@13.9.0(vue@3.5.44(typescript@5.9.3))': - dependencies: - vue: 3.5.44(typescript@5.9.3) - '@vueuse/shared@14.4.0(vue@3.5.44(typescript@5.9.3))': dependencies: vue: 3.5.44(typescript@5.9.3) @@ -5887,12 +5857,12 @@ snapshots: css-tree@2.2.1: dependencies: mdn-data: 2.0.28 - source-map-js: 1.2.1 + source-map-js: 1.2.2 css-tree@3.2.1: dependencies: mdn-data: 2.27.1 - source-map-js: 1.2.1 + source-map-js: 1.2.2 css-what@7.0.0: {} diff --git a/src/renderer/src/assets/design-system-theme.css b/src/renderer/src/assets/design-system-theme.css index 70497773b..875327039 100644 --- a/src/renderer/src/assets/design-system-theme.css +++ b/src/renderer/src/assets/design-system-theme.css @@ -1,73 +1,14 @@ /* - * Desktop's theme for @comfyorg/design-system: the redesign's "Void" look. - * - * The package's components never name a color; they ask for roles - * (foreground, secondary, border...). The first block gives those roles the - * redesign's values. The second holds the parts of the look the package has - * no role for, for Desktop's own components. - * - * `static` emits every variable, so scoped CSS can read them with var(--...). + * Desktop's look is the Void theme from @comfyorg/design-system. The block below + * holds the few tokens only Desktop's own screens use. */ -@theme static { - --font-inter: 'Inter', system-ui, sans-serif; - --font-sans: 'Inter', system-ui, sans-serif; - --font-display: 'PP Formula', 'Inter', system-ui, sans-serif; - - --color-background: oklch(0.19 0.003 285); - --color-foreground: oklch(0.955 0.002 285); - --color-card: oklch(0.23 0.008 285); - --color-popover: oklch(0.23 0.008 285); - /* The redesign has no blue action color: its main action is the white - * `inverted` button. ComfyUI's blue until design picks one. */ - --color-primary: #0b8ce9; - --color-secondary: oklch(1 0 0 / 0.06); - --color-muted: oklch(1 0 0 / 0.06); - --color-muted-foreground: oklch(0.76 0.006 285); - --color-accent: oklch(1 0 0 / 0.1); - --color-input: oklch(1 0 0 / 0.06); - --color-border: oklch(1 0 0 / 0.08); - --color-ring: oklch(1 0 0 / 0.45); - --color-destructive: oklch(0.62 0.19 25); - --color-warning: oklch(0.82 0.14 85); - --color-success: oklch(0.78 0.15 155); +@import '@comfyorg/design-system/css/themes/void.css'; - --color-content-background: oklch(0.14 0.005 285); - --color-card-hover: oklch(0.265 0.009 285); - --color-subtle-foreground: oklch(0.6 0.008 285); - --color-border-strong: oklch(1 0 0 / 0.14); - --color-media-overlay: oklch(0 0 0 / 0.55); +@theme static { --color-snapshot-chip: #202020; --color-snapshot-ring: #262729; - --text-ui: 13px; - --text-ui--line-height: 20px; - --text-heading: 16px; - --text-heading--line-height: 24px; - --text-title: 22px; - --text-title--line-height: 28px; - --text-display: 34px; - --text-display--line-height: 40px; - - /* Nested corners: inner radius = outer radius - the padding between them. */ - --radius-panel: 16px; - --radius-card: 12px; - --radius-control: 8px; - --radius-min: 4px; - - --shadow-elev: - inset 0 1px 0 oklch(1 0 0 / 0.07), 0 1px 2px oklch(0 0 0 / 0.35), 0 6px 18px oklch(0 0 0 / 0.28); - --shadow-elev-hover: - inset 0 1px 0 oklch(1 0 0 / 0.09), 0 2px 4px oklch(0 0 0 / 0.35), - 0 10px 26px oklch(0 0 0 / 0.34); - --shadow-popover: inset 0 1px 0 oklch(1 0 0 / 0.07), 0 12px 32px oklch(0 0 0 / 0.45); - --shadow-highlight: inset 0 1px 0 oklch(1 0 0 / 0.06); - - --ease-out-expo: cubic-bezier(0.16, 1, 0.3, 1); - --animate-pop-in: pop-in 160ms var(--ease-out-expo); - --animate-fade-in: fade-in 160ms ease-out; - --animate-status-pulse: status-pulse 2s ease-out infinite; - --animate-shimmer: shimmer 1.6s ease-in-out infinite; --animate-brand-takeover: brand-takeover-in 240ms cubic-bezier(0.22, 1, 0.36, 1) both; @keyframes brand-takeover-in { @@ -80,35 +21,6 @@ transform: translateY(0); } } - - @keyframes pop-in { - from { - opacity: 0; - transform: translateY(4px) scale(0.98); - } - } - @keyframes fade-in { - from { - opacity: 0; - } - } - @keyframes status-pulse { - 0% { - box-shadow: 0 0 0 0 color-mix(in oklch, currentColor 55%, transparent); - } - 70%, - 100% { - box-shadow: 0 0 0 5px transparent; - } - } - @keyframes shimmer { - from { - background-position: 150% 0; - } - to { - background-position: -50% 0; - } - } } /* Legacy Tailwind color names follow the same runtime variables as the diff --git a/src/renderer/src/assets/main.css b/src/renderer/src/assets/main.css index f88d3bb1a..717cd8410 100644 --- a/src/renderer/src/assets/main.css +++ b/src/renderer/src/assets/main.css @@ -2,10 +2,8 @@ @import '@comfyorg/design-system/components.css'; @import './design-system-theme.css'; -/* Shared components from @comfyorg/design-system: generate the utilities they - * use and load their scoped styles. Its base.css is not imported: its fonts use - * root-relative URLs that break under file://, and Desktop declares Inter below. */ -@source '../../../../node_modules/@comfyorg/design-system/dist'; +/* @comfyorg/design-system's base.css is not imported: its fonts use root-relative + * URLs that break under file://, and Desktop declares Inter below. */ /* Inter Font Family — matches ComfyUI frontend design system */ @font-face {