Skip to content

Commit 5226835

Browse files
committed
Merge branch 'master' into v7
Conflicts: packages/site/svelte.config.js
2 parents 33ffaa3 + 99c5789 commit 5226835

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

packages/site/src/routes/+layout.svelte

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@
136136
? 'demo-drawer-adjust'
137137
: 'hide-initial-small'}"
138138
>
139-
<Content>
139+
<!-- 22px padding to offset the space taken by Glory to Ukraine message -->
140+
<Content style="padding-bottom: 22px;">
140141
<List>
141142
{#each sections as section (section.name)}
142143
{#if 'separator' in section}

packages/site/svelte.config.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ const config = {
3232
kit: {
3333
adapter: staticAdapter(),
3434

35-
// prerender: {
36-
// default: true,
37-
// },
38-
3935
trailingSlash: 'ignore',
4036
},
4137
};

0 commit comments

Comments
 (0)