Skip to content

Commit 032c82b

Browse files
committed
move feed down to accomodate
1 parent 3911f89 commit 032c82b

File tree

2 files changed

+31
-29
lines changed

2 files changed

+31
-29
lines changed

app/components/app-navbar.tsx

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,35 @@ import { DashboardBreadcrumb } from "@/components/dashboard-breadcrumb";
55

66
export function AppNavbar() {
77
return (
8-
<header className="fixed top-0 left-0 right-0 z-50 flex h-16 shrink-0 items-center border-b bg-background">
9-
<div className="flex h-full flex-1 items-center gap-4 px-4">
10-
<div className="flex items-center gap-2">
11-
<SidebarTrigger className="-ml-1" />
12-
<Separator orientation="vertical" className="mr-2 h-4" />
13-
<DashboardBreadcrumb />
8+
<nav className="fixed top-0 left-0 right-0 z-50 border-b bg-background">
9+
<header className="fixed top-0 left-0 right-0 z-50 flex h-16 shrink-0 items-center border-b bg-background">
10+
<div className="flex h-full flex-1 items-center gap-4 px-4">
11+
<div className="flex items-center gap-2">
12+
<SidebarTrigger className="-ml-1" />
13+
<Separator orientation="vertical" className="mr-2 h-4" />
14+
<DashboardBreadcrumb />
15+
</div>
16+
17+
<div className="ml-auto flex items-center gap-4">
18+
<Link
19+
to="/feed"
20+
activeProps={{ className: "text-foreground" }}
21+
inactiveProps={{ className: "text-foreground/60" }}
22+
className="relative px-2 font-medium transition-colors hover:text-foreground/80"
23+
>
24+
Feed
25+
</Link>
26+
<Link
27+
to="/config"
28+
activeProps={{ className: "text-foreground" }}
29+
inactiveProps={{ className: "text-foreground/60" }}
30+
className="relative px-2 font-medium transition-colors hover:text-foreground/80"
31+
>
32+
Config
33+
</Link>
34+
</div>
1435
</div>
15-
16-
<div className="ml-auto flex items-center gap-4">
17-
<Link
18-
to="/feed"
19-
activeProps={{ className: "text-foreground" }}
20-
inactiveProps={{ className: "text-foreground/60" }}
21-
className="relative px-2 font-medium transition-colors hover:text-foreground/80"
22-
>
23-
Feed
24-
</Link>
25-
<Link
26-
to="/config"
27-
activeProps={{ className: "text-foreground" }}
28-
inactiveProps={{ className: "text-foreground/60" }}
29-
className="relative px-2 font-medium transition-colors hover:text-foreground/80"
30-
>
31-
Config
32-
</Link>
33-
</div>
34-
</div>
35-
</header>
36+
</header>
37+
</nav>
3638
);
3739
}

app/routes/(authed)/feed.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ function FeedComponent() {
119119

120120
return (
121121
<AppSidebar>
122-
<div className="min-h-screen bg-background">
122+
<div className="bg-background">
123123
<AppNavbar />
124-
<main className="mx-auto max-w-7xl p-4">
124+
<main className="mt-14 mx-auto max-w-7xl p-4">
125125
<div className="flex gap-8">
126126
{/* Incident Feed */}
127127
<div className="flex-1">

0 commit comments

Comments
 (0)