feat: migrate to Tailwind v4 and ComfyUI theme token system
- Add comfyui-theme.css with --pm-* design tokens mapped to ComfyUI CSS vars - Add theme-bridge.js for light/dark palette detection via ComfyUI API - Migrate Tailwind from v3 to v4 (@import, @source, @utility directives) - Remove tailwind.config.js (replaced by v4 CSS-based config) - Begin admin.html component redesign: hardcoded colors → --pm-* tokens, strip gradients, tighten spacing for ComfyUI-native look Work in progress — Phase 2 (component redesign) partially complete.
This commit is contained in:
Vito Sansevero
@@ -1,4 +1,4 @@
|
||||
TAILWIND_VERSION := 3.4.17
|
||||
TAILWIND_VERSION := 4.1.18
|
||||
TAILWIND_CLI := ./tailwindcss
|
||||
UNAME_S := $(shell uname -s)
|
||||
UNAME_M := $(shell uname -m)
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
module.exports = {
|
||||
content: ["./web/**/*.html", "./web/js/**/*.js"],
|
||||
darkMode: 'class',
|
||||
theme: {
|
||||
extend: {
|
||||
colors: {
|
||||
gray: { 850: '#1f2937', 875: '#1a202c', 925: '#0f172a' }
|
||||
}
|
||||
}
|
||||
},
|
||||
}
|
||||
+558
-778
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,212 @@
|
||||
/*
|
||||
* ComfyUI Theme Bridge — PromptManager Design Tokens
|
||||
*
|
||||
* Maps --pm-* tokens to ComfyUI CSS variables with standalone dark fallbacks.
|
||||
* ComfyUI exposes palette via --bg-color, --fg-color, --comfy-menu-bg, etc.
|
||||
* When running outside ComfyUI these fall back to a neutral dark theme.
|
||||
*/
|
||||
|
||||
:root {
|
||||
/* ── Surfaces ─────────────────────────────────── */
|
||||
--pm-bg-primary: var(--bg-color, #202020);
|
||||
--pm-bg-surface: var(--comfy-menu-bg, #353535);
|
||||
--pm-bg-input: var(--comfy-input-bg, #222);
|
||||
--pm-bg-hover: color-mix(in srgb, var(--fg-color, #fff) 10%, var(--comfy-menu-bg, #353535));
|
||||
--pm-bg-elevated: color-mix(in srgb, var(--comfy-menu-bg, #353535) 90%, var(--fg-color, #fff) 10%);
|
||||
|
||||
/* ── Text ──────────────────────────────────────── */
|
||||
--pm-text: var(--fg-color, #ddd);
|
||||
--pm-text-secondary: var(--descrip-text, #999);
|
||||
--pm-text-input: var(--input-text, #ddd);
|
||||
--pm-text-muted: color-mix(in srgb, var(--descrip-text, #999) 70%, transparent);
|
||||
|
||||
/* ── Borders ───────────────────────────────────── */
|
||||
--pm-border: var(--border-color, #4e4e4e);
|
||||
--pm-border-subtle: color-mix(in srgb, var(--border-color, #4e4e4e) 50%, transparent);
|
||||
|
||||
/* ── Accent (ComfyUI blue) ─────────────────────── */
|
||||
--pm-accent: var(--primary-bg, #007aff);
|
||||
--pm-accent-hover: var(--primary-hover-bg, #3485bb);
|
||||
--pm-accent-fg: var(--primary-fg, #fff);
|
||||
--pm-accent-tint: color-mix(in srgb, var(--primary-bg, #007aff) 15%, transparent);
|
||||
|
||||
/* ── Semantic Colors ───────────────────────────── */
|
||||
--pm-error: var(--error-text, #f44);
|
||||
--pm-error-tint: color-mix(in srgb, var(--error-text, #f44) 15%, transparent);
|
||||
--pm-success: #22c55e;
|
||||
--pm-success-tint: color-mix(in srgb, #22c55e 15%, transparent);
|
||||
--pm-warning: #eab308;
|
||||
--pm-warning-tint: color-mix(in srgb, #eab308 15%, transparent);
|
||||
--pm-info: #3b82f6;
|
||||
--pm-info-tint: color-mix(in srgb, #3b82f6 15%, transparent);
|
||||
|
||||
/* ── Elevation / Shadows ───────────────────────── */
|
||||
--pm-shadow: 0 8px 32px rgb(0 0 0 / 0.15);
|
||||
--pm-shadow-sm: 0 4px 4px rgb(0 0 0 / 0.25);
|
||||
|
||||
/* ── Border Radius (ComfyUI scale) ─────────────── */
|
||||
--pm-radius-sm: 5px;
|
||||
--pm-radius-md: 8px;
|
||||
--pm-radius-lg: 12px;
|
||||
|
||||
/* ── Spacing base ──────────────────────────────── */
|
||||
--pm-space: 4px;
|
||||
}
|
||||
|
||||
/* ── Global Scrollbar (ComfyUI-native) ───────────── */
|
||||
::-webkit-scrollbar { width: 6px; height: 6px; }
|
||||
::-webkit-scrollbar-track { background: transparent; }
|
||||
::-webkit-scrollbar-thumb { background: var(--pm-border); border-radius: 3px; }
|
||||
::-webkit-scrollbar-thumb:hover { background: var(--pm-text-secondary); }
|
||||
|
||||
/* Firefox */
|
||||
* { scrollbar-width: thin; scrollbar-color: var(--pm-border) transparent; }
|
||||
|
||||
/* ── Viewer.js theme overrides (adapts to palette) ─ */
|
||||
.viewer-backdrop { background-color: rgb(0 0 0 / 0.9) !important; }
|
||||
.viewer-container { background-color: rgb(0 0 0 / 0.9) !important; }
|
||||
.viewer-canvas { background-color: rgb(0 0 0 / 0.9) !important; }
|
||||
.viewer-toolbar { background-color: color-mix(in srgb, var(--pm-bg-surface) 95%, transparent) !important; }
|
||||
.viewer-navbar { background-color: color-mix(in srgb, var(--pm-bg-surface) 95%, transparent) !important; }
|
||||
.viewer-title { color: var(--pm-text) !important; }
|
||||
|
||||
/* ── Film Strip (admin.html) ─────────────────────── */
|
||||
.prompt-film-strip {
|
||||
--film-strip-thumbnail-size: 112px;
|
||||
--film-strip-gap: 8px;
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
gap: var(--film-strip-gap);
|
||||
padding: 8px 0;
|
||||
overflow-x: auto;
|
||||
}
|
||||
|
||||
.film-strip-thumbnail {
|
||||
flex-shrink: 0;
|
||||
width: var(--film-strip-thumbnail-size);
|
||||
height: var(--film-strip-thumbnail-size);
|
||||
border-radius: var(--pm-radius-sm);
|
||||
overflow: hidden;
|
||||
cursor: pointer;
|
||||
border: 2px solid transparent;
|
||||
transition: all 0.15s ease;
|
||||
background: var(--pm-bg-input);
|
||||
}
|
||||
|
||||
.film-strip-thumbnail:hover {
|
||||
border-color: var(--pm-accent);
|
||||
transform: scale(1.05);
|
||||
}
|
||||
|
||||
.film-strip-thumbnail img {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
object-fit: cover;
|
||||
}
|
||||
|
||||
.film-strip-thumbnail--more {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
background: var(--pm-bg-surface);
|
||||
color: var(--pm-text-secondary);
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.film-strip-thumbnail--more:hover {
|
||||
background: var(--pm-bg-hover);
|
||||
color: var(--pm-text);
|
||||
}
|
||||
|
||||
.film-strip-empty {
|
||||
color: var(--pm-text-muted);
|
||||
font-size: 12px;
|
||||
font-style: italic;
|
||||
padding: 8px 0;
|
||||
}
|
||||
|
||||
.film-strip-size-small { --film-strip-thumbnail-size: 72px; --film-strip-gap: 6px; }
|
||||
.film-strip-size-medium { --film-strip-thumbnail-size: 112px; --film-strip-gap: 8px; }
|
||||
.film-strip-size-large { --film-strip-thumbnail-size: 144px; --film-strip-gap: 10px; }
|
||||
|
||||
/* ── Metadata Sidebar ────────────────────────────── */
|
||||
.metadata-sidebar {
|
||||
position: fixed !important;
|
||||
top: 0 !important;
|
||||
right: 0 !important;
|
||||
width: 384px !important;
|
||||
height: 100vh !important;
|
||||
background: var(--pm-bg-surface) !important;
|
||||
border-left: 1px solid var(--pm-border) !important;
|
||||
display: flex !important;
|
||||
flex-direction: column !important;
|
||||
z-index: 10000 !important;
|
||||
transition: transform 0.3s ease-in-out !important;
|
||||
}
|
||||
|
||||
.metadata-sidebar.collapsed {
|
||||
transform: translateX(340px) !important;
|
||||
}
|
||||
|
||||
.metadata-collapse-btn {
|
||||
position: absolute;
|
||||
left: -40px;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
width: 32px;
|
||||
height: 80px;
|
||||
background: var(--pm-bg-surface);
|
||||
border: 1px solid var(--pm-border);
|
||||
border-right: none;
|
||||
border-radius: var(--pm-radius-sm) 0 0 var(--pm-radius-sm);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
cursor: pointer;
|
||||
transition: all 0.3s ease;
|
||||
z-index: 10001;
|
||||
}
|
||||
|
||||
.metadata-collapse-btn:hover { background: var(--pm-bg-hover); }
|
||||
.metadata-collapse-btn svg { transition: transform 0.3s ease; }
|
||||
.metadata-sidebar.collapsed .metadata-collapse-btn svg { transform: rotate(180deg); }
|
||||
|
||||
/* ── Tag Chips ───────────────────────────────────── */
|
||||
.tag-chip {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
padding: 2px 8px;
|
||||
background: var(--pm-bg-input);
|
||||
border: 1px solid var(--pm-border);
|
||||
border-radius: var(--pm-radius-sm);
|
||||
font-size: 12px;
|
||||
color: var(--pm-text-secondary);
|
||||
transition: all 0.2s;
|
||||
}
|
||||
|
||||
.tag-chip:hover { background: var(--pm-bg-hover); }
|
||||
|
||||
.tag-chip .tag-remove {
|
||||
margin-left: 6px;
|
||||
padding: 2px;
|
||||
border-radius: 3px;
|
||||
cursor: pointer;
|
||||
color: var(--pm-text-muted);
|
||||
transition: all 0.2s;
|
||||
}
|
||||
|
||||
.tag-chip .tag-remove:hover {
|
||||
color: var(--pm-error);
|
||||
background: var(--pm-error-tint);
|
||||
}
|
||||
|
||||
/* ── Gallery image hover ─────────────────────────── */
|
||||
.image-item {
|
||||
transition: transform 0.2s ease, box-shadow 0.2s ease;
|
||||
}
|
||||
|
||||
.image-item:hover {
|
||||
transform: translateY(-2px);
|
||||
box-shadow: var(--pm-shadow);
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
/**
|
||||
* Theme Bridge — Detects ComfyUI palette and applies body-level styling.
|
||||
*
|
||||
* When running inside ComfyUI, the parent page already injects palette CSS
|
||||
* variables so our --pm-* tokens auto-resolve. This script adds a data
|
||||
* attribute for CSS selectors that need to distinguish light vs dark.
|
||||
*
|
||||
* When running standalone (direct URL), we fall back to dark defaults.
|
||||
*/
|
||||
(function () {
|
||||
'use strict';
|
||||
|
||||
const LIGHT_PALETTES = ['light', 'solarized', 'github', 'arc'];
|
||||
|
||||
async function detectPalette() {
|
||||
try {
|
||||
const res = await fetch('/api/settings/Comfy.ColorPalette');
|
||||
if (!res.ok) return 'dark';
|
||||
const data = await res.json();
|
||||
// data is the palette name string, or an object with value
|
||||
const name = (typeof data === 'string' ? data : data?.value || 'dark').toLowerCase();
|
||||
return name;
|
||||
} catch {
|
||||
// Standalone mode — no ComfyUI API available
|
||||
return 'dark';
|
||||
}
|
||||
}
|
||||
|
||||
function applyPalette(name) {
|
||||
const isLight = LIGHT_PALETTES.some(p => name.includes(p));
|
||||
document.documentElement.setAttribute('data-pm-theme', isLight ? 'light' : 'dark');
|
||||
}
|
||||
|
||||
// Run immediately — script is loaded in <head> so body isn't parsed yet.
|
||||
// We set the attribute as soon as possible to prevent flash.
|
||||
document.documentElement.setAttribute('data-pm-theme', 'dark');
|
||||
detectPalette().then(applyPalette);
|
||||
})();
|
||||
@@ -1,3 +1,61 @@
|
||||
@tailwind base;
|
||||
@tailwind components;
|
||||
@tailwind utilities;
|
||||
@import "tailwindcss";
|
||||
|
||||
/*
|
||||
* Content sources — tell Tailwind v4 where to scan for class usage.
|
||||
* Replaces the v3 `content` array in tailwind.config.js.
|
||||
*/
|
||||
@source "../../**/*.html";
|
||||
@source "../../js/**/*.js";
|
||||
|
||||
/* ── Custom Utilities — map to --pm-* design tokens ───────── */
|
||||
|
||||
/* Backgrounds */
|
||||
@utility bg-pm-primary { background-color: var(--pm-bg-primary); }
|
||||
@utility bg-pm-surface { background-color: var(--pm-bg-surface); }
|
||||
@utility bg-pm-input { background-color: var(--pm-bg-input); }
|
||||
@utility bg-pm-hover { background-color: var(--pm-bg-hover); }
|
||||
@utility bg-pm-elevated { background-color: var(--pm-bg-elevated); }
|
||||
@utility bg-pm-accent { background-color: var(--pm-accent); }
|
||||
@utility bg-pm-accent-hover { background-color: var(--pm-accent-hover); }
|
||||
@utility bg-pm-accent-tint { background-color: var(--pm-accent-tint); }
|
||||
@utility bg-pm-error { background-color: var(--pm-error); }
|
||||
@utility bg-pm-error-tint { background-color: var(--pm-error-tint); }
|
||||
@utility bg-pm-success { background-color: var(--pm-success); }
|
||||
@utility bg-pm-success-tint { background-color: var(--pm-success-tint); }
|
||||
@utility bg-pm-warning { background-color: var(--pm-warning); }
|
||||
@utility bg-pm-warning-tint { background-color: var(--pm-warning-tint); }
|
||||
@utility bg-pm-info { background-color: var(--pm-info); }
|
||||
@utility bg-pm-info-tint { background-color: var(--pm-info-tint); }
|
||||
|
||||
/* Text */
|
||||
@utility text-pm { color: var(--pm-text); }
|
||||
@utility text-pm-secondary { color: var(--pm-text-secondary); }
|
||||
@utility text-pm-input { color: var(--pm-text-input); }
|
||||
@utility text-pm-muted { color: var(--pm-text-muted); }
|
||||
@utility text-pm-accent { color: var(--pm-accent); }
|
||||
@utility text-pm-accent-fg { color: var(--pm-accent-fg); }
|
||||
@utility text-pm-error { color: var(--pm-error); }
|
||||
@utility text-pm-success { color: var(--pm-success); }
|
||||
@utility text-pm-warning { color: var(--pm-warning); }
|
||||
|
||||
/* Borders */
|
||||
@utility border-pm { border-color: var(--pm-border); }
|
||||
@utility border-pm-subtle { border-color: var(--pm-border-subtle); }
|
||||
@utility border-pm-accent { border-color: var(--pm-accent); }
|
||||
|
||||
/* Shadows */
|
||||
@utility shadow-pm { box-shadow: var(--pm-shadow); }
|
||||
@utility shadow-pm-sm { box-shadow: var(--pm-shadow-sm); }
|
||||
|
||||
/* Border radius */
|
||||
@utility rounded-pm-sm { border-radius: var(--pm-radius-sm); }
|
||||
@utility rounded-pm-md { border-radius: var(--pm-radius-md); }
|
||||
@utility rounded-pm-lg { border-radius: var(--pm-radius-lg); }
|
||||
|
||||
/* Ring / outline accent */
|
||||
@utility ring-pm-accent { --tw-ring-color: var(--pm-accent); }
|
||||
|
||||
/* Placeholder */
|
||||
@utility placeholder-pm {
|
||||
&::placeholder { color: var(--pm-text-muted); }
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user