-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #119 from Fermain/112-navigating-to-a-new-lesson-p…
…ersists-scroll Reset scroll position on navigate
- Loading branch information
Showing
1 changed file
with
46 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,55 @@ | ||
| <script lang="ts"> | ||
| import '@skeletonlabs/skeleton/themes/theme-skeleton.css'; | ||
| import '@skeletonlabs/skeleton/styles/skeleton.css'; | ||
| import '../lib/styles/styles.scss'; | ||
| import { Molly } from '@mollify/molly'; | ||
| import '../app.postcss'; | ||
| import { AppShell, Drawer, Toast } from '@skeletonlabs/skeleton'; | ||
| import Main from '$lib/components/content/Main.svelte'; | ||
| import Footer from '$lib/components/footer/Footer.svelte'; | ||
| import Reader from '$lib/components/header/Reader.svelte'; | ||
| import IconNav from '$lib/components/navigation/IconNav.svelte'; | ||
| import Header from '$lib/components/header/Header.svelte'; | ||
| import 'prismjs/themes/prism-tomorrow.css'; | ||
| import type { LayoutData } from './$types'; | ||
| import EntityNav from '$lib/components/navigation/EntityNav.svelte'; | ||
| import '@skeletonlabs/skeleton/themes/theme-skeleton.css'; | ||
| import '@skeletonlabs/skeleton/styles/skeleton.css'; | ||
| import '../lib/styles/styles.scss'; | ||
| import { Molly } from '@mollify/molly'; | ||
| import '../app.postcss'; | ||
| import { AppShell, Drawer, Toast } from '@skeletonlabs/skeleton'; | ||
| import Main from '$lib/components/content/Main.svelte'; | ||
| import Footer from '$lib/components/footer/Footer.svelte'; | ||
| import Reader from '$lib/components/header/Reader.svelte'; | ||
| import IconNav from '$lib/components/navigation/IconNav.svelte'; | ||
| import Header from '$lib/components/header/Header.svelte'; | ||
| import 'prismjs/themes/prism-tomorrow.css'; | ||
| import type { LayoutData } from './$types'; | ||
| import EntityNav from '$lib/components/navigation/EntityNav.svelte'; | ||
| import { afterNavigate } from '$app/navigation'; | ||
| export let data: LayoutData; | ||
| let main: Main; | ||
| afterNavigate(() => { | ||
| main?.scrollToTop(); | ||
| }) | ||
| export let data: LayoutData; | ||
| </script> | ||
|
|
||
| <Drawer> | ||
| <div class="p-4"> | ||
| <EntityNav entities={data.sitemap} /> | ||
| </div> | ||
| <div class="p-4"> | ||
| <EntityNav entities={data.sitemap} /> | ||
| </div> | ||
| </Drawer> | ||
|
|
||
| <AppShell slotSidebarRight="bg-surface-500/5 w-0 lg:w-64"> | ||
| <svelte:fragment slot="header"> | ||
| <Header /> | ||
| </svelte:fragment> | ||
| <svelte:fragment slot="sidebarRight"> | ||
| <div class="p-2"> | ||
| <EntityNav entities={data.sitemap} /> | ||
| </div> | ||
| </svelte:fragment> | ||
| <svelte:fragment slot="sidebarLeft"> | ||
| <IconNav /> | ||
| </svelte:fragment> | ||
| <Main> | ||
| <slot /> | ||
| </Main> | ||
| <svelte:fragment slot="footer" | ||
| ><Footer> | ||
| <Reader /> | ||
| <Molly endpoint="/api/molly" /> | ||
| </Footer> | ||
| </svelte:fragment> | ||
| <Toast position="t" /> | ||
| <svelte:fragment slot="header"> | ||
| <Header /> | ||
| </svelte:fragment> | ||
| <svelte:fragment slot="sidebarRight"> | ||
| <div class="p-2"> | ||
| <EntityNav entities={data.sitemap} /> | ||
| </div> | ||
| </svelte:fragment> | ||
| <svelte:fragment slot="sidebarLeft"> | ||
| <IconNav /> | ||
| </svelte:fragment> | ||
| <Main bind:this={main}> | ||
| <slot /> | ||
| </Main> | ||
| <svelte:fragment slot="footer" | ||
| ><Footer> | ||
| <Reader /> | ||
| <Molly endpoint="/api/molly" /> | ||
| </Footer> | ||
| </svelte:fragment> | ||
| <Toast position="t" /> | ||
| </AppShell> |