Skip to content

Masterbar: show site icon in the site menu - #112877

Merged
fushar merged 2 commits into
trunkfrom
interim-omnibar-site-icon
Jul 28, 2026
Merged

Masterbar: show site icon in the site menu#112877
fushar merged 2 commits into
trunkfrom
interim-omnibar-site-icon

Conversation

@fushar

@fushar fushar commented Jul 22, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Fixes DOTCOM-17788

Proposed Changes

Gutenberg 23.6 shows the site icon in the admin bar if set (WordPress/gutenberg#79807). This PR ports that logic to our masterbar component in Calypso.

Testing Instructions

  1. Upload a site icon to your site on Settings -> General.
  2. Verify it shows up in both my.localhost:3000/sites/:siteSlug and calypso.localhost:3000/home/:siteSlug:
Before After
image image
  1. Verify it looks the same as in wp-admin.
  2. Verify it looks the same as in wp-admin in mobile viewport.
  3. Remove the site icon; verify it shows the home dashicon back.

Pre-merge Checklist

  • Has the general commit checklist been followed? (PCYsg-hS-p2)
  • Have you written new tests for your changes?
  • Have you tested the feature in Simple (P9HQHe-k8-p2), Atomic (P9HQHe-jW-p2), and self-hosted Jetpack sites (PCYsg-g6b-p2)?
  • Have you checked for TypeScript, React or other console errors?
  • For UI changes, have you tested the affected components in dark mode?
  • Have you tested accessibility for your changes? Ensure the feature remains usable with various user agents (e.g., browsers), interfaces (e.g., keyboard navigation), and assistive technologies (e.g., screen readers) (PCYsg-S3g-p2).
  • Have you used memoizing on expensive computations? More info in Memoizing with create-selector and Using memoizing selectors and Our Approach to Data
  • Have we added the "[Status] String Freeze" label as soon as any new strings were ready for translation (p4TIVU-5Jq-p2)?
    • For UI changes, have we tested the change in various languages (for example, ES, PT, FR, or DE)? The length of text and words vary significantly between languages.
  • For changes affecting Jetpack: Have we added the "[Status] Needs Privacy Updates" label if this pull request changes what data or activity we track or use (p4TIVU-aUh-p2)?

🤖 Generated with Claude Code

@github-actions

github-actions Bot commented Jul 22, 2026 •
edited by matticbot
Loading

Copy link
Copy Markdown

WordPress.com

Automattic for Agencies

Jetpack Cloud Live (direct link)
https://calypso.live?image=registry.a8c.com/calypso/app:build-190479&env=jetpack

@fushar
fushar requested a review from a team July 22, 2026 14:52
@matticbot matticbot added the [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. label Jul 22, 2026
@fushar fushar self-assigned this Jul 22, 2026
@fushar
fushar marked this pull request as ready for review July 22, 2026 14:52
p-jackson
p-jackson approved these changes Jul 23, 2026
View reviewed changes

@p-jackson p-jackson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, this is how it looks in the beta 👍

Comment thread client/layout/masterbar/style.scss Outdated
width: 20px;
height: 20px;
border-radius: 2px;
background: var(--studio-white);

@p-jackson p-jackson Jul 23, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When I test 7.1 beta 3 in Studio, this background colour appears to be #f0f0f1

@fushar fushar Jul 23, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, and it seems to be color scheme-independent. Thanks, updated!

@github-actions

github-actions Bot commented Jul 23, 2026

Copy link
Copy Markdown

Looks like one of the E2E tests has failed.

You can fix them following these steps:

  1. Check out this branch locally: 
    gh pr checkout 112877
  2. Start Claude Code in the repo: 
    claude
  3. Run the /fix-e2e-tests skill, passing this PR number: 
    /fix-e2e-tests 112877

fushar and others added 2 commits July 28, 2026 19:14
@fushar @claude
Masterbar: show site icon in the site menu
b7eb115 
Display the selected site's icon in place of the home dashicon in the
masterbar site menu when the site has one, falling back to the dashicon
otherwise. Ports the WordPress core admin bar behavior to Calypso, so
both the classic Calypso masterbar and the Dashboard interim omnibar show
the site icon.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@fushar
Fix bg color
b30b0cb
@fushar
fushar force-pushed the interim-omnibar-site-icon branch from 3773f23 to b30b0cb Compare July 28, 2026 12:14
@fushar
fushar merged commit 01ae729 into trunk Jul 28, 2026
12 checks passed
@fushar
fushar deleted the interim-omnibar-site-icon branch July 28, 2026 13:27
@github-actions github-actions Bot removed the [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. label Jul 28, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@p-jackson p-jackson p-jackson approved these changes

Assignees

@fushar fushar

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@fushar @p-jackson @matticbot