A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: copy min and max sidebar heights to folder and history
aminnausin67a594db9b52
diff --git a/resources/css/theme.css b/resources/css/theme.cssindex 94299ff2..bca82bf2 100644--- a/resources/css/theme.css+++ b/resources/css/theme.css@@ -250,7 +250,7 @@main {--header-offset: 24px;- --min-page-height: calc(80vh - var(--header-offset));+ --min-page-height: calc(80vh);@media (height >= 36rem /* 576px */) {--header-offset: 16px;@@ -266,13 +266,24 @@}.page-height {- @media (width >= 64rem /* 1024px */) {- min-height: calc(var(--min-page-height) - var(--header-offset));+ --min-page-height: 90vh;++ min-height: calc(var(--min-page-height) - var(--header-offset));++ /* @sm */+ @media (width >= 40rem /* 640px */) {+ --min-page-height: 80vh;}}- .sidebar-height {+ .full-height-sidebar {+ /* @lg */@media (width >= 64rem /* 1024px */) {min-height: calc(var(--min-page-height) + 0.75rem - var(--header-offset));+ }+ }++ .clamped-sidebar {+ @media (width >= 64rem /* 1024px */) {max-height: calc(var(--min-page-height) + 0.75rem - var(--header-offset));}}diff --git a/resources/js/components/panels/DashboardSidebar.vue b/resources/js/components/panels/DashboardSidebar.vueindex 0b4be5ec..a6ee5893 100644--- a/resources/js/components/panels/DashboardSidebar.vue+++ b/resources/js/components/panels/DashboardSidebar.vue@@ -19,7 +19,10 @@ const { hasScrollbar } = useScrollbarDetection(scrollContainer);<template><SidebarHeader />- <div :class="['sidebar-height scrollbar-minimal transition-padding flex flex-1 flex-col gap-2', { 'overflow-auto p-0.5 pe-1': hasScrollbar }]" ref="scroll-container">+ <div+ :class="['full-height-sidebar clamped-sidebar scrollbar-minimal transition-padding flex flex-1 flex-col gap-2', { 'overflow-auto p-0.5 pe-1': hasScrollbar }]"+ ref="scroll-container"+ ><DashboardSidebarCardv-for="(tab, index) in dashboardTabs.filter((tab) => !tab.disabled)":key="index"diff --git a/resources/js/components/panels/FolderSidebar.vue b/resources/js/components/panels/FolderSidebar.vueindex d7d0d340..2ce8464c 100644--- a/resources/js/components/panels/FolderSidebar.vue+++ b/resources/js/components/panels/FolderSidebar.vue@@ -11,6 +11,7 @@ import { ButtonIcon } from '@/components/cedar-ui/button';import { sortObject } from '@/service/sort/baseSort';import { TableBase } from '@/components/cedar-ui/table';import { FLAGS } from '@/config/featureFlags';+import { cn } from '@aminnausin/cedar-ui';import EditFolderModal from '@/components/modals/EditFolderModal.vue';import SidebarHeader from '@/components/headers/SidebarHeader.vue';@@ -110,7 +111,7 @@ const handleFolderAction = (e: Event, id: number, action: 'edit' | 'share' = 'edv-model="folderSearchQuery":data="filteredFolders":row="FolderCard"- :class="'[--table-input-height:2rem] lg:[--table-input-height:inherit]'"+ :class="'full-height-sidebar [--table-input-height:2rem] lg:[--table-input-height:inherit]'":otherAction="handleFolderAction":useToolbar="showFilters":startAscending="true"@@ -120,7 +121,7 @@ const handleFolderAction = (e: Event, id: number, action: 'edit' | 'share' = 'ed}":items-per-page="10":max-visible-pages="3"- :table-styles="'gap-3 sm:gap-2'"+ :table-styles="cn('gap-3 sm:gap-2')":pagination-class="'justify-center! flex-col-reverse!'":use-pagination-icons="true":sort-action="diff --git a/resources/js/components/panels/HistorySidebar.vue b/resources/js/components/panels/HistorySidebar.vueindex f9ad1d25..8d49a452 100644--- a/resources/js/components/panels/HistorySidebar.vue+++ b/resources/js/components/panels/HistorySidebar.vue@@ -22,7 +22,7 @@ const handleShare = (link: string) => {<template><SidebarHeader />- <section id="list-content-history" class="flex flex-wrap gap-2">+ <section id="list-content-history" class="full-height-sidebar flex flex-wrap gap-2"><TableLoadingSpinnerv-if="(isLoadingRecords && !stateRecords?.length) || !stateRecords?.length":is-loading="isLoadingRecords && !stateRecords?.length"diff --git a/resources/js/components/panels/SettingsSidebar.vue b/resources/js/components/panels/SettingsSidebar.vueindex 6baa1e07..fc0d25cb 100644--- a/resources/js/components/panels/SettingsSidebar.vue+++ b/resources/js/components/panels/SettingsSidebar.vue@@ -13,7 +13,7 @@ const { settingsTabs, activeSettingsTab } = useSettingsTabs();<template><SidebarHeader />- <div class="sidebar-height flex h-full flex-1 flex-col gap-2">+ <div class="full-height-sidebar flex h-full flex-1 flex-col gap-2"><DashboardSidebarCardv-for="(tab, index) in settingsTabs.filter((tab) => !tab.disabled)":key="index"