Commit 24144eb
## Summary
Backport of PR #6589 (commit 549ef79)
from main to core/1.30 branch.
Updates minimap and canvas background colors to use menu color tokens
(`--comfy-menu-bg`) for consistency across the interface.
## Changes
- Updated minimap container and panel backgrounds to use semantic color
tokens
- Updated canvas menu and zoom controls backgrounds to use consistent
tokens
- Updated user avatar, login button, and other interface elements
- Resolved 20 binary browser test snapshot conflicts using backportee's
copy
- Fixed 8 Vue component conflicts by accepting semantic token changes
## Resolved Conflicts
- **Binary snapshots (20 files)**: Used --theirs (backportee's copy) as
instructed
- **Source files (8 files)**: Accepted cherry-picked semantic token
changes
- TopMenuSection.vue, UserAvatar.vue, CanvasModeSelector.vue
- GraphCanvasMenu.vue, ZoomControlsModal.vue, LoginButton.vue
- MiniMap.vue, MiniMapPanel.vue
All linting and TypeScript checks passed.
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-6714-Backport-PR-6589-minimap-and-canvas-bg-color-tokens-to-core-1-30-2ad6d73d3650811d9c82d1e5f3a81a38)
by [Unito](https://www.unito.io)
---------
Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: Alexander Brown <drjkl@comfy.org>
1 parent fe9f423 commit 24144eb
File tree
31 files changed
+34
-26
lines changed- browser_tests/tests/vueNodes
- groups/groups.spec.ts-snapshots
- interactions
- canvas
- pan.spec.ts-snapshots
- zoom.spec.ts-snapshots
- links/linkInteraction.spec.ts-snapshots
- node/move.spec.ts-snapshots
- nodeStates
- bypass.spec.ts-snapshots
- colors.spec.ts-snapshots
- mute.spec.ts-snapshots
- widgets/load/uploadWidgets.spec.ts-snapshots
- packages/design-system/src/css
- src
- assets/palettes
- components
- common
- graph
- modals
- topbar
- renderer/extensions/minimap
31 files changed
+34
-26
lines changed
0 commit comments