Skip to content

Conversation

@christian-byrne
Copy link
Contributor

@christian-byrne christian-byrne commented Nov 16, 2025

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 by Unito

Update minimap and graph canvas menu (bottom right) to use menu tokens.
Change canvas BG color on default dark theme.

<img width="3840" height="2029" alt="image"
src="https://github.com/user-attachments/assets/6d168981-df27-40c0-829c-59150b8a6a12"
/>

┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-6589-wip-Style-graph-canvas-color-2a26d73d365081cb88c4c4bdb2b6d3a5)
by [Unito](https://www.unito.io)

---------

Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: Alexander Brown <drjkl@comfy.org>
@dosubot dosubot bot added the size:L This PR changes 100-499 lines, ignoring generated files. label Nov 16, 2025
@DrJKL DrJKL added New Browser Test Expectations New browser test screenshot should be set by github action and removed New Browser Test Expectations New browser test screenshot should be set by github action labels Nov 17, 2025
@DrJKL DrJKL self-requested a review November 17, 2025 20:16
@DrJKL DrJKL changed the base branch from main to core/1.30 November 17, 2025 20:19
@dosubot dosubot bot added size:M This PR changes 30-99 lines, ignoring generated files. and removed size:L This PR changes 100-499 lines, ignoring generated files. labels Nov 17, 2025
@DrJKL DrJKL added the New Browser Test Expectations New browser test screenshot should be set by github action label Nov 17, 2025
@github-actions
Copy link

Updating Playwright Expectations

@github-actions github-actions bot removed the New Browser Test Expectations New browser test screenshot should be set by github action label Nov 17, 2025
@christian-byrne christian-byrne merged commit 24144eb into core/1.30 Nov 18, 2025
2 checks passed
@christian-byrne christian-byrne deleted the backport-minimap-canvas-bg-6589 branch November 18, 2025 18:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:M This PR changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants