Skip to content

armgit / mso

Public Imported from GitHub
0

Browser-based graphical shell and control plane for a Linux server you own — real terminal, file manager, live metrics and BYOK AI in one mobile-first workspace. Next.js 16 · React 19 · node-pty · Tailwind v4 · shadcn/ui. Public alpha, self-hosted.

fix(appshell): align macOS menu symbol colors

Abdurrahman Fakhrula5197b471f48
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index f0bd5d69..780e3c2d 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -8,6 +8,7 @@ this is the *what*, and it is what Settings → Account → About shows as “Wh
**Fixed**
+- `appshell` align macOS menu symbol colors
- `macos` unify shared menu glass material
- `macos` unify shared menu typography with Figma reference
- `fs` cap the complete enumeration response
diff --git a/docs/PROGRESS.md b/docs/PROGRESS.md
index 3e456cb1..aa782449 100644
--- a/docs/PROGRESS.md
+++ b/docs/PROGRESS.md
@@ -1,3 +1,7 @@
+## 2026-10-08: Match macOS menu symbols to their labels
+
+The open Figma menu uses the same primary color for normal labels and symbols, with white symbols on selection. MSO context icons previously kept the generic blue accent and labels overrode the macOS palette. Context/submenu rows now inherit the existing macOS primary color, while one scoped CSS rule makes menu-bar/context/submenu SVGs follow their row. Destructive rows retain their existing red token. Windows and touch-shell colors keep the shared component's previous behavior. Browser checks compare actual symbol/label colors in both themes and after a Windows round trip, and exercise the widget consumer's Medium checkmark and Remove widget row without invoking removal. No selection contract, action or dependency changed.
+
## 2026-10-08: Unify shared macOS menu glass material
The Figma menu already matched MSO's 12px corners and 8px/48px outer shadow. Browser properties also showed a 0.5px Plus Lighter glass edge; native refraction is intentionally approximated with CSS. Context/submenu panels previously inherited a different blur from dropdowns, despite sharing the same macOS chrome. The macOS menu rule now owns the existing blur/saturation material and a thin highlight for all three surfaces, with readable theme backgrounds retained. Reduced glass disables both standard and WebKit filters. No global glass helper or other shell metric changed. Rendered menu checks verify the shared material in both themes alongside geometry, keyboard, contrast and shell-switch regression checks. The full gate exposed an existing enumeration fixture that resolved credential aliases in the operator home; its synthetic HOME and read roots are now isolated and restored without changing runtime deadlines, admission or coverage thresholds.
diff --git a/frontend/slices/appshell/components/shells/context-menu-parts.tsx b/frontend/slices/appshell/components/shells/context-menu-parts.tsx
index 7278a2b5..6d812a67 100644
--- a/frontend/slices/appshell/components/shells/context-menu-parts.tsx
+++ b/frontend/slices/appshell/components/shells/context-menu-parts.tsx
@@ -106,6 +106,7 @@ export function SubPanel({ item, m, onClose, pos, panelRef, onEnter, onLeave }:
}
export function MenuRows({ items, m, onClose, sub }: { items: MenuItem[]; m: MenuMetrics; onClose: () => void; sub?: SubControl }) {
+ const text = m.isMac ? "text-inherit" : "text-foreground/90";
return (
<>
{items.map((it, i) => {
@@ -124,7 +125,7 @@ export function MenuRows({ items, m, onClose, sub }: { items: MenuItem[]; m: Men
disabled={it.disabled || !sub}
onClick={(e) => sub?.onOpen(i, e.currentTarget.getBoundingClientRect(), { toggle: true })}
onMouseEnter={(e) => !m.tap && sub?.onOpen(i, e.currentTarget.getBoundingClientRect())}
- className={cn(ROW, "text-foreground/90", m.item, m.tap && "min-h-11", sub?.open === i && "bg-accent")}
+ className={cn(ROW, text, m.item, m.tap && "min-h-11", sub?.open === i && "bg-accent")}
>
<RowBody m={m} icon={it.icon} label={it.label} trailing={<ChevronRight className="size-4 shrink-0 opacity-60" />} />
</button>
@@ -138,7 +139,7 @@ export function MenuRows({ items, m, onClose, sub }: { items: MenuItem[]; m: Men
disabled={it.disabled}
onClick={() => { it.onClick(); onClose(); }}
onMouseEnter={() => !m.tap && sub?.onLeave()}
- className={cn(ROW, it.danger ? "text-destructive-text" : "text-foreground/90", m.item, m.tap && "min-h-11")}
+ className={cn(ROW, it.danger ? "text-destructive-text" : text, m.item, m.tap && "min-h-11")}
>
<RowBody
m={m}
diff --git a/frontend/slices/appshell/components/shells/macos/macos-shell.css b/frontend/slices/appshell/components/shells/macos/macos-shell.css
index ae81e5d0..c8100bd6 100644
--- a/frontend/slices/appshell/components/shells/macos/macos-shell.css
+++ b/frontend/slices/appshell/components/shells/macos/macos-shell.css
@@ -57,6 +57,7 @@
font-size: inherit;
font-weight: inherit;
}
+.macos-menu [role^="menuitem"] svg { color: inherit; }
.macos-menu [role^="menuitem"]:is(:focus, :hover):not(:disabled, [data-disabled]) {
color: #fff;
background: #0062e6;
diff --git a/frontend/slices/appshell/design/macos/design.md b/frontend/slices/appshell/design/macos/design.md
index b399c805..e774a762 100644
--- a/frontend/slices/appshell/design/macos/design.md
+++ b/frontend/slices/appshell/design/macos/design.md
@@ -8,6 +8,7 @@ Source: [macOS 27 Examples](https://www.figma.com/design/f3ivRnEohVvr87qszwuQiw/
- PR103 candidate B 5efbe7ea supplies the direction for semibold/heavy bar labels, 24px fine-pointer context rows and translucent menu material.
- Browser inspection of Examples/Menubar `4370:42756` confirms SF Pro Medium 13px labels and shortcut symbols. The shared `.macos-menu` rule owns size/weight for menu-bar, context and submenu rows; portaled panels use the existing `data-shell-id` font stack instead of a separate system-ui override. Platform font fallback remains intentional where SF Pro is unavailable.
- Browser inspection of the active Glass Effect confirms a 12px radius and 0.5px Plus Lighter inner edge; its fallback shadow is 0 8px 48px at 25%. Native refraction/dispersion are approximated with the existing blur token, saturation and a thin CSS highlight. The shared macOS rule owns material for dropdown, context and submenu panels; reduced glass disables both standard and WebKit filters. Existing readable light/dark backgrounds, geometry and targets stay authoritative.
+- Browser inspection of the menu checkmark confirms the primary label color (#1A1A1A). Context/submenu labels inherit the shared macOS theme color; icons, checkmarks and arrows inherit their row color, including white selection and the existing destructive token. Rendered widget menus verify the shared consumer and preserve the Medium checkmark.
- Combined menus retain A's readable shortcut text and selection contrast. Coarse-pointer rows remain at least 44px; Windows and Dashboard metrics retain their existing values.
- Existing Radix controls, shell store, app registry and docking interactions remain authoritative.
- The Examples page has no dock specimen. Preserve existing artwork; reserve the full hover-growth pool so controls stay reachable.
diff --git a/scripts/e2e/macos-figma.mjs b/scripts/e2e/macos-figma.mjs
index 96a3c724..d4aa03a9 100644
--- a/scripts/e2e/macos-figma.mjs
+++ b/scripts/e2e/macos-figma.mjs
@@ -28,6 +28,7 @@ try {
await context.addInitScript(() => {
localStorage.setItem("mso:onboarding:v1", "done");
localStorage.setItem("sv:shell", JSON.stringify({ desktop: "macos", mobile: "ios" }));
+ localStorage.setItem("mso:desktop-widgets", JSON.stringify({ on: true, enabled: ["cpu"], sizes: { cpu: "m" }, positions: {} }));
});
page = await context.newPage();
const errors = [];
diff --git a/scripts/e2e/macos-menu-evidence.mjs b/scripts/e2e/macos-menu-evidence.mjs
index eaa3aa03..d678e49d 100644
--- a/scripts/e2e/macos-menu-evidence.mjs
+++ b/scripts/e2e/macos-menu-evidence.mjs
@@ -11,15 +11,20 @@ async function menuChrome(menu) {
expect(material.filter).toContain("saturate(1.8)");
expect(material.edge).toBe(material.mode === "dark" ? "rgba(255, 255, 255, 0.18)" : "rgba(255, 255, 255, 0.35)");
expect(material.shadow).toContain("inset");
+ await expect.poll(() => menu.locator('[role^="menuitem"]').evaluateAll(items =>
+ items.every(item => [...item.querySelectorAll("svg")].every(svg => getComputedStyle(svg).color === getComputedStyle(item).color))
+ )).toBe(true);
const rows = await menu.locator('[role^="menuitem"]').evaluateAll(items => items.map(item => {
const style = getComputedStyle(item);
- return { size: style.fontSize, weight: style.fontWeight, family: style.fontFamily };
+ return { size: style.fontSize, weight: style.fontWeight, family: style.fontFamily, color: style.color,
+ symbols: [...item.querySelectorAll("svg")].map(svg => getComputedStyle(svg).color) };
}));
expect(rows.length).toBeGreaterThan(0);
for (const row of rows) {
expect(row.size).toBe("13px");
expect(row.weight).toBe("500");
expect(row.family).toContain("SF Pro Text");
+ for (const symbol of row.symbols) expect(symbol).toBe(row.color);
}
}
@@ -50,6 +55,23 @@ export async function menuEvidence({ page, check, shot }, theme) {
await expect(menu).toHaveCount(0);
expect(axe.violations.map(v => ({ id: v.id, targets: v.nodes.map(n => n.target) }))).toEqual([]);
});
+ await check(theme + " widget selection and destructive symbol colors", async () => {
+ await page.locator('[data-slot="widget-card"]').filter({ hasText: "CPU" }).click({ button: "right" });
+ const menu = page.locator('.macos-menu[role="menu"]');
+ await expect(menu).toBeVisible();
+ await page.mouse.move(750, 50);
+ await page.keyboard.press("ArrowDown");
+ await menuChrome(menu);
+ const selected = menu.getByRole("menuitem", { name: "Medium", exact: true });
+ await expect(selected.locator("svg.lucide-check")).toBeVisible();
+ const danger = menu.getByRole("menuitem", { name: "Remove widget", exact: true });
+ await expect(danger).toHaveClass(/text-destructive-text/);
+ expect(await danger.evaluate(el => getComputedStyle(el).color)).not.toBe(await menu.evaluate(el => getComputedStyle(el).color));
+ const normal = menu.getByRole("menuitem", { name: "Large", exact: true });
+ expect(await normal.evaluate(el => getComputedStyle(el).color)).toBe(await menu.evaluate(el => getComputedStyle(el).color));
+ await shot(theme + "-widget-menu");
+ await page.keyboard.press("Escape");
+ });
await check(theme + " open menu WCAG A/AA", async () => {
await page.locator(".macos-menubar").getByRole("button", { name: "View", exact: true }).click();
const menu = page.locator(".macos-menu");