Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
68 changes: 19 additions & 49 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

96 changes: 4 additions & 92 deletions src/renderer/src/assets/design-system-theme.css
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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
Expand Down
6 changes: 2 additions & 4 deletions src/renderer/src/assets/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading