Skip to content

Commit 72cd1a6

Browse files
joshuatabudak7273
andauthored
fix: migrate away from appshell (#210)
* fix: migrate away from appshell fixes #208 * fix: prettier errors in base layout --------- Co-authored-by: Rob B <computerguy440+gh@gmail.com>
1 parent f964e41 commit 72cd1a6

File tree

2 files changed

+10
-18
lines changed

2 files changed

+10
-18
lines changed

src/routes/+layout.svelte

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import { PUBLIC_GOOGLE_SITE_TAG } from '$env/static/public';
1111
import type { LayoutData } from './$types';
1212
import { TolgeeProvider } from '@tolgee/svelte';
13-
import { initializeStores, AppShell, Modal, storePopup, Drawer, Toast } from '@skeletonlabs/skeleton';
13+
import { initializeStores, Modal, storePopup, Drawer, Toast } from '@skeletonlabs/skeleton';
1414
import TopBar from '$lib/components/general/TopBar.svelte';
1515
import './_global.postcss';
1616
import { computePosition, autoUpdate, offset, shift, flip, arrow } from '@floating-ui/dom';
@@ -120,27 +120,20 @@
120120
<Sidebar bind:accessibility />
121121
</Drawer>
122122

123-
<AppShell>
124-
<svelte:fragment slot="header">
123+
<div class="grid grid-rows-[auto_1fr_auto]">
124+
<header class="sticky top-0 z-10">
125125
<TopBar />
126-
</svelte:fragment>
127-
128-
<svelte:fragment slot="sidebarLeft">
129-
<aside class="hidden h-full xl:block">
126+
</header>
127+
<div class="grid grid-cols-1 md:grid-cols-[auto_1fr]">
128+
<aside class="sticky top-[calc(72px)] col-span-1 hidden h-[calc(100vh-72px)] xl:block">
130129
<Sidebar bind:accessibility />
131130
</aside>
132-
</svelte:fragment>
133-
134-
<svelte:fragment slot="pageHeader">
135-
<AnnouncementHeader />
136-
</svelte:fragment>
137-
138-
<div class="app-content w-full overflow-auto">
139-
<main class="main-content min-h-100% xl:py-6 xl:pr-3">
131+
<main class="space-y-4 p-4">
132+
<AnnouncementHeader />
140133
<slot />
141134
</main>
142135
</div>
143-
</AppShell>
136+
</div>
144137

145138
<LoginDialog />
146139
</TolgeeProvider>

src/routes/_global.postcss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@
1010

1111
html,
1212
body {
13-
@apply h-full overflow-hidden;
13+
@apply h-full;
1414
font-family:
1515
'Roboto',
1616
Helvetica Neue,
1717
sans-serif,
1818
'Noto Color Emoji';
1919
margin: 0;
2020
padding: 0;
21-
overflow: hidden;
2221
}
2322

2423
html.accessibility,

0 commit comments

Comments
 (0)