adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-15 19:52:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix scroll overflow issue in calendar with banner

Browse Source
This commit is contained in:
Gregor Vostrak
2025-09-02 13:51:40 +02:00
parent fca55fe0e1
commit 85d69f1f16
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
resources/js/Layouts/AppLayout.vue
View File

@@ -256,21 +256,21 @@ const page = usePage<{
</div> </div>
<div class="flex-1 lg:ml-[230px] 2xl:ml-[250px] min-w-0"> <div class="flex-1 lg:ml-[230px] 2xl:ml-[250px] min-w-0">
<div <div
class="lg:hidden w-full px-3 py-1 border-b border-b-default-background-separator text-text-secondary flex justify-between items-center"> class="h-screen overflow-y-auto flex flex-col bg-default-background border-l border-default-background-separator">
<Bars3Icon <div
class="w-7 text-text-secondary" class="lg:hidden w-full px-3 py-1 border-b border-b-default-background-separator text-text-secondary flex justify-between items-center">
@click="showSidebarMenu = !showSidebarMenu"></Bars3Icon> <Bars3Icon
<OrganizationSwitcher></OrganizationSwitcher> class="w-7 text-text-secondary"
</div> @click="showSidebarMenu = !showSidebarMenu"></Bars3Icon>
<OrganizationSwitcher></OrganizationSwitcher>
</div>
<Head :title="title" /> <Head :title="title" />
<Banner />
<BillingBanner v-if="isBillingActivated()" />
<div
class="min-h-screen flex flex-col bg-default-background border-l border-default-background-separator">
<!-- Page Heading --> <!-- Page Heading -->
<Banner />
<BillingBanner v-if="isBillingActivated()" />
<header <header
v-if="$slots.header" v-if="$slots.header"
class="bg-default-background border-b border-default-background-separator shadow"> class="bg-default-background border-b border-default-background-separator shadow">
@@ -282,7 +282,7 @@ const page = usePage<{
</header> </header>
<!-- Page Content --> <!-- Page Content -->
<main :class="twMerge('pb-28 flex-1', mainClass)"> <main :class="twMerge('pb-28 relative flex-1', mainClass)">
<div <div
v-if="isOrganizationLoading" v-if="isOrganizationLoading"
class="flex items-center justify-center h-screen"> class="flex items-center justify-center h-screen">

4
resources/js/packages/ui/src/FullCalendar/TimeEntryCalendar.vue
View File

@@ -229,7 +229,7 @@ const calendarOptions = computed(() => ({
center: 'title', center: 'title',
right: 'timeGridWeek,timeGridDay', right: 'timeGridWeek,timeGridDay',
}, },
height: '100vh', height: 'parent',
slotMinTime: '00:00:00', slotMinTime: '00:00:00',
slotMaxTime: '24:00:00', slotMaxTime: '24:00:00',
slotDuration: '00:15:00', slotDuration: '00:15:00',
@@ -274,7 +274,7 @@ watch(showEditTimeEntryModal, (value) => {
</script> </script>
<template> <template>
<div class="h-screen w-full relative"> <div class="w-full relative h-full flex-1">
<div v-if="loading" class="flex items-center justify-center h-full"> <div v-if="loading" class="flex items-center justify-center h-full">
<div class="flex flex-col items-center space-y-4"> <div class="flex flex-col items-center space-y-4">
<LoadingSpinner class="h-8 w-8" /> <LoadingSpinner class="h-8 w-8" />