ros/automaker
1
0
Fork 0
mirror of https://github.com/AutoMaker-Org/automaker.git synced 2026-02-04 09:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #217 from JBotwina/fix/176-logo-macos-buttons-overlap

Browse Source 
fix(ui): prevent logo from overlapping macOS traffic light buttons
This commit is contained in:
Web Dev Cody
2025-12-22 13:23:05 -05:00
committed by GitHub
parent 3f3f02905f 53c1a46409
commit 6a8b2067fd
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/ui/src/components/layout/sidebar/components/sidebar-header.tsx
View File

@@ -1,5 +1,5 @@
import type { NavigateOptions } from '@tanstack/react-router'; import type { NavigateOptions } from '@tanstack/react-router';
import { cn } from '@/lib/utils'; import { cn, isMac } from '@/lib/utils';
import { AutomakerLogo } from './automaker-logo'; import { AutomakerLogo } from './automaker-logo';
import { BugReportButton } from './bug-report-button'; import { BugReportButton } from './bug-report-button';
@@ -20,7 +20,9 @@ export function SidebarHeader({ sidebarOpen, navigate }: SidebarHeaderProps) {
// Background gradient for depth // Background gradient for depth
'bg-gradient-to-b from-transparent to-background/5', 'bg-gradient-to-b from-transparent to-background/5',
'flex items-center', 'flex items-center',
sidebarOpen ? 'px-3 lg:px-5 justify-start' : 'px-3 justify-center' sidebarOpen ? 'px-3 lg:px-5 justify-start' : 'px-3 justify-center',
// Add left padding on macOS to avoid overlapping with traffic light buttons
isMac && 'pt-4 pl-20'
)} )}
> >
<AutomakerLogo sidebarOpen={sidebarOpen} navigate={navigate} /> <AutomakerLogo sidebarOpen={sidebarOpen} navigate={navigate} />

11
apps/ui/src/lib/utils.ts
View File

@@ -52,3 +52,14 @@ export function pathsEqual(p1: string | undefined | null, p2: string | undefined
if (!p1 || !p2) return p1 === p2; if (!p1 || !p2) return p1 === p2;
return normalizePath(p1) === normalizePath(p2); return normalizePath(p1) === normalizePath(p2);
} }
/**
* Detect if running on macOS.
* Checks Electron process.platform first, then falls back to navigator APIs.
*/
export const isMac =
typeof process !== 'undefined' && process.platform === 'darwin'
? true
: typeof navigator !== 'undefined' &&
(/Mac/.test(navigator.userAgent) ||
(navigator.platform ? navigator.platform.toLowerCase().includes('mac') : false));