Skip to content

Email for professionals and teams

improve nav ui

Hieu Nguyen (Jack)3e524eec4cb5
diff --git a/src/app/(admin)/layout.tsx b/src/app/(admin)/layout.tsx
index c957b73..e7d91db 100644
--- a/src/app/(admin)/layout.tsx
+++ b/src/app/(admin)/layout.tsx
@@ -50,7 +50,7 @@ export default function DashboardLayout({
<ShortcutsProvider>
<div className="grid h-dvh grid-cols-[minmax(0,1fr)] md:grid-cols-[var(--sidebar-width)_minmax(0,1fr)] overflow-hidden bg-[#f6f8fc] transition-[grid-template-columns]" style={{ transitionDuration: "var(--sidebar-transition-duration)" }}>
<SidebarAside>
- <div className="h-full px-3 pt-4 pb-3">
+ <div className="h-full">
<AdminNav />
</div>
<SidebarResizeBoundary />
diff --git a/src/app/(dashboard)/layout.tsx b/src/app/(dashboard)/layout.tsx
index fde2fb2..48360a8 100644
--- a/src/app/(dashboard)/layout.tsx
+++ b/src/app/(dashboard)/layout.tsx
@@ -47,7 +47,7 @@ export default function DashboardLayout({
<ShortcutsProvider>
<div className="grid h-dvh grid-cols-[minmax(0,1fr)] overflow-hidden bg-[#f6f8fc] transition-[grid-template-columns] md:grid-cols-[var(--sidebar-width)_minmax(0,1fr)]" style={{ transitionDuration: "var(--sidebar-transition-duration)" }}>
<SidebarAside>
- <div className="h-full px-3 pt-4 pb-3">
+ <div className="h-full">
<DashboardNav />
</div>
<SidebarResizeBoundary />
diff --git a/src/app/(settings)/layout.tsx b/src/app/(settings)/layout.tsx
index 5cdb8c9..0fe00a8 100644
--- a/src/app/(settings)/layout.tsx
+++ b/src/app/(settings)/layout.tsx
@@ -28,7 +28,7 @@ export default function DashboardLayout({
<MailSearchProvider>
<ShortcutsProvider>
<div className="grid h-[100dvh] grid-cols-[minmax(0,1fr)] md:grid-cols-[var(--sidebar-width)_minmax(0,1fr)] overflow-hidden bg-[#f6f8fc] transition-[grid-template-columns]" style={{ transitionDuration: "var(--sidebar-transition-duration)" }}>
- <SidebarAside className="px-3 pt-4 pb-3">
+ <SidebarAside>
<DashboardNav />
</SidebarAside>
<div className="flex min-h-0 min-w-0 flex-col">
diff --git a/src/components/admin-nav.tsx b/src/components/admin-nav.tsx
index 96fad6a..7dfd193 100644
--- a/src/components/admin-nav.tsx
+++ b/src/components/admin-nav.tsx
@@ -90,9 +90,9 @@ export function AdminNav({ className }: { className?: string }) {
return (
// The first section has no label, so fall back to its first href for a stable key.
<section key={section.label ?? links[0].href}>
- {minimal && sectionIndex > 0 && <hr className="mx-3 mb-3 border-neutral-200/70" />}
+ {minimal && sectionIndex > 0 && <hr className="mx-6 mb-3 border-neutral-200/70" />}
{!minimal && section.label && (
- <p className="mb-1 px-3 text-[11px] font-semibold uppercase tracking-wider text-neutral-400">
+ <p className="mb-1 px-6 text-[11px] font-semibold uppercase tracking-wider text-neutral-400">
{section.label}
</p>
)}
diff --git a/src/components/components-nav.tsx b/src/components/components-nav.tsx
index ca3b5a0..c3b77ae 100644
--- a/src/components/components-nav.tsx
+++ b/src/components/components-nav.tsx
@@ -79,7 +79,7 @@ export function NavItem({ link, iconClassName, labelClassName, wrap }: Props) {
<button
type="button"
onClick={openComposer}
- className={classes}
+ className={cn(!minimal && "ml-3", classes)}
aria-label={minimal ? link.label : undefined}
{...dropProps}
>
@@ -142,7 +142,7 @@ export function NavItem({ link, iconClassName, labelClassName, wrap }: Props) {
href={link.href}
onClick={navigate}
aria-label={minimal ? link.label : undefined}
- className={cn(!minimal && "-ml-3 pl-6", classes)}
+ className={cn(!minimal && "pl-6", classes)}
{...dropProps}
>
<Icon
diff --git a/src/components/dashboard-nav.tsx b/src/components/dashboard-nav.tsx
index 37dbcbb..dd35434 100644
--- a/src/components/dashboard-nav.tsx
+++ b/src/components/dashboard-nav.tsx
@@ -176,12 +176,12 @@ export function DashboardNav({ className }: { className?: string }) {
{linksWithCounts.map((link, i) => (
<Fragment key={`nav-${link.href || i}`}>
<NavItem link={link} />
- {minimal && i === 0 && <hr className="mx-3 my-2 border-neutral-200/70" />}
+ {minimal && i === 0 && <hr className="mx-6 my-2 border-neutral-200/70" />}
</Fragment>
))}
- {minimal && <hr className="mx-3 my-2 border-neutral-200/70" />}
+ {minimal && <hr className="mx-6 my-2 border-neutral-200/70" />}
{!minimal && (
- <div className="mt-2 flex h-8 items-center justify-between px-3">
+ <div className="mt-2 flex h-8 items-center justify-between px-6">
<span className="font-medium tracking-wide text-neutral-900 text-sm max-md:text-base">
Folders
</span>
@@ -253,7 +253,7 @@ export function DashboardNav({ className }: { className?: string }) {
</div>
)}
{!minimal && folders.length === 0 && (
- <div className="mx-3 rounded-lg border border-dashed border-neutral-200 px-3 py-3 text-xs text-neutral-400">
+ <div className="mx-6 rounded-lg border border-dashed border-neutral-200 px-3 py-3 text-xs text-neutral-400">
No folders yet
</div>
)}
diff --git a/src/components/sidebar-scaffold.tsx b/src/components/sidebar-scaffold.tsx
index d6085d7..51b203c 100644
--- a/src/components/sidebar-scaffold.tsx
+++ b/src/components/sidebar-scaffold.tsx
@@ -1,16 +1,18 @@
import type { SidebarScaffoldProps } from "./sidebar-state-types";
import { cn } from "@/lib/utils";
+import { useSidebar } from "./sidebar-state";
// Header and footer stay put; only the middle scrolls. The padding inside the scroller
// matches the mask's fade length, so nothing looks faded until content actually scrolls under it.
export function SidebarScaffold({ header, footer, children, className }: SidebarScaffoldProps) {
+ const { minimal } = useSidebar();
return (
<nav className={cn("flex h-full min-h-0 flex-col", className)}>
- <div className="shrink-0">{header}</div>
- <div className="flex min-h-0 flex-1 flex-col gap-1 overflow-y-auto overscroll-contain py-3 [scrollbar-gutter:stable] [mask-image:linear-gradient(to_bottom,transparent,black_12px,black_calc(100%-12px),transparent)]">
+ <div className="shrink-0 px-3 pt-4">{header}</div>
+ <div className={cn("flex min-h-0 flex-1 flex-col gap-1 overflow-y-auto [&>*]:shrink-0 overscroll-contain py-3", minimal ? "px-3" : "pr-3", "[scrollbar-gutter:stable] [mask-image:linear-gradient(to_bottom,transparent,black_12px,black_calc(100%-12px),transparent)]")}>
{children}
</div>
- {footer && <div className="shrink-0">{footer}</div>}
+ {footer && <div className="shrink-0 px-3 pb-3">{footer}</div>}
</nav>
);
}