hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'setttingssync' into shigusegubu-themes3

Browse source
This commit is contained in:
Henry Jameson 2026-03-12 00:33:05 +02:00
commit 7f42d33f67
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/settings_modal/tabs/appearance_tab.vue
View file

@ -90,7 +90,7 @@
class="btn button-default palette-entry" class="btn button-default palette-entry"
:class="{ toggled: isPaletteActive(p.key), disabled: switchInProgress }" :class="{ toggled: isPaletteActive(p.key), disabled: switchInProgress }"
:disabled="switchInProgress" :disabled="switchInProgress"
@click="() => setLocalPalette(p.key, p)" @click="() => setPalette(p.key, p)"
> >
<div class="palette-label"> <div class="palette-label">
<label> <label>
@ -113,7 +113,7 @@
class="btn button-default palette-entry" class="btn button-default palette-entry"
:class="{ toggled: isPaletteActive(p.key), disabled: switchInProgress }" :class="{ toggled: isPaletteActive(p.key), disabled: switchInProgress }"
:disabled="switchInProgress" :disabled="switchInProgress"
@click="() => setLocalPalette(p.key, p)" @click="() => setPalette(p.key, p)"
> >
<div class="palette-label"> <div class="palette-label">
<label> <label>
@ -143,7 +143,7 @@
:compact="true" :compact="true"
:apply="true" :apply="true"
:disabled="switchInProgress" :disabled="switchInProgress"
@apply-palette="data => setLocalPaletteCustom(data)" @apply-palette="data => setPaletteCustom(data)"
/> />
</template> </template>
<template v-else-if="customThemeVersion === 'v2'"> <template v-else-if="customThemeVersion === 'v2'">

5
src/modules/users.js
View file

@ -704,6 +704,11 @@ const users = {
useSyncConfigStore().initSyncConfig(user) useSyncConfigStore().initSyncConfig(user)
useUserHighlightStore().initUserHighlight(user) useUserHighlightStore().initUserHighlight(user)
useInterfaceStore()
.applyTheme()
.catch((e) => {
console.error('Error setting theme', e)
})
commit('addNewUsers', [user]) commit('addNewUsers', [user])
useEmojiStore().fetchEmoji() useEmojiStore().fetchEmoji()