Merge branch 'main' into new-theme-handler
This commit is contained in:
commit
6fd970320b
14 files changed
+148
-75
No files matched your search
@@ -244,10 +244,12 @@
|
||||
{$t('common.debug')}
|
||||
</MenuButton>
|
||||
{/if}
|
||||
<MenuButton on:click={() => action(profile)} color="danger-subtle">
|
||||
<Icon slot="prefix" src={ArrowRightOnRectangle} size="16" mini />
|
||||
{$t('account.logout')}
|
||||
</MenuButton>
|
||||
{#if !LINKED_INSTANCE_URL || profile.user}
|
||||
<MenuButton on:click={() => action(profile)} color="danger-subtle">
|
||||
<Icon slot="prefix" src={ArrowRightOnRectangle} size="16" mini />
|
||||
{$t('account.logout')}
|
||||
</MenuButton>
|
||||
{/if}
|
||||
</Menu>
|
||||
</div>
|
||||
{/each}
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
import { goto } from '$app/navigation'
|
||||
import { page } from '$app/stores'
|
||||
import MultiSelect from '$lib/components/input/Switch.svelte'
|
||||
import Tabs from '$lib/components/ui/layout/pages/Tabs.svelte'
|
||||
import { contentPadding } from '$lib/components/ui/layout/Shell.svelte'
|
||||
import { t } from '$lib/translations.js'
|
||||
import { fullCommunityName } from '$lib/util.js'
|
||||
import type { PageData } from './$types.js'
|
||||
|
||||
@@ -14,14 +17,22 @@
|
||||
</script>
|
||||
|
||||
<div class="flex flex-col gap-4 h-full">
|
||||
<MultiSelect
|
||||
headless
|
||||
options={[`${communityUrl}/settings`, `${communityUrl}/settings/team`]}
|
||||
optionNames={['Settings', 'Team']}
|
||||
selected={$page.url.pathname}
|
||||
on:select={(e) => {
|
||||
goto(e.detail)
|
||||
}}
|
||||
/>
|
||||
<div
|
||||
class="sticky mx-auto z-50 max-w-full min-w-0 flex items-center gap-2"
|
||||
style="top: max(1.5rem, {$contentPadding.top}px);"
|
||||
>
|
||||
<Tabs
|
||||
routes={[
|
||||
{
|
||||
href: `${communityUrl}/settings`,
|
||||
name: $t('routes.community.settings.settings'),
|
||||
},
|
||||
{
|
||||
href: `${communityUrl}/team`,
|
||||
name: $t('routes.community.settings.team'),
|
||||
},
|
||||
]}
|
||||
></Tabs>
|
||||
</div>
|
||||
<slot />
|
||||
</div>
|
||||
@@ -2,6 +2,4 @@
|
||||
import CommunityForm from '$lib/components/lemmy/community/CommunityForm.svelte'
|
||||
</script>
|
||||
|
||||
<div class=" max-w-2xl mx-auto">
|
||||
<CommunityForm />
|
||||
</div>
|
||||
<CommunityForm />
|
||||
@@ -143,10 +143,12 @@
|
||||
<Icon src={QuestionMarkCircle} mini size="16" />
|
||||
{$t('form.forgotpassword')}
|
||||
</Button>
|
||||
<Button color="tertiary" href="/login/guest">
|
||||
<Icon src={UserCircle} mini size="16" />
|
||||
{$t('account.guest')}
|
||||
</Button>
|
||||
{#if !LINKED_INSTANCE_URL}
|
||||
<Button color="tertiary" href="/login/guest">
|
||||
<Icon src={UserCircle} mini size="16" />
|
||||
{$t('account.guest')}
|
||||
</Button>
|
||||
{/if}
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
Reference in new issue
Block a user