Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: migrate away from appshell #210

Open
wants to merge 2 commits into
base: staging
Choose a base branch
from
Open

fix: migrate away from appshell #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dca4531
fix: migrate away from appshell
joshuata Nov 15, 2024
03f2634
fix: prettier errors in base layout
joshuata Nov 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 9 additions & 16 deletions src/routes/+layout.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import { PUBLIC_GOOGLE_SITE_TAG } from '$env/static/public';
import type { LayoutData } from './$types';
import { TolgeeProvider } from '@tolgee/svelte';
import { initializeStores, AppShell, Modal, storePopup, Drawer, Toast } from '@skeletonlabs/skeleton';
import { initializeStores, Modal, storePopup, Drawer, Toast } from '@skeletonlabs/skeleton';
import TopBar from '$lib/components/general/TopBar.svelte';
import './_global.postcss';
import { computePosition, autoUpdate, offset, shift, flip, arrow } from '@floating-ui/dom';
Expand Down Expand Up @@ -120,27 +120,20 @@
<Sidebar bind:accessibility />
</Drawer>

<AppShell>
<svelte:fragment slot="header">
<div class="grid grid-rows-[auto_1fr_auto]">
<header class="sticky top-0 z-10">
<TopBar />
</svelte:fragment>

<svelte:fragment slot="sidebarLeft">
<aside class="hidden h-full xl:block">
</header>
<div class="grid grid-cols-1 md:grid-cols-[auto_1fr]">
<aside class="sticky top-[calc(72px)] col-span-1 hidden h-[calc(100vh-72px)] xl:block">
<Sidebar bind:accessibility />
</aside>
</svelte:fragment>

<svelte:fragment slot="pageHeader">
<AnnouncementHeader />
</svelte:fragment>

<div class="app-content w-full overflow-auto">
<main class="main-content min-h-100% xl:py-6 xl:pr-3">
<main class="space-y-4 p-4">
<AnnouncementHeader />
<slot />
</main>
</div>
</AppShell>
</div>

<LoginDialog />
</TolgeeProvider>
3 changes: 1 addition & 2 deletions src/routes/_global.postcss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,14 @@

html,
body {
@apply h-full overflow-hidden;
@apply h-full;
font-family:
'Roboto',
Helvetica Neue,
sans-serif,
'Noto Color Emoji';
margin: 0;
padding: 0;
overflow: hidden;
}

html.accessibility,
Expand Down
Loading