Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apps/web/src/shell/titlebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ export function NavigationControls() {
<header className="flex h-titlebar w-full shrink-0 items-center bg-desktop pr-2 select-none [-webkit-app-region:drag]">
<div
data-slot="sidebar-navigation"
className={`flex shrink-0 items-center gap-1 pr-2 ${insetTitleBar ? "min-w-44 pl-22" : "min-w-28 pl-3"}`}
style={{ width: withSidebar ? "var(--sidebar-width)" : insetTitleBar ? "11rem" : "7rem" }}
className={`flex shrink-0 items-center gap-1 pr-3 ${insetTitleBar ? "pl-22" : "pl-3"}`}
style={{ width: withSidebar ? "var(--sidebar-width)" : "fit-content" }}
>
<SidebarTrigger
title={`Toggle sidebar (${isMac ? "⌘B" : "Ctrl+B"})`}
Expand Down Expand Up @@ -111,7 +111,7 @@ function NewWorkspaceButton() {
title={full ? `All ${MAX_WORKSPACES} workspaces are in use` : "New workspace"}
disabled={full}
onClick={() => void add()}
className={chromeButton}
className={`${chromeButton} ml-1`}
>
<PlusIcon className="size-4" aria-hidden />
</button>
Expand Down
4 changes: 4 additions & 0 deletions apps/web/src/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,10 @@
.app-shell :is([data-slot="sidebar-gap"], [data-slot="sidebar-navigation"]) {
transition: width 200ms var(--ease-drawer);
}
/* Closed, the title bar's controls are as wide as their content; this lets that width animate too. */
.app-shell [data-slot="sidebar-navigation"] {
interpolate-size: allow-keywords;
}
.app-shell[data-resizing] :is([data-slot="sidebar-gap"], [data-slot="sidebar-navigation"]) {
transition: none;
}
Expand Down