diff --git a/src/lib/components/ui/layout/Shell.svelte b/src/lib/components/ui/layout/Shell.svelte
index 1185b1bf..31c03afa 100644
--- a/src/lib/components/ui/layout/Shell.svelte
+++ b/src/lib/components/ui/layout/Shell.svelte
@@ -35,43 +35,47 @@
- {@render navbar?.({
- class: [
- 'bg-slate-100/70 dark:bg-zinc-950/90 border-slate-200/50 dark:border-zinc-900',
- 'pointer-events-auto backdrop-blur-xl border lg:border-t-0 lg:border-x-0',
- 'rounded-full lg:rounded-none',
- ],
- style: '',
- })}
-
- {@render sidebar?.({
- class: `hidden md:flex sticky top-0 lg:top-16 left-0 h-max bg-slate-100 dark:bg-zinc-950 z-40 max-h-screen`,
- style: 'grid-area: sidebar; width: 100% !important;',
- })}
- {@render main?.({
- class: `w-full bg-slate-50 dark:bg-zinc-925 justify-self-center border-x border-slate-200 dark:border-zinc-900 max-lg:pb-22 pb-3 sm:pb-6`,
- style: 'grid-area: main',
- })}
- {@render suffix?.({
- class: `max-lg:hidden w-full sticky lg:top-16 h-max max-h-screen overflow-auto left-0 bg-slate-100 dark:bg-zinc-950 z-40`,
- style: 'grid-area: suffix;',
- })}
+
+
+ {@render navbar?.({
+ class: [
+ 'bg-slate-100/70 dark:bg-zinc-950/90 border-slate-200/50 dark:border-zinc-900',
+ 'pointer-events-auto backdrop-blur-xl border lg:border-t-0 lg:border-x-0',
+ 'rounded-full lg:rounded-none',
+ ],
+ style: '',
+ })}
+
+
+ {@render sidebar?.({
+ class: `hidden md:flex sticky top-0 lg:top-16 left-0 max-h-[calc(100vh-4rem)] bg-slate-100 dark:bg-zinc-950 z-40`,
+ style: 'grid-area: sidebar; width: 100% !important;',
+ })}
+ {@render main?.({
+ class: `w-full bg-slate-50 dark:bg-zinc-925 justify-self-center border-x border-slate-200 dark:border-zinc-900 max-lg:pb-22 pb-3 sm:pb-6`,
+ style: 'grid-area: main',
+ })}
+ {@render suffix?.({
+ class: `max-lg:hidden w-full sticky lg:top-16 h-max max-h-screen overflow-auto left-0 bg-slate-100 dark:bg-zinc-950 z-40`,
+ style: 'grid-area: suffix;',
+ })}
+
diff --git a/src/routes/settings/+page.ts b/src/routes/settings/+page.ts
new file mode 100644
index 00000000..52a87ffd
--- /dev/null
+++ b/src/routes/settings/+page.ts
@@ -0,0 +1,5 @@
+import { redirect } from '@sveltejs/kit'
+
+export function load() {
+ redirect(302, '/settings/app')
+}
diff --git a/src/routes/settings/app/+page.svelte b/src/routes/settings/app/+page.svelte
new file mode 100644
index 00000000..0b448cbc
--- /dev/null
+++ b/src/routes/settings/app/+page.svelte
@@ -0,0 +1,306 @@
+
+
+
+ {#if env.PUBLIC_XYLIGHT_MODE}
+
+ {#snippet title()}
+
+ {$t('nav.menu.donate')}
+
+ {/snippet}
+ {#snippet description()}
+ {$t('settings.donate.description')}
+ {/snippet}
+
+
+ {/if}
+
+ {#snippet title()}
+ {$t('settings.app.lang.title')}
+ {/snippet}
+ {#snippet description()}
+
+ {$t('settings.app.lang.description')}
+
+ {$t('settings.app.lang.credits')}
+
+
+ {/snippet}
+
+
+
+ {#if $locale == 'he' || $locale == 'ar'}
+
+ {/if}
+
+ {#snippet title()}
+ {$t('settings.app.view.title')}
+ {/snippet}
+
+ {#snippet description()}
+
+ {#if settings.view == 'cozy'}
+ {$t('settings.app.view.cozy')}
+ {:else if settings.view == 'compact'}
+ {$t('settings.app.view.compact')}
+ {/if}
+
+ {/snippet}
+
+
+ {#snippet title()}
+ {$t('settings.app.sort.title')}
+ {/snippet}
+ {#snippet description()}
+ {$t('settings.app.sort.description')}
+ {/snippet}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {#snippet title()}
+ {$t('settings.app.thumbnailSide.title')}
+ {/snippet}
+ {#snippet description()}
+
+ {$t('settings.app.thumbnailSide.description')}
+
+ {/snippet}
+
+
+
+
+
+
+
+
+
+ {#snippet title()}
+ {$t('settings.app.font.title')}
+ {/snippet}
+ {#snippet description()}
+ {$t('settings.app.font.description')}
+ {/snippet}
+
+
+
+
+
+
+
+
diff --git a/src/routes/settings/embeds/+page.svelte b/src/routes/settings/embeds/+page.svelte
new file mode 100644
index 00000000..cfa0e569
--- /dev/null
+++ b/src/routes/settings/embeds/+page.svelte
@@ -0,0 +1,69 @@
+
+
+
+
+
+ {#snippet title()}
+ YouTube
+ {/snippet}
+ {#snippet description()}
+
+ {$t('settings.embeds.youtube.description')}
+
+ {/snippet}
+
+
+ {#if settings.embeds.youtube == 'invidious'}
+
+ {#snippet title()}
+ {$t('settings.embeds.instance.invidious')}
+ {/snippet}
+ {#snippet description()}
+
+ {$t('settings.embeds.instance.description')}
+
+ {/snippet}
+
+
+ {/if}
+ {#if settings.embeds.youtube == 'piped'}
+
+ {#snippet title()}
+ {$t('settings.embeds.instance.piped')}
+ {/snippet}
+ {#snippet description()}
+
+ {$t('settings.embeds.instance.description')}
+
+ {/snippet}
+
+
+ {/if}
+
diff --git a/src/routes/settings/lemmy/+page.svelte b/src/routes/settings/lemmy/+page.svelte
new file mode 100644
index 00000000..2b007ca3
--- /dev/null
+++ b/src/routes/settings/lemmy/+page.svelte
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+
+
+
+ {#snippet title()}
+ {$t('settings.lemmy.hideSubmissions.title')}
+ {/snippet}
+ {#snippet description()}
+
+ {$t('settings.lemmy.hideSubmissions.description')}
+
+ {/snippet}
+
+
+ {$t('settings.lemmy.hideSubmissions.deleted')}
+
+
+ {$t('settings.lemmy.hideSubmissions.removed')}
+
+
+
+
+
+ {#snippet title()}
+ {$t('settings.lemmy.instances.title')}
+ {/snippet}
+ {#snippet description()}
+
+ {$t('settings.lemmy.instances.description')}
+
+ {/snippet}
+
+
+ {$t('content.users')}
+
+
+ {$t('content.comments')}
+
+
+ {$t('content.communities')}
+
+
+
+
+
diff --git a/src/routes/settings/moderation/+page.svelte b/src/routes/settings/moderation/+page.svelte
new file mode 100644
index 00000000..d6175555
--- /dev/null
+++ b/src/routes/settings/moderation/+page.svelte
@@ -0,0 +1,102 @@
+
+
+
+
+ {#snippet title()}
+ {$t('settings.moderation.replyPresets.title')}
+ {/snippet}
+ {#snippet description()}
+
+ {$t('settings.moderation.replyPresets.description')}
+
+ - {$t('settings.moderation.replyPresets.syntax')}
+ -
+
{'{{reason}}'}
+
+ -
+
{'{{post}}'}
+
+ -
+
{'{{community}}'}
+
+ -
+
{'{{username}}'}
+
+
+
+ {/snippet}
+
+ {#each settings.moderation.presets as preset, index (preset)}
+
+
+ {#snippet title()}
+ {preset.title}
+ {/snippet}
+
+
+
+ removalTemplate(input, {
+ postTitle: '',
+ communityLink: '[!community@example.com]()',
+ reason: '',
+ username: '@Bob',
+ })}
+ />
+
+
+
+
+
+ {/each}
+
+
+
+
diff --git a/src/routes/settings/nav/NavItem.svelte b/src/routes/settings/nav/NavItem.svelte
deleted file mode 100644
index d9e4f0ab..00000000
--- a/src/routes/settings/nav/NavItem.svelte
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
- {#snippet target()}
-
- {@render children?.()}
-
- {/snippet}
- {#snippet popover()}
-
- {title}
-
- {/snippet}
-
-
diff --git a/src/routes/settings/other/+page.svelte b/src/routes/settings/other/+page.svelte
new file mode 100644
index 00000000..46ac70a5
--- /dev/null
+++ b/src/routes/settings/other/+page.svelte
@@ -0,0 +1,22 @@
+
+
+
+
+
+
diff --git a/src/routes/u/[name]/+page.svelte b/src/routes/u/[name]/+page.svelte
index cf213fbf..83fe80cb 100644
--- a/src/routes/u/[name]/+page.svelte
+++ b/src/routes/u/[name]/+page.svelte
@@ -3,6 +3,7 @@
import { page } from '$app/state'
import { profile } from '$lib/auth.svelte.js'
import CommentItem from '$lib/components/lemmy/comment/CommentItem.svelte'
+ import Sort from '$lib/components/lemmy/dropdowns/Sort.svelte'
import ItemList from '$lib/components/lemmy/generic/ItemList.svelte'
import { ban, isAdmin } from '$lib/components/lemmy/moderation/moderation.js'
import ShieldIcon from '$lib/components/lemmy/moderation/ShieldIcon.svelte'
@@ -34,7 +35,6 @@
import {
AdjustmentsHorizontal,
AtSymbol,
- ChartBar,
EllipsisHorizontal,
Envelope,
Fire,
@@ -330,22 +330,10 @@
-
+ />
{#if data.items.value.length == 0}
-
\ No newline at end of file
+
diff --git a/static/img/logo-isolated.svg b/static/img/logo-isolated.svg
index cb7d3f2f..3eb3b6f1 100644
--- a/static/img/logo-isolated.svg
+++ b/static/img/logo-isolated.svg
@@ -1,3 +1,3 @@
-
diff --git a/static/manifest.json b/static/manifest.json
index c930f71a..a5370129 100644
--- a/static/manifest.json
+++ b/static/manifest.json
@@ -20,7 +20,7 @@
"display": "standalone",
"scope": "/",
"theme_color": "#000000",
- "description": "A client for Lemmy with design as priority.",
+ "description": "A Svelte based web client for Lemmy.",
"screenshots": [
{
"form_factor": "wide",