diff --git a/app/app.vue b/app/app.vue index 8250c5af..3c9b4b6f 100644 --- a/app/app.vue +++ b/app/app.vue @@ -6,7 +6,7 @@ return colorMode.value === 'dark' }, set() { - colorMode.preference = colorMode.value === 'dark' ? 'light' : 'dark' + colorMode.preference = colorMode.value === 'dark' ? 'default' : 'dark' }, }) diff --git a/app/composables/useCurrentStudent.ts b/app/composables/useCurrentStudent.ts index 11043c6c..4ba3ee3c 100644 --- a/app/composables/useCurrentStudent.ts +++ b/app/composables/useCurrentStudent.ts @@ -4,6 +4,7 @@ export type StudentSettings = { dyslexiaFont: boolean language: string fontSize: number + theme: string } export const useCurrentStudent = () => { @@ -13,6 +14,7 @@ export const useCurrentStudent = () => { const raw = (student.value?.settings as Partial) || {} return { + theme: typeof raw.theme === 'string' && raw.theme !== 'default' ? raw.theme : 'default', dyslexiaFont: Boolean(raw.dyslexiaFont), language: raw.language || 'en', fontSize: Number(raw.fontSize) || 1, diff --git a/app/pages/admin/announcements.vue b/app/pages/admin/announcements.vue index 694f2536..f0c6a0d4 100644 --- a/app/pages/admin/announcements.vue +++ b/app/pages/admin/announcements.vue @@ -53,7 +53,7 @@ watch(showEmojiPicker, (open) => { pickerInstance = new Picker({ data, onEmojiSelect: onEmojiSelect, - theme: 'light' + theme: 'default' }) pickerContainerRef.value.appendChild(pickerInstance as any) } diff --git a/app/pages/reader/decor.vue b/app/pages/reader/decor.vue index 99dfe5d7..ef77b68e 100644 --- a/app/pages/reader/decor.vue +++ b/app/pages/reader/decor.vue @@ -1,12 +1,78 @@