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
2 changes: 1 addition & 1 deletion 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.3.0-alpha.0",
"@comfyorg/design-system": "1.3.0-alpha.1",
"@datadog/datadog-ci": "^5.9.0",
"@electron/rebuild": "^3.7.2",
"@eslint/js": "^10.0.1",
Expand Down
10 changes: 5 additions & 5 deletions pnpm-lock.yaml

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

4 changes: 0 additions & 4 deletions scripts/eslint/vue-style-exceptions.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@
"reason": "Preserve the existing progress-indeterminate animation.",
"sha256": "e91753e5d6e18052239d26f3b792cc6d6b5c2d7b821f23dd9a7db268f45069fe"
},
"src/renderer/src/comfyTitlePopup/GlobalSettingsView.vue": {
"reason": "Preserve the existing gs-field-flash animation.",
"sha256": "2392a694212241a269657df9855b32b7f47d953589073fc88650a2fa2661a702"
},
"src/renderer/src/components/settings/ComfyUISettingsContent.vue": {
"reason": "Preserve the existing op-bar-slide animation.",
"sha256": "bf5b6da0902a0e0c96c922e7b8a545307b3de39bfb8c0bdec401311ae42b2cd0"
Expand Down
97 changes: 93 additions & 4 deletions src/renderer/src/assets/design-system-theme.css
Original file line number Diff line number Diff line change
@@ -1,18 +1,107 @@
/*
* Desktop's look is the Void theme from @comfyorg/design-system, with a white
* primary accent matching Desktop's monochrome controls and actions.
* Desktop's look is Void: the @comfyorg/design-system baseline, the values that
* differ from it, and Desktop's own type, radius, shadow and motion tokens.
*/

@import '@comfyorg/design-system/css/themes/void.css';
@import '@comfyorg/design-system/css/baseline.css';

:root {
--background: oklch(0.19 0.003 285);
--foreground: oklch(0.955 0.002 285);
--card: oklch(0.23 0.008 285);
--popover: oklch(0.23 0.008 285);
--primary: var(--foreground);
--secondary: oklch(1 0 0 / 0.06);
--muted: oklch(1 0 0 / 0.06);
--muted-foreground: oklch(0.76 0.006 285);
--accent: oklch(1 0 0 / 0.1);
--input: oklch(1 0 0 / 0.06);
--ring: oklch(1 0 0 / 0.45);
--destructive: oklch(0.62 0.19 25);
}

@theme static {
--color-primary: var(--color-foreground);
--font-sans: 'Inter', system-ui, sans-serif;
--font-display: 'PP Formula', 'Inter', system-ui, sans-serif;

--color-success: oklch(0.78 0.15 155);
--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);
--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;

--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;
--animate-gs-field-flash: gs-field-flash 2.2s ease-out;

@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;
}
}
@keyframes gs-field-flash {
0%,
55% {
box-shadow: 0 0 0 2px var(--action);
background: color-mix(in srgb, var(--action) 12%, transparent);
}
100% {
box-shadow: 0 0 0 2px transparent;
background: transparent;
}
}
@keyframes brand-takeover-in {
from {
opacity: 0;
Expand Down
9 changes: 5 additions & 4 deletions src/renderer/src/assets/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
--text: #ffffff;
--text-muted: #8a8a8a;
--text-faint: #55565e;
--accent: #60a5fa;
--action: #60a5fa;
--accent-hover: #93c5fd;
--selected: rgba(255, 255, 255, 0.85);
--surface: #29252c;
Expand Down Expand Up @@ -149,7 +149,7 @@
--text: #202121;
--text-muted: #a0a0a0;
--text-faint: #b4b4b4;
--accent: #3b82f6;
--action: #3b82f6;
--accent-hover: #2563eb;
--selected: rgba(0, 0, 0, 0.7);
--surface: #e9e9e9;
Expand Down Expand Up @@ -268,19 +268,20 @@
--accent-label: var(--color-subtle-foreground);

/* White accent: primary actions, selection, progress. */
--accent: var(--color-foreground);
--action: var(--color-foreground);
--accent-hover: oklch(0.995 0 0);
--accent-primary: var(--color-foreground);
--brand-accent: var(--color-foreground);
--accent-plum: oklch(0.82 0.04 300);
--selected: oklch(1 0 0 / 0.85);
--focus-ring: var(--color-ring);

--border: var(--color-border);
--border: oklch(1 0 0 / 0.08);
--border-hover: var(--color-border-strong);

--danger: var(--color-destructive);
--danger-hover: oklch(0.68 0.19 25);
--warning: oklch(0.82 0.14 85);
--success: var(--color-success);
--semantic-danger: var(--color-destructive);
--semantic-warning: var(--color-warning);
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/src/comfyTitleBar/TitleBarApp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ const titleInstallPillClass = [
].join(' ')

const titleDownloadsBadgeClass =
'pointer-events-none absolute -top-1 -right-1 inline-flex h-3.5 min-w-3.5 items-center justify-center rounded-[999px] bg-[var(--accent,#60a5fa)] px-1 py-0 text-[9px] leading-none font-bold text-white tabular-nums [box-shadow:0_0_0_2px_var(--titlebar-bg-active,var(--titlebar-bg,var(--neutral-900)))] [.title-bar:not(.is-light)_&:not(.is-unseen,.is-error)]:text-background [&.is-unseen]:bg-[#22c55e] [&.is-error]:bg-[var(--danger)] [.title-downloads-tray.has-active_&]:animate-[title-downloads-pulse_1.6s_ease-in-out_infinite] [.title-downloads-tray.is-flashing_&]:[animation:title-downloads-flash_0.55s_cubic-bezier(0.2,0.9,0.3,1.4)_1,title-downloads-pulse_1.6s_ease-in-out_infinite_0.6s]'
'pointer-events-none absolute -top-1 -right-1 inline-flex h-3.5 min-w-3.5 items-center justify-center rounded-[999px] bg-[var(--action,#60a5fa)] px-1 py-0 text-[9px] leading-none font-bold text-white tabular-nums [box-shadow:0_0_0_2px_var(--titlebar-bg-active,var(--titlebar-bg,var(--neutral-900)))] [.title-bar:not(.is-light)_&:not(.is-unseen,.is-error)]:text-background [&.is-unseen]:bg-[#22c55e] [&.is-error]:bg-[var(--danger)] [.title-downloads-tray.has-active_&]:animate-[title-downloads-pulse_1.6s_ease-in-out_infinite] [.title-downloads-tray.is-flashing_&]:[animation:title-downloads-flash_0.55s_cubic-bezier(0.2,0.9,0.3,1.4)_1,title-downloads-pulse_1.6s_ease-in-out_infinite_0.6s]'

const isMac = ref(bridge?.isMac() ?? false)
/** Active panel reported by main. */
Expand Down
8 changes: 4 additions & 4 deletions src/renderer/src/comfyTitlePopup/DownloadsFullView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ const statusBadgeFor = computed<Partial<Record<DownloadEntry['status'], StatusBa
</span>
<span
v-else
class="dlm-icon-circle active bg-[color-mix(in_oklab,var(--accent,#60a5fa)_15%,transparent)] text-[var(--accent,#60a5fa)] inline-flex size-8 items-center justify-center rounded-[50%]"
class="dlm-icon-circle active bg-[color-mix(in_oklab,var(--action,#60a5fa)_15%,transparent)] text-[var(--action,#60a5fa)] inline-flex size-8 items-center justify-center rounded-[50%]"
>
<LoaderCircle
:size="16"
Expand Down Expand Up @@ -301,10 +301,10 @@ const statusBadgeFor = computed<Partial<Record<DownloadEntry['status'], StatusBa
class="dlm-bar-fill h-full rounded-[2px] transition-[width] duration-300 ease-[ease]"
:class="
d.status === 'pending'
? 'indeterminate bg-[repeating-linear-gradient(90deg,var(--accent,#60a5fa),var(--accent,#60a5fa)_8px,color-mix(in_oklab,var(--accent,#60a5fa)_50%,transparent)_8px,color-mix(in_oklab,var(--accent,#60a5fa)_50%,transparent)_16px)] animate-[dlm-shimmer_1.2s_linear_infinite]'
? 'indeterminate bg-[repeating-linear-gradient(90deg,var(--action,#60a5fa),var(--action,#60a5fa)_8px,color-mix(in_oklab,var(--action,#60a5fa)_50%,transparent)_8px,color-mix(in_oklab,var(--action,#60a5fa)_50%,transparent)_16px)] animate-[dlm-shimmer_1.2s_linear_infinite]'
: d.status === 'paused'
? 'paused bg-[#f59e0b]'
: 'bg-[var(--accent,#60a5fa)]'
: 'bg-[var(--action,#60a5fa)]'
"
:style="
d.status === 'pending' ? { width: '100%' } : { width: `${progressPercent(d)}%` }
Expand All @@ -324,7 +324,7 @@ const statusBadgeFor = computed<Partial<Record<DownloadEntry['status'], StatusBa

<span
v-if="d.status === 'downloading'"
class="dlm-pct min-w-9 text-right text-[13px] font-bold text-[var(--accent,#60a5fa)] tabular-nums"
class="dlm-pct min-w-9 text-right text-[13px] font-bold text-[var(--action,#60a5fa)] tabular-nums"
>
{{ progressPercent(d) }}%
</span>
Expand Down
17 changes: 1 addition & 16 deletions src/renderer/src/comfyTitlePopup/GlobalSettingsView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ onMounted(() => {
<TabsContent
:key="activeTab"
:value="activeTab"
class="gs-pane flex min-w-0 flex-auto flex-col gap-2.5 overflow-y-auto px-3 py-2 [&_.settings-v2-sections]:gap-2 [&_.settings-v2-section]:gap-1 [&_.settings-v2-boolean-row]:min-h-7 [&_.settings-v2-boolean-row]:p-0 [&_.settings-v2-field]:gap-1 [&_.gs-field-flash]:rounded-md [&_.gs-field-flash]:animate-[gs-field-flash_2.2s_ease-out] motion-reduce:[&_.gs-field-flash]:animate-none motion-reduce:[&_.gs-field-flash]:shadow-[0_0_0_2px_var(--accent)]"
class="gs-pane flex min-w-0 flex-auto flex-col gap-2.5 overflow-y-auto px-3 py-2 [&_.settings-v2-sections]:gap-2 [&_.settings-v2-section]:gap-1 [&_.settings-v2-boolean-row]:min-h-7 [&_.settings-v2-boolean-row]:p-0 [&_.settings-v2-field]:gap-1 [&_.gs-field-flash]:rounded-md [&_.gs-field-flash]:animate-gs-field-flash motion-reduce:[&_.gs-field-flash]:animate-none motion-reduce:[&_.gs-field-flash]:shadow-[0_0_0_2px_var(--action)]"
>
<template v-if="activeTab === 'general'">
<!-- Locale picker first, no microsection header — it's a single
Expand Down Expand Up @@ -484,18 +484,3 @@ onMounted(() => {
</Tabs>
</div>
</template>

<style>
/* Deep-linked controls keep their timed highlight without affecting layout. */
@keyframes gs-field-flash {
0%,
55% {
box-shadow: 0 0 0 2px var(--accent);
background: color-mix(in srgb, var(--accent) 12%, transparent);
}
100% {
box-shadow: 0 0 0 2px transparent;
background: transparent;
}
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ const rows = computed(() =>
</div>
<span
v-if="row.isPrimary"
class="models-dir-tag tag-primary inline-flex shrink-0 items-center gap-0.5 rounded-[999px] px-1.5 py-px text-[10px] leading-[14px] font-medium uppercase tracking-[0.02em] border border-solid border-[color-mix(in_srgb,var(--accent)_35%,transparent)] bg-[color-mix(in_srgb,var(--accent)_10%,transparent)] text-[var(--accent)]"
class="models-dir-tag tag-primary inline-flex shrink-0 items-center gap-0.5 rounded-[999px] px-1.5 py-px text-[10px] leading-[14px] font-medium uppercase tracking-[0.02em] border border-solid border-[color-mix(in_srgb,var(--action)_35%,transparent)] bg-[color-mix(in_srgb,var(--action)_10%,transparent)] text-[var(--action)]"
>
{{ t('models.primary', 'Downloads') }}
<InfoTooltip :text="t('tooltips.modelsPrimary')" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ const progressDetail = computed<string | null>(() => {
statusTone === 'downloading'
? 'text-[var(--accent-primary,#0b8ce9)]'
: statusTone === 'update'
? 'text-[var(--accent)]'
? 'text-[var(--action)]'
: 'text-neutral-100'
]"
>
Expand All @@ -197,18 +197,18 @@ const progressDetail = computed<string | null>(() => {
>
<span
v-if="installedDetail"
class="updates-detail text-[12px] leading-[17px] text-text-muted [&.is-highlight]:font-medium [&.is-highlight]:text-[var(--accent)]"
class="updates-detail text-[12px] leading-[17px] text-text-muted [&.is-highlight]:font-medium [&.is-highlight]:text-[var(--action)]"
>{{ installedDetail }}</span
>
<span
v-if="lastCheckedDetail"
class="updates-detail text-[12px] leading-[17px] text-text-muted [&.is-highlight]:font-medium [&.is-highlight]:text-[var(--accent)]"
class="updates-detail text-[12px] leading-[17px] text-text-muted [&.is-highlight]:font-medium [&.is-highlight]:text-[var(--action)]"
:title="lastCheckedDetail.title"
>{{ lastCheckedDetail.text }}</span
>
<span
v-if="latestDetail"
class="updates-detail is-highlight text-[12px] leading-[17px] text-text-muted [&.is-highlight]:font-medium [&.is-highlight]:text-[var(--accent)]"
class="updates-detail is-highlight text-[12px] leading-[17px] text-text-muted [&.is-highlight]:font-medium [&.is-highlight]:text-[var(--action)]"
>{{ latestDetail }}</span
>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/src/components/DetailSection.vue
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ function handleOpenPath(value: unknown): void {
{{ item.label }}{{ item.active ? ' (active)' : ''
}}<span
v-if="item.tag"
class="detail-item-tag shrink-0 rounded-[3px] px-2 py-0.5 text-[11px] font-semibold text-[var(--accent)]"
class="detail-item-tag shrink-0 rounded-[3px] px-2 py-0.5 text-[11px] font-semibold text-[var(--action)]"
>{{ item.tag }}</span
>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/src/components/ImportPreviewModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const { t } = useI18n()
<ModalShell width="regular" :title="t('snapshots.importPreviewTitle')" @close="emit('cancel')">
<div
v-if="loading"
class="ip-loading justify-center py-8 text-[14px] text-text-muted flex items-center gap-2.5 before:inline-block before:size-4 before:shrink-0 before:animate-spin before:rounded-[50%] before:border-2 before:border-solid before:border-[var(--border)] before:border-t-[var(--accent)] before:[animation-duration:0.6s] before:content-['']"
class="ip-loading justify-center py-8 text-[14px] text-text-muted flex items-center gap-2.5 before:inline-block before:size-4 before:shrink-0 before:animate-spin before:rounded-[50%] before:border-2 before:border-solid before:border-[var(--border)] before:border-t-[var(--action)] before:[animation-duration:0.6s] before:content-['']"
>
{{ t('common.loading') }}
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/renderer/src/components/InfoTooltip.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const props = withDefaults(
)

const iconClass =
'info-tooltip-icon shrink-0 text-text-muted opacity-85 transition-[opacity,color] duration-150 ease-[ease] group-hover/info-tooltip:text-[var(--accent)] group-hover/info-tooltip:opacity-100 group-focus-visible/info-tooltip:text-[var(--accent)] group-focus-visible/info-tooltip:opacity-100'
'info-tooltip-icon shrink-0 text-text-muted opacity-85 transition-[opacity,color] duration-150 ease-[ease] group-hover/info-tooltip:text-[var(--action)] group-hover/info-tooltip:opacity-100 group-focus-visible/info-tooltip:text-[var(--action)] group-focus-visible/info-tooltip:opacity-100'

function openLink(): void {
if (props.linkUrl) void window.api.openExternal(props.linkUrl)
Expand Down Expand Up @@ -47,7 +47,7 @@ function openLink(): void {
<span class="info-tooltip-content flex flex-col gap-1.5">
<span>{{ props.text }}</span>
<a
class="info-tooltip-link w-fit font-semibold text-[var(--accent)] no-underline hover:text-accent-hover hover:underline focus-visible:text-accent-hover focus-visible:underline"
class="info-tooltip-link w-fit font-semibold text-[var(--action)] no-underline hover:text-accent-hover hover:underline focus-visible:text-accent-hover focus-visible:underline"
:href="props.linkUrl"
@click.prevent.stop="openLink"
>
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/src/components/MigrationBanner.vue
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ async function startMigration(): Promise<void> {
<Button
size="unset"
variant="textonly"
class="migration-telemetry-link static ml-1.5 inline-block appearance-auto rounded-lg border-0 bg-transparent p-0 font-sans text-[13px] leading-[inherit] font-normal whitespace-normal text-[var(--accent)] underline touch-auto transition-none [&]:[appearance:button] hover:bg-transparent hover:text-[var(--accent-hover)] focus-visible:ring-0 focus-visible:outline-1 focus-visible:[outline-style:auto]"
class="migration-telemetry-link static ml-1.5 inline-block appearance-auto rounded-lg border-0 bg-transparent p-0 font-sans text-[13px] leading-[inherit] font-normal whitespace-normal text-[var(--action)] underline touch-auto transition-none [&]:[appearance:button] hover:bg-transparent hover:text-[var(--accent-hover)] focus-visible:ring-0 focus-visible:outline-1 focus-visible:[outline-style:auto]"
@click="emit('show-settings')"
>
{{ $t('dashboard.telemetrySettings') }}
Expand Down
Loading
Loading