diff --git a/components/SyncStatusButton.tsx b/components/SyncStatusButton.tsx index 1e80e7645..1f955a722 100644 --- a/components/SyncStatusButton.tsx +++ b/components/SyncStatusButton.tsx @@ -107,12 +107,14 @@ interface SyncStatusButtonProps { onOpenSettings?: () => void; onSyncNow?: () => Promise; // Callback to trigger sync with current data className?: string; + style?: React.CSSProperties; } export const SyncStatusButton: React.FC = ({ onOpenSettings, onSyncNow, className, + style, }) => { const { t } = useI18n(); const [isOpen, setIsOpen] = useState(false); @@ -177,9 +179,10 @@ export const SyncStatusButton: React.FC = ({ variant="ghost" size="icon" className={cn( - "h-8 w-8 relative text-muted-foreground hover:text-foreground app-no-drag", + "h-7 w-7 relative text-muted-foreground hover:text-foreground app-no-drag", className )} + style={style} > {getButtonIcon()} diff --git a/components/TopTabs.tsx b/components/TopTabs.tsx index 302603872..cc12a69b3 100644 --- a/components/TopTabs.tsx +++ b/components/TopTabs.tsx @@ -591,14 +591,17 @@ const TopTabsInner: React.FC = ({ )} - {/* Fixed right controls */} -
+ {/* Fixed right controls — utility icons + window controls share one row */} +
- {/* Settings gear button - sits to the left of WindowControls on win/linux, at the right edge on mac */} -
- {/* Custom window controls for Windows/Linux */} - {!isMacClient &&
} {/* Small drag shim to the right edge (macOS only – on Windows the close button should touch the edge) */} - {isMacClient &&
} + {isMacClient &&
}
); diff --git a/components/top-tabs/TopTabItems.tsx b/components/top-tabs/TopTabItems.tsx index 0a886419e..4f4e28234 100644 --- a/components/top-tabs/TopTabItems.tsx +++ b/components/top-tabs/TopTabItems.tsx @@ -161,30 +161,19 @@ export const WindowControls: React.FC = memo(() => { close(); }; + const controlStyle = { color: 'var(--top-tabs-muted, hsl(var(--muted-foreground)))' }; + const controlClassName = + 'h-7 w-10 flex items-center justify-center rounded-none hover:bg-foreground/10 transition-colors app-no-drag'; + return ( -
- - -