From dfb00be9a3f392443435acaae6aea245d6b59b02 Mon Sep 17 00:00:00 2001
From: Johannes Klatt <km1938@partner.kit.edu>
Date: Sat, 29 Mar 2025 17:05:18 +0100
Subject: [PATCH] FIX: incorrect scrolling behavior due to sidebars
---
src/components/NavSidebar.vue | 1 -
src/components/ui/sidebar/Sidebar.vue | 2 +-
src/components/ui/sidebar/SidebarInset.vue | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/components/NavSidebar.vue b/src/components/NavSidebar.vue
index 14a550040..83b7ca7aa 100644
--- a/src/components/NavSidebar.vue
+++ b/src/components/NavSidebar.vue
@@ -181,7 +181,6 @@ const data = {
<SidebarRail />
</Sidebar>
<SidebarInset>
- <a>{{ navopenstate }}</a>
<slot />
</SidebarInset>
</SidebarProvider>
diff --git a/src/components/ui/sidebar/Sidebar.vue b/src/components/ui/sidebar/Sidebar.vue
index 638930ef9..a7e9350a1 100644
--- a/src/components/ui/sidebar/Sidebar.vue
+++ b/src/components/ui/sidebar/Sidebar.vue
@@ -52,7 +52,7 @@ const { isMobile, state, openMobile, setOpenMobile } = useSidebar()
<!-- This is what handles the sidebar gap on desktop -->
<div
:class="cn(
- 'duration-200 relative h-svh w-[--sidebar-width] bg-transparent transition-[width] ease-linear',
+ 'duration-200 relative h-[calc(100vh-14rem)] w-[--sidebar-width] bg-transparent transition-[width] ease-linear',
'group-data-[collapsible=offcanvas]:w-0',
'group-data-[side=right]:rotate-180',
variant === 'floating' || variant === 'inset'
diff --git a/src/components/ui/sidebar/SidebarInset.vue b/src/components/ui/sidebar/SidebarInset.vue
index 27d1db500..cd4b56e32 100644
--- a/src/components/ui/sidebar/SidebarInset.vue
+++ b/src/components/ui/sidebar/SidebarInset.vue
@@ -10,7 +10,7 @@ const props = defineProps<{
<template>
<main
:class="cn(
- 'relative flex min-h-svh flex-1 flex-col bg-background',
+ 'relative flex min-h-[calc(100vh-14rem)] flex-1 flex-col bg-background',
'peer-data-[variant=inset]:min-h-[calc(100svh-theme(spacing.4))] md:peer-data-[variant=inset]:m-2 md:peer-data-[state=collapsed]:peer-data-[variant=inset]:ml-2 md:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:rounded-xl md:peer-data-[variant=inset]:shadow',
props.class,
)"
--
GitLab