| @@ -14,6 +14,7 @@ import { IntegrationIconWithAccount } from "@executor-js/react/components/integr · 13 unmodified lines |
| 14 | 14 | import { CommandPalette } from "@executor-js/react/components/command-palette"; |
| 15 | 15 | import { useClientPlugins, useIntegrationPlugins } from "@executor-js/sdk/client"; |
| 16 | 16 | import { SidebarUpdateCard } from "@executor-js/react/components/update-card"; |
| 17 | +import { Wordmark } from "@executor-js/react/components/wordmark"; |
| 17 | 18 | import { ServerConnectionMenu } from "./server-connection-menu"; |
| 18 | 19 | |
| 19 | 20 | // ── Env ───────────────────────────────────────────────────────────────── |
| @@ -161,16 +162,8 @@ function SidebarContent(props: { pathname: string; onNavigate?: () => void; show · 141 unmodified lines |
| 161 | 162 | <> |
| 162 | 163 | {props.showBrand !== false && ( |
| 163 | 164 | <div className="desktop-macos-titlebar flex h-12 shrink-0 items-center gap-2 border-b border-sidebar-border px-4"> |
| 164 | | − <Link |
| 165 | | − to="/{-$orgSlug}" |
| 166 | | − className="desktop-macos-no-drag flex shrink-0 items-center gap-1.5" |
| 167 | | − > |
| 168 | | − <span className="font-mono text-sm font-medium tracking-tight text-foreground"> |
| 169 | | − executor |
| 170 | | − </span> |
| 171 | | − <span className="rounded bg-primary/15 px-1.5 py-px text-[10px] font-semibold uppercase tracking-wider text-primary"> |
| 172 | | − Beta |
| 173 | | − </span> |
| 165 | + <Link to="/{-$orgSlug}" className="desktop-macos-no-drag flex shrink-0 items-center"> |
| 166 | + <Wordmark /> |
| 174 | 167 | </Link> |
| 175 | 168 | <div className="desktop-macos-no-drag ml-auto flex min-w-0 flex-1 justify-end pl-3"> |
| 176 | 169 | <ServerConnectionMenu variant="header" /> |
| @@ -312,21 +305,16 @@ export function Shell() { · 135 unmodified lines |
| 312 | 305 | onClick={() => setMobileSidebarOpen(false)} |
| 313 | 306 | /> |
| 314 | 307 | <div className="relative flex h-full w-[84vw] max-w-xs flex-col border-r border-sidebar-border bg-sidebar shadow-2xl"> |
| 315 | | − <div className="flex h-12 shrink-0 items-center justify-between border-b border-sidebar-border px-4"> |
| 316 | | − <Link to="/{-$orgSlug}" className="flex items-center gap-1.5"> |
| 317 | | − <span className="font-mono text-sm font-medium tracking-tight text-foreground"> |
| 318 | | − executor |
| 319 | | − </span> |
| 320 | | − <span className="rounded bg-primary/15 px-1.5 py-px text-[10px] font-semibold uppercase tracking-wider text-primary"> |
| 321 | | − Beta |
| 322 | | − </span> |
| 308 | + <div className="desktop-macos-titlebar flex h-12 shrink-0 items-center justify-between border-b border-sidebar-border px-4"> |
| 309 | + <Link to="/{-$orgSlug}" className="desktop-macos-no-drag flex items-center"> |
| 310 | + <Wordmark /> |
| 323 | 311 | </Link> |
| 324 | 312 | <Button |
| 325 | 313 | variant="ghost" |
| 326 | 314 | size="icon-sm" |
| 327 | 315 | aria-label="Close navigation" |
| 328 | 316 | onClick={() => setMobileSidebarOpen(false)} |
| 329 | | − className="text-sidebar-foreground hover:bg-sidebar-active hover:text-foreground" |
| 317 | + className="desktop-macos-no-drag text-sidebar-foreground hover:bg-sidebar-active hover:text-foreground" |
| 330 | 318 | > |
| 331 | 319 | <svg viewBox="0 0 16 16" className="size-3.5"> |
| 332 | 320 | <path |
| @@ -356,14 +344,16 @@ export function Shell() { · 23 unmodified lines |
| 356 | 344 | the top and their borders line up with the sidebar header. */} |
| 357 | 345 | <div className="desktop-macos-main-titlebar" /> |
| 358 | 346 | |
| 359 | | − {/* Mobile top bar */} |
| 360 | | − <div className="flex h-12 shrink-0 items-center justify-between border-b border-border bg-background px-4 md:hidden"> |
| 347 | + {/* Mobile top bar. The desktop-macos-titlebar offset keeps the |
| 348 | + far-left hamburger clear of the native traffic lights when the macOS |
| 349 | + window is forced below the md breakpoint (issue #1125). */} |
| 350 | + <div className="desktop-macos-titlebar flex h-12 shrink-0 items-center justify-between border-b border-border bg-background px-4 md:hidden"> |
| 361 | 351 | <Button |
| 362 | 352 | variant="outline" |
| 363 | 353 | size="icon-sm" |
| 364 | 354 | aria-label="Open navigation" |
| 365 | 355 | onClick={() => setMobileSidebarOpen(true)} |
| 366 | | − className="bg-card hover:bg-accent/50" |
| 356 | + className="desktop-macos-no-drag bg-card hover:bg-accent/50" |
| 367 | 357 | > |
| 368 | 358 | <svg viewBox="0 0 16 16" className="size-4"> |
| 369 | 359 | <path |
| @@ -374,10 +364,8 @@ export function Shell() { · 4 unmodified lines |
| 374 | 364 | /> |
| 375 | 365 | </svg> |
| 376 | 366 | </Button> |
| 377 | | − <Link to="/{-$orgSlug}" className="flex items-center gap-1.5"> |
| 378 | | − <span className="font-mono text-sm font-medium tracking-tight text-foreground"> |
| 379 | | − executor |
| 380 | | − </span> |
| 367 | + <Link to="/{-$orgSlug}" className="desktop-macos-no-drag flex items-center"> |
| 368 | + <Wordmark /> |
| 381 | 369 | </Link> |
| 382 | 370 | <div className="w-8 shrink-0" /> |
| 383 | 371 | </div> |