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): inherit macOS menu colors without extra CSS

Abdurrahman Fakhrulb91242ffa8dd
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 780e3c2d..8d2cfefa 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` inherit macOS menu colors without extra CSS
- `appshell` align macOS menu symbol colors
- `macos` unify shared menu glass material
- `macos` unify shared menu typography with Figma reference
diff --git a/docs/PROGRESS.md b/docs/PROGRESS.md
index aa782449..f0cb6690 100644
--- a/docs/PROGRESS.md
+++ b/docs/PROGRESS.md
@@ -1,6 +1,6 @@
## 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.
+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, and their shared row body leaves icons inheriting the row alongside existing dropdown icons, checkmarks and arrows. 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. The existing CSS bundle cap rejected an extra rule/utility, so the final implementation removes macOS-only color overrides without adding CSS. No budget, selection contract, action or dependency changed.
## 2026-10-08: Unify shared macOS menu glass material
diff --git a/frontend/slices/appshell/components/shells/context-menu-parts.tsx b/frontend/slices/appshell/components/shells/context-menu-parts.tsx
index 6d812a67..80fc22a1 100644
--- a/frontend/slices/appshell/components/shells/context-menu-parts.tsx
+++ b/frontend/slices/appshell/components/shells/context-menu-parts.tsx
@@ -68,7 +68,7 @@ function RowBody({ m, icon: Icon, label, trailing }: { m: MenuMetrics; icon?: Lu
// edge aligned even when a row has no icon (Fluent rows).
<span className="flex size-4 shrink-0 items-center justify-center">{Icon && <Icon className={cn("size-4", GLYPH)} />}</span>
) : (
- Icon && <Icon className={cn(m.iconSize, GLYPH)} />
+ Icon && <Icon className={cn(m.iconSize, m.isMac ? "shrink-0" : GLYPH)} />
)}
<span className="min-w-0 flex-1 truncate">{label}</span>
{trailing}
@@ -106,7 +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";
+ const text = m.isMac ? undefined : "text-foreground/90";
return (
<>
{items.map((it, i) => {
diff --git a/frontend/slices/appshell/components/shells/macos/macos-shell.css b/frontend/slices/appshell/components/shells/macos/macos-shell.css
index c8100bd6..ae81e5d0 100644
--- a/frontend/slices/appshell/components/shells/macos/macos-shell.css
+++ b/frontend/slices/appshell/components/shells/macos/macos-shell.css
@@ -57,7 +57,6 @@
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 e774a762..8878d823 100644
--- a/frontend/slices/appshell/design/macos/design.md
+++ b/frontend/slices/appshell/design/macos/design.md
@@ -8,7 +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.
+- Browser inspection of the menu checkmark confirms the primary label color (#1A1A1A). Context/submenu labels inherit the shared macOS theme color; the shared context row body leaves icons inheriting their row color alongside existing dropdown icons, checkmarks and arrows, 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.