feat: remake theme handling

This commit is contained in:
Xylight committed 2024-07-24 21:32:10 -07:00
1 parent 18d2e8fc1e
commit 3aa948891a
10 files changed
+413 -249

No files matched your search

+5 -5
View File
@@ -31,7 +31,7 @@
UserCircle,
UserGroup,
} from 'svelte-hero-icons'
import { legacyTheme } from '$lib/ui/colors'
import { colorScheme } from '$lib/ui/colors'
import { userSettings } from '$lib/settings'
import { site } from '$lib/lemmy'
import SiteCard from '$lib/components/lemmy/SiteCard.svelte'
@@ -127,11 +127,11 @@
</MenuButton>
<MenuButton class="!py-0">
<Icon
src={$legacyTheme == 'system'
src={$colorScheme == 'system'
? ComputerDesktop
: $legacyTheme == 'light'
: $colorScheme == 'light'
? Sun
: $legacyTheme == 'dark'
: $colorScheme == 'dark'
? Moon
: Moon}
mini
@@ -142,7 +142,7 @@
<!-- svelte-ignore a11y-click-events-have-key-events -->
<!-- svelte-ignore a11y-no-static-element-interactions -->
<div class="contents" on:click|stopPropagation={() => {}}>
<Select bind:value={$legacyTheme} class="ml-auto my-auto w-24" size="sm">
<Select bind:value={$colorScheme} class="ml-auto my-auto w-24" size="sm">
<option value="system">{$t('nav.menu.colorscheme.system')}</option>
<option value="light">{$t('nav.menu.colorscheme.light')}</option>
<option value="dark">{$t('nav.menu.colorscheme.dark')}</option>
@@ -8,7 +8,7 @@ import {
import { resumables, type ResumableItem } from '$lib/lemmy/item'
import { userSettings } from '$lib/settings'
import { t } from '$lib/translations'
import { legacyTheme } from '$lib/ui/colors'
import { colorScheme } from '$lib/ui/colors'
import { fullCommunityName } from '$lib/util'
import {
ArrowRightOnRectangle,
@@ -354,21 +354,21 @@ export function getGroups(
name: t.get('nav.commands.setColorTo', {
default: t.get('nav.menu.colorscheme.system'),
}),
handle: () => legacyTheme.set('system'),
handle: () => colorScheme.set('system'),
icon: ComputerDesktop,
},
{
name: t.get('nav.commands.setColorTo', {
default: t.get('nav.menu.colorscheme.light'),
}),
handle: () => legacyTheme.set('light'),
handle: () => colorScheme.set('light'),
icon: Sun,
},
{
name: t.get('nav.commands.setColorTo', {
default: t.get('nav.menu.colorscheme.dark'),
}),
handle: () => legacyTheme.set('dark'),
handle: () => colorScheme.set('dark'),
icon: Moon,
},
],