From ed642fc9c7c9c5a953c46ae97c6ff1f583e32ce2 Mon Sep 17 00:00:00 2001
From: peng <cavin@maimaiplanet.com>
Date: Thu, 23 Oct 2025 08:35:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=20=E4=BF=AE=E5=A4=8D=E5=B7=A6=E4=BE=A7=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=A0=8F=E5=B8=83=E5=B1=80=E3=80=82=E5=B9=B6=E4=B8=94?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=E5=85=A8=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crop-x/src/app/layout.tsx                                      | 2 +-
 .../src/components/layouts/SideBar/components/LeftSidebar.tsx  | 2 +-
 crop-x/src/styles/body.css                                     | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/crop-x/src/app/layout.tsx b/crop-x/src/app/layout.tsx
index 49f6462..f12e93c 100644
--- a/crop-x/src/app/layout.tsx
+++ b/crop-x/src/app/layout.tsx
@@ -1,4 +1,4 @@
-import {Navbar1} from "@/components/layouts/Navbar"
+import {Navbar1} from "@/components/layouts/NavBar"
 import {SideBarOld} from '@/components/layouts/SideBar/SideBarOld'
 import '@/styles/globals.css'
 
diff --git a/crop-x/src/components/layouts/SideBar/components/LeftSidebar.tsx b/crop-x/src/components/layouts/SideBar/components/LeftSidebar.tsx
index 05e7b7d..cfc14f7 100644
--- a/crop-x/src/components/layouts/SideBar/components/LeftSidebar.tsx
+++ b/crop-x/src/components/layouts/SideBar/components/LeftSidebar.tsx
@@ -77,7 +77,7 @@ export function LeftSidebar({
   return (
     <div
       className={cn(
-        "bg-white border-r border-gray-200 transition-all duration-300 flex flex-col",
+        "bg-white border-r border-gray-200 transition-all duration-300 flex flex-col h-full",
         isMobile ? "fixed inset-y-0 left-0 z-50" : "relative",
         isCollapsed ? "w-16" : "w-64"
       )}
diff --git a/crop-x/src/styles/body.css b/crop-x/src/styles/body.css
index 2efc7c5..0ea7d36 100644
--- a/crop-x/src/styles/body.css
+++ b/crop-x/src/styles/body.css
@@ -14,6 +14,9 @@
     height: 100%;
     overflow-y: auto;
 }
+.sidebarScroll>div{
+    height: 100%;
+}
 
 .contentScroll{
     height: 100%;