From 0cc9b91ae8b4da7a3e26ee357c2515933559dd85 Mon Sep 17 00:00:00 2001
From: Brian McGee <brian@bmcgee.ie>
Date: Thu, 28 Aug 2025 15:56:37 +0100
Subject: [PATCH] fix(ui): quirks with sidebar sizing

---
 .../clan-app/ui/src/components/Sidebar/Sidebar.module.css | 6 +-----
 pkgs/clan-app/ui/src/components/Sidebar/Sidebar.tsx       | 5 ++++-
 pkgs/clan-app/ui/src/routes/Clan/Clan.module.css          | 8 +++-----
 pkgs/clan-app/ui/src/routes/Clan/Clan.tsx                 | 4 +++-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/clan-app/ui/src/components/Sidebar/Sidebar.module.css b/pkgs/clan-app/ui/src/components/Sidebar/Sidebar.module.css
index 5555e60ea..1bd45f388 100644
--- a/pkgs/clan-app/ui/src/components/Sidebar/Sidebar.module.css
+++ b/pkgs/clan-app/ui/src/components/Sidebar/Sidebar.module.css
@@ -1,7 +1,3 @@
 .sidebar {
-  @apply w-60 border-none z-10;
-
-  .body {
-    @apply pt-4 pb-3 px-2;
-  }
+  @apply w-60 border-none z-10 h-full flex flex-col;
 }
diff --git a/pkgs/clan-app/ui/src/components/Sidebar/Sidebar.tsx b/pkgs/clan-app/ui/src/components/Sidebar/Sidebar.tsx
index b765a0d81..08b1eeecd 100644
--- a/pkgs/clan-app/ui/src/components/Sidebar/Sidebar.tsx
+++ b/pkgs/clan-app/ui/src/components/Sidebar/Sidebar.tsx
@@ -2,6 +2,7 @@ import styles from "./Sidebar.module.css";
 import { SidebarHeader } from "@/src/components/Sidebar/SidebarHeader";
 import { SidebarBody } from "@/src/components/Sidebar/SidebarBody";
 import cx from "classnames";
+import { splitProps } from "solid-js";
 
 export interface LinkProps {
   path: string;
@@ -19,10 +20,12 @@ export interface SidebarProps {
 }
 
 export const Sidebar = (props: SidebarProps) => {
+  const [bodyProps] = splitProps(props, ["staticSections"]);
+
   return (
     <div class={cx(styles.sidebar, props.class)}>
       <SidebarHeader />
-      <SidebarBody class={cx(styles.body)} {...props} />
+      <SidebarBody {...bodyProps} />
     </div>
   );
 };
diff --git a/pkgs/clan-app/ui/src/routes/Clan/Clan.module.css b/pkgs/clan-app/ui/src/routes/Clan/Clan.module.css
index 3bad3090c..41b6d5441 100644
--- a/pkgs/clan-app/ui/src/routes/Clan/Clan.module.css
+++ b/pkgs/clan-app/ui/src/routes/Clan/Clan.module.css
@@ -7,9 +7,7 @@
   @apply min-w-96;
 }
 
-.sidebar {
-  @apply absolute left-4 top-[2.25rem] w-60;
-  @apply min-h-96;
-
-  height: calc(100vh - 7.5rem);
+.sidebarContainer {
+  @apply absolute left-4 top-4 w-60 z-10;
+  height: calc(100vh - 2rem);
 }
diff --git a/pkgs/clan-app/ui/src/routes/Clan/Clan.tsx b/pkgs/clan-app/ui/src/routes/Clan/Clan.tsx
index e2a3d15d7..5c0bbce3e 100644
--- a/pkgs/clan-app/ui/src/routes/Clan/Clan.tsx
+++ b/pkgs/clan-app/ui/src/routes/Clan/Clan.tsx
@@ -119,7 +119,9 @@ export const Clan: Component<RouteSectionProps> = (props) => {
         )
       }
     >
-      <Sidebar class={cx(styles.sidebar)} />
+      <div class={styles.sidebarContainer}>
+        <Sidebar />
+      </div>
       {props.children}
       <ClanSceneController {...props} />
     </ClanContext.Provider>