1
0
mirror of https://github.com/immich-app/immich.git synced 2024-12-26 10:50:29 +02:00

feat(web): improve page header + scrolling (#2453)

* fix: line to edge of screen

* refactor: user layout page
This commit is contained in:
Jason Rasmussen 2023-05-17 15:45:16 -04:00 committed by GitHub
parent 35c4887e4a
commit 4a0052026f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 129 additions and 132 deletions

View File

@ -22,24 +22,25 @@
</header> </header>
<main <main
class="grid md:grid-cols-[theme(spacing.64)_auto] grid-cols-[theme(spacing.18)_auto] relative pt-[var(--navbar-height)] h-screen bg-immich-bg dark:bg-immich-dark-bg immich-scrollbar" class="grid md:grid-cols-[theme(spacing.64)_auto] grid-cols-[theme(spacing.18)_auto] relative pt-[var(--navbar-height)] h-screen overflow-hidden bg-immich-bg dark:bg-immich-dark-bg"
> >
<SideBar /> <SideBar />
<slot name="content"> <slot name="content">
<section class="overflow-y-auto my-8 mx-4 bg-immich-bg dark:bg-immich-dark-bg">
{#if title} {#if title}
<div class="flex justify-between place-items-center dark:text-immich-dark-fg px-4 h-10"> <section class="relative">
<div
class="absolute border-b dark:border-immich-dark-gray flex justify-between place-items-center dark:text-immich-dark-fg w-full p-4 h-16"
>
<p class="font-medium">{title}</p> <p class="font-medium">{title}</p>
<slot name="buttons" /> <slot name="buttons" />
</div> </div>
<div class="my-4"> <div
<hr class="dark:border-immich-dark-gray" /> class="absolute overflow-y-auto top-16 h-[calc(100%-theme(spacing.16))] w-full immich-scrollbar p-4 pb-8"
</div> >
{/if}
<slot /> <slot />
</div>
</section> </section>
{/if}
</slot> </slot>
</main> </main>

View File

@ -3,7 +3,7 @@
<section <section
id="sidebar" id="sidebar"
class="group flex flex-col gap-1 pt-8 bg-immich-bg dark:bg-immich-dark-bg transition-all duration-200 z-10 w-18 md:w-64 hover:sm:pr-6 md:pr-6 hover:sm:w-64 hover:sm:shadow-2xl hover:md:shadow-none hover:md:border-none hover:sm:border-r hover:sm:dark:border-r-immich-dark-gray" class="group flex flex-col gap-1 pt-8 bg-immich-bg dark:bg-immich-dark-bg transition-all duration-200 z-10 w-18 md:w-64 hover:sm:pr-6 md:pr-6 hover:sm:w-64 hover:sm:shadow-2xl hover:md:shadow-none hover:md:border-none hover:sm:border-r hover:sm:dark:border-r-immich-dark-gray relative overflow-y-auto immich-scrollbar"
> >
<slot /> <slot />
</section> </section>

View File

@ -36,7 +36,7 @@
}; };
</script> </script>
<UserPageLayout user={data.user} hideNavbar={isMultiSelectionMode}> <UserPageLayout user={data.user} hideNavbar={isMultiSelectionMode} title={data.meta.title}>
<!-- Empty Message --> <!-- Empty Message -->
{#if $archivedAsset.length === 0} {#if $archivedAsset.length === 0}
<EmptyPlaceholder <EmptyPlaceholder

View File

@ -31,7 +31,6 @@
</script> </script>
<UserPageLayout user={data.user} title={data.meta.title}> <UserPageLayout user={data.user} title={data.meta.title}>
<div class="mx-4">
{#if people.length > 0} {#if people.length > 0}
<div class="mb-6 mt-2"> <div class="mb-6 mt-2">
<div class="flex justify-between"> <div class="flex justify-between">
@ -111,9 +110,7 @@
<hr class="dark:border-immich-dark-gray mb-4" /> <hr class="dark:border-immich-dark-gray mb-4" />
<div <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5 gap-8">
class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5 gap-8"
>
<div class="flex flex-col gap-6 dark:text-immich-dark-fg"> <div class="flex flex-col gap-6 dark:text-immich-dark-fg">
<p class="text-sm">YOUR ACTIVITY</p> <p class="text-sm">YOUR ACTIVITY</p>
<div class="flex flex-col gap-4 dark:text-immich-dark-fg/80"> <div class="flex flex-col gap-4 dark:text-immich-dark-fg/80">
@ -157,5 +154,4 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</UserPageLayout> </UserPageLayout>

View File

@ -40,7 +40,7 @@
</AssetSelectControlBar> </AssetSelectControlBar>
{/if} {/if}
<UserPageLayout user={data.user} hideNavbar={isMultiSelectionMode}> <UserPageLayout user={data.user} hideNavbar={isMultiSelectionMode} title={data.meta.title}>
<section> <section>
<!-- Empty Message --> <!-- Empty Message -->
{#if favorites.length === 0} {#if favorites.length === 0}

View File

@ -45,7 +45,7 @@
<UserPageLayout user={data.user} title={data.meta.title}> <UserPageLayout user={data.user} title={data.meta.title}>
<div slot="buttons" /> <div slot="buttons" />
<div class="h-[90%] w-full relative z-0"> <div class="h-full w-full relative z-0">
{#await import('$lib/components/shared-components/leaflet') then { Map, TileLayer, AssetMarkerCluster }} {#await import('$lib/components/shared-components/leaflet') then { Map, TileLayer, AssetMarkerCluster }}
<Map latlng={initialMapCenter} zoom={7}> <Map latlng={initialMapCenter} zoom={7}>
<TileLayer <TileLayer

View File

@ -53,7 +53,7 @@
</LinkButton> </LinkButton>
</div> </div>
<div class="mx-4 flex flex-col"> <div class="flex flex-col">
{#if data.partners.length > 0} {#if data.partners.length > 0}
<div class="mb-6 mt-2"> <div class="mb-6 mt-2">
<div> <div>