Skip to content

Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.

style: adjust scroll on main navigation

Marc Seitz12112c5a4d74
diff --git a/components/Sidebar.tsx b/components/Sidebar.tsx
index 5864b8d8..d0603646 100644
--- a/components/Sidebar.tsx
+++ b/components/Sidebar.tsx
@@ -143,14 +143,14 @@ export const SidebarComponent = ({ className }: { className?: string }) => {
<div>
<aside
className={cn(
- "h-screen w-full flex-shrink-0 flex-col justify-between gap-y-6 bg-gray-50 px-4 pt-4 dark:bg-black lg:w-72 lg:px-6 lg:pt-6",
+ "h-dvh w-full flex-shrink-0 flex-col justify-between gap-y-6 bg-gray-50 px-4 pt-4 dark:bg-black lg:w-72 lg:px-6 lg:pt-6",
className,
)}
>
{/* Sidebar component, swap this element with another sidebar if you like */}
<div className="flex h-16 shrink-0 items-center space-x-3">
- <p className="flex items-center text-2xl font-bold tracking-tighter text-black dark:text-white">
+ <p className="flex items-center text-2xl font-bold tracking-tighter text-black dark:text-white">
Papermark{" "}
{userPlan && userPlan != "free" ? (
<span className="ml-4 rounded-full bg-background px-2.5 py-1 text-xs tracking-normal text-foreground ring-1 ring-gray-800">
@@ -201,7 +201,7 @@ export const SidebarComponent = ({ className }: { className?: string }) => {
className={cn(
item.current
? "bg-gray-200 font-semibold text-foreground dark:bg-secondary"
- : " duration-200 hover:bg-gray-200 hover:dark:bg-muted",
+ : "duration-200 hover:bg-gray-200 hover:dark:bg-muted",
"group flex w-full items-center gap-x-2 rounded-md px-3 py-2 text-sm leading-6 disabled:cursor-default disabled:text-muted-foreground disabled:hover:bg-transparent",
)}
>
@@ -245,7 +245,7 @@ export const SidebarComponent = ({ className }: { className?: string }) => {
className={cn(
item.current
? "bg-gray-200 font-semibold text-foreground dark:bg-secondary"
- : " duration-200 hover:bg-gray-200 hover:dark:bg-muted",
+ : "duration-200 hover:bg-gray-200 hover:dark:bg-muted",
"group flex w-full items-center gap-x-2 rounded-md px-3 py-2 text-sm leading-6 disabled:cursor-default disabled:text-muted-foreground disabled:hover:bg-transparent",
)}
>
diff --git a/components/layouts/app.tsx b/components/layouts/app.tsx
index eaf2c277..7c42c70a 100644
--- a/components/layouts/app.tsx
+++ b/components/layouts/app.tsx
@@ -1,12 +1,15 @@
import Sidebar from "../Sidebar";
+import { ScrollArea } from "../ui/scroll-area";
export default function AppLayout({ children }: { children: React.ReactNode }) {
return (
<div>
<div className="flex min-h-screen flex-col bg-gray-50 dark:bg-black lg:flex-row">
<Sidebar />
- <main className="w-full grow overflow-y-auto rounded-xl bg-white ring-1 ring-gray-200 dark:border-none dark:bg-gray-900 dark:ring-gray-800 lg:m-2">
- {children}
+ <main className="h-dvh flex-1 lg:p-2">
+ <div className="h-full overflow-y-auto rounded-xl bg-white ring-1 ring-gray-200 dark:border-none dark:bg-gray-900 dark:ring-gray-800">
+ {children}
+ </div>
</main>
</div>
</div>