mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-02-21 23:34:31 +00:00
This pull request introduces a comprehensive update to the design system's color management, focusing on establishing semantic color tokens for both light and dark themes. It replaces many hardcoded color values and legacy CSS classes throughout the codebase with new semantic CSS variables, ensuring consistent theming and easier future maintenance. The changes affect core CSS files as well as numerous Vue components, aligning their styling with the new design system. **Design System Foundation** * Added a wide range of new color variables to `style.css`, including base colors (e.g., `--color-white`, `--color-black`), additional shades for sand, azure, cobalt, gold, coral, and magenta, and new alpha (transparency) colors. [[1]](diffhunk://#diff-71b6b57a56095b04e47c797a5016149b76b27971cab04b93f033f1f846e0f5a0L52-R87) [[2]](diffhunk://#diff-71b6b57a56095b04e47c797a5016149b76b27971cab04b93f033f1f846e0f5a0R119-R123) * Introduced semantic color tokens for both light and dark modes (`--base-background`, `--primary-background`, `--destructive-background`, etc.), mapping them to the new base colors for consistent usage across the application. [[1]](diffhunk://#diff-71b6b57a56095b04e47c797a5016149b76b27971cab04b93f033f1f846e0f5a0R219-R239) [[2]](diffhunk://#diff-71b6b57a56095b04e47c797a5016149b76b27971cab04b93f033f1f846e0f5a0R301-R321) * Exposed semantic tokens as CSS variables (e.g., `--color-base-foreground`, `--color-secondary-background`) for use throughout the app. **Component Refactoring to Semantic Tokens** * Updated Vue components and their tests to use the new semantic color classes (e.g., `bg-base-background`, `text-base-foreground`, `bg-secondary-background`) instead of hardcoded colors or legacy dark-theme classes. This affects components such as `WorkflowTemplateSelectorDialog.vue`, `BypassButton.vue`, `ExecuteButton.vue`, `MenuOptionItem.vue`, `AssetCard.vue`, `MediaAssetMoreMenu.vue`, `MediaTitle.vue`, `WidgetFileUpload.vue`, `WidgetRecordAudio.vue`, `AudioPreviewPlayer.vue`, and `FormDropdownMenuActions.vue`. [[1]](diffhunk://#diff-2c860bdc48e907b1b85dbef846599d8376dd02cff90f49e490eebe61371fecedL149-R149) [[2]](diffhunk://#diff-8ec606ef1100f3a56945ed24cbdc1965050932cd744d4172a3868cdfd23894c0L95-R95) [[3]](diffhunk://#diff-80b781aeba31712968ae157bb70194e4b72bc73430d1cca6a79d718d839daed6L10-R10) [[4]](diffhunk://#diff-55fd9056d35e50249dc9f2280017dc99294221fdbe56d8399cea60f8bac499b5L7-R7) [[5]](diffhunk://#diff-c5e6830e63e2441d2dc70d2ecf7c9b56d0a93821f827e9c5377fc10ae6016f18L30-R32) [[6]](diffhunk://#diff-a1091d53a4b5d493e045aab5960188d2e7c3b80002e7178427268835fadb5809L30-R30) [[7]](diffhunk://#diff-ccdb389a5e355d525dcfa26ecd77519297b6232dd34522411c8bfdd4cde05a1cL6-R6) [[8]](diffhunk://#diff-7ef9ebd48e6f38a644c1a4e7bae1c7bb818bb959b2d20985974824e299ea5c34L3-R3) [[9]](diffhunk://#diff-489229f88dfdfd5d883a3ef7fad6effa0790a18a831d5a9d84642dfb246962a2L115-R115) [[10]](diffhunk://#diff-7bee4b453fc869f546e7150a6e39992ab6442987f80c10f8260b8f3715491997L51-R51) [[11]](diffhunk://#diff-29348fa2e5b8cec1301a99bdec241379aeefc1747cceeb0c39b7df452ca635ffL41-R41) [[12]](diffhunk://#diff-d464ebe3a44bec4fda7155e5605bf173612aca409250b7ef6b78920a89ae2044L24-R24) **Consistency and Maintainability** * Ensured hover, active, and selected states use semantic background and foreground colors for both light and dark themes, improving visual consistency and simplifying future updates. [[1]](diffhunk://#diff-2c860bdc48e907b1b85dbef846599d8376dd02cff90f49e490eebe61371fecedL183-R183) [[2]](diffhunk://#diff-a1091d53a4b5d493e045aab5960188d2e7c3b80002e7178427268835fadb5809L115-R114) [[3]](diffhunk://#diff-ccdb389a5e355d525dcfa26ecd77519297b6232dd34522411c8bfdd4cde05a1cL18-R18) [[4]](diffhunk://#diff-ccdb389a5e355d525dcfa26ecd77519297b6232dd34522411c8bfdd4cde05a1cL29-R29) [[5]](diffhunk://#diff-ccdb389a5e355d525dcfa26ecd77519297b6232dd34522411c8bfdd4cde05a1cL43-R43) [[6]](diffhunk://#diff-ccdb389a5e355d525dcfa26ecd77519297b6232dd34522411c8bfdd4cde05a1cL55-R55) [[7]](diffhunk://#diff-ccdb389a5e355d525dcfa26ecd77519297b6232dd34522411c8bfdd4cde05a1cL69-R69) [[8]](diffhunk://#diff-ccdb389a5e355d525dcfa26ecd77519297b6232dd34522411c8bfdd4cde05a1cL83-R83) [[9]](diffhunk://#diff-2c860bdc48e907b1b85dbef846599d8376dd02cff90f49e490eebe61371fecedL328-R328) [[10]](diffhunk://#diff-489229f88dfdfd5d883a3ef7fad6effa0790a18a831d5a9d84642dfb246962a2L138-R138) [[11]](diffhunk://#diff-29348fa2e5b8cec1301a99bdec241379aeefc1747cceeb0c39b7df452ca635ffL119-R119) [[12]](diffhunk://#diff-29348fa2e5b8cec1301a99bdec241379aeefc1747cceeb0c39b7df452ca635ffL137-R137) [[13]](diffhunk://#diff-d464ebe3a44bec4fda7155e5605bf173612aca409250b7ef6b78920a89ae2044L53-R53) [[14]](diffhunk://#diff-d464ebe3a44bec4fda7155e5605bf173612aca409250b7ef6b78920a89ae2044L153-R153) **Removal of Legacy Styles** * Removed legacy dark-theme class usage and hardcoded color values, replacing them with semantic tokens to unify the styling approach. [[1]](diffhunk://#diff-c5e6830e63e2441d2dc70d2ecf7c9b56d0a93821f827e9c5377fc10ae6016f18L30-R32) [[2]](diffhunk://#diff-d464ebe3a44bec4fda7155e5605bf173612aca409250b7ef6b78920a89ae2044L24-R24) [[3]](diffhunk://#diff-d464ebe3a44bec4fda7155e5605bf173612aca409250b7ef6b78920a89ae2044L53-R53) [[4]](diffhunk://#diff-d464ebe3a44bec4fda7155e5605bf173612aca409250b7ef6b78920a89ae2044L153-R153) These changes lay the groundwork for a scalable and maintainable design system, making it easier to implement future theme changes and ensuring a consistent look and feel across all components.
187 lines
4.3 KiB
Vue
187 lines
4.3 KiB
Vue
<template>
|
|
<div class="flex flex-col">
|
|
<IconTextButton
|
|
v-if="asset?.kind !== '3D'"
|
|
type="transparent"
|
|
class="text-base-foreground"
|
|
label="Inspect asset"
|
|
@click="handleInspect"
|
|
>
|
|
<template #icon>
|
|
<i class="icon-[lucide--zoom-in] size-4" />
|
|
</template>
|
|
</IconTextButton>
|
|
|
|
<IconTextButton
|
|
v-if="showWorkflowOptions"
|
|
type="transparent"
|
|
class="text-base-foreground"
|
|
label="Add to current workflow"
|
|
@click="handleAddToWorkflow"
|
|
>
|
|
<template #icon>
|
|
<i class="icon-[comfy--node] size-4" />
|
|
</template>
|
|
</IconTextButton>
|
|
|
|
<IconTextButton
|
|
type="transparent"
|
|
class="text-base-foreground"
|
|
label="Download"
|
|
@click="handleDownload"
|
|
>
|
|
<template #icon>
|
|
<i class="icon-[lucide--download] size-4" />
|
|
</template>
|
|
</IconTextButton>
|
|
|
|
<MediaAssetButtonDivider v-if="showWorkflowOptions" />
|
|
|
|
<IconTextButton
|
|
v-if="showWorkflowOptions"
|
|
type="transparent"
|
|
class="text-base-foreground"
|
|
label="Open as workflow in new tab"
|
|
@click="handleOpenWorkflow"
|
|
>
|
|
<template #icon>
|
|
<i class="icon-[comfy--workflow] size-4" />
|
|
</template>
|
|
</IconTextButton>
|
|
|
|
<IconTextButton
|
|
v-if="showWorkflowOptions"
|
|
type="transparent"
|
|
class="text-base-foreground"
|
|
label="Export workflow"
|
|
@click="handleExportWorkflow"
|
|
>
|
|
<template #icon>
|
|
<i class="icon-[lucide--file-output] size-4" />
|
|
</template>
|
|
</IconTextButton>
|
|
|
|
<MediaAssetButtonDivider v-if="showWorkflowOptions && showCopyJobId" />
|
|
|
|
<IconTextButton
|
|
v-if="showCopyJobId"
|
|
type="transparent"
|
|
class="text-base-foreground"
|
|
label="Copy job ID"
|
|
@click="handleCopyJobId"
|
|
>
|
|
<template #icon>
|
|
<i class="icon-[lucide--copy] size-4" />
|
|
</template>
|
|
</IconTextButton>
|
|
|
|
<MediaAssetButtonDivider v-if="showCopyJobId && shouldShowDeleteButton" />
|
|
|
|
<IconTextButton
|
|
v-if="shouldShowDeleteButton"
|
|
type="transparent"
|
|
class="text-base-foreground"
|
|
label="Delete"
|
|
@click="handleDelete"
|
|
>
|
|
<template #icon>
|
|
<i class="icon-[lucide--trash-2] size-4" />
|
|
</template>
|
|
</IconTextButton>
|
|
</div>
|
|
</template>
|
|
|
|
<script setup lang="ts">
|
|
import { computed, inject } from 'vue'
|
|
|
|
import IconTextButton from '@/components/button/IconTextButton.vue'
|
|
import { isCloud } from '@/platform/distribution/types'
|
|
|
|
import { useMediaAssetActions } from '../composables/useMediaAssetActions'
|
|
import { MediaAssetKey } from '../schemas/mediaAssetSchema'
|
|
import MediaAssetButtonDivider from './MediaAssetButtonDivider.vue'
|
|
|
|
const { close, showDeleteButton } = defineProps<{
|
|
close: () => void
|
|
showDeleteButton?: boolean
|
|
}>()
|
|
|
|
const emit = defineEmits<{
|
|
inspect: []
|
|
'asset-deleted': []
|
|
}>()
|
|
|
|
const { asset, context } = inject(MediaAssetKey)!
|
|
const actions = useMediaAssetActions()
|
|
|
|
const assetType = computed(() => {
|
|
return asset.value?.tags?.[0] || context.value?.type || 'output'
|
|
})
|
|
|
|
const showWorkflowOptions = computed(() => assetType.value === 'output')
|
|
|
|
// Only show Copy Job ID for output assets (not for imported/input assets)
|
|
const showCopyJobId = computed(() => {
|
|
return assetType.value !== 'input'
|
|
})
|
|
|
|
const shouldShowDeleteButton = computed(() => {
|
|
const propAllows = showDeleteButton ?? true
|
|
const typeAllows =
|
|
assetType.value === 'output' || (assetType.value === 'input' && isCloud)
|
|
|
|
return propAllows && typeAllows
|
|
})
|
|
|
|
const handleInspect = () => {
|
|
emit('inspect')
|
|
close()
|
|
}
|
|
|
|
const handleAddToWorkflow = () => {
|
|
if (asset.value) {
|
|
actions.addWorkflow(asset.value.id)
|
|
}
|
|
close()
|
|
}
|
|
|
|
const handleDownload = () => {
|
|
if (asset.value) {
|
|
actions.downloadAsset()
|
|
}
|
|
close()
|
|
}
|
|
|
|
const handleOpenWorkflow = () => {
|
|
if (asset.value) {
|
|
actions.openWorkflow(asset.value.id)
|
|
}
|
|
close()
|
|
}
|
|
|
|
const handleExportWorkflow = () => {
|
|
if (asset.value) {
|
|
actions.exportWorkflow(asset.value.id)
|
|
}
|
|
close()
|
|
}
|
|
|
|
const handleCopyJobId = async () => {
|
|
if (asset.value) {
|
|
await actions.copyJobId()
|
|
}
|
|
close()
|
|
}
|
|
|
|
const handleDelete = async () => {
|
|
if (!asset.value) return
|
|
|
|
close() // Close the menu first
|
|
|
|
const success = await actions.confirmDelete(asset.value)
|
|
if (success) {
|
|
emit('asset-deleted')
|
|
}
|
|
}
|
|
</script>
|