diff --git a/src/components/NavSidebar.vue b/src/components/NavSidebar.vue index 14a5500409dd65605664e57ec61b0dfed4fc7ba1..83b7ca7aa7e60a6704e3a46f1d37b42420aa364c 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 638930ef9c6299a21cd372013ea2d37ea3520f60..a7e9350a138b7715cb8283a0940766cb2a527f3b 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 27d1db500ad8cc4fada938e24d5c60650226bf3b..cd4b56e326b7b221c841170934a6454dfcd6f9b7 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, )"