Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into mkjs-n

Browse source
This commit is contained in:
tamaina 2023-06-05 05:12:03 +00:00
parent 4c52f3b286 0cb3c7481c
commit fd223a8538
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/backend/src/server/web/boot.js
View file

@ -116,9 +116,9 @@
} }
} }
} }
const colorSchema = localStorage.getItem('colorSchema'); const colorScheme = localStorage.getItem('colorScheme');
if (colorSchema) { if (colorScheme) {
document.documentElement.style.setProperty('color-schema', colorSchema); document.documentElement.style.setProperty('color-scheme', colorScheme);
} }
//#endregion //#endregion

2
packages/frontend/src/local-storage.ts
View file

@ -13,7 +13,7 @@ type Keys =
'hashtags' | 'hashtags' |
'wallpaper' | 'wallpaper' |
'theme' | 'theme' |
'colorSchema' | 'colorScheme' |
'useSystemFont' | 'useSystemFont' |
'fontSize' | 'fontSize' |
'ui' | 'ui' |

6
packages/frontend/src/scripts/theme.ts
View file

@ -60,7 +60,7 @@ export function applyTheme(theme: Theme, persist = true) {
document.documentElement.classList.remove('_themeChanging_'); document.documentElement.classList.remove('_themeChanging_');
}, 1000); }, 1000);
const colorSchema = theme.base === 'dark' ? 'dark' : 'light'; const colorScheme = theme.base === 'dark' ? 'dark' : 'light';
// Deep copy // Deep copy
const _theme = deepClone(theme); const _theme = deepClone(theme);
@ -83,11 +83,11 @@ export function applyTheme(theme: Theme, persist = true) {
document.documentElement.style.setProperty(`--${k}`, v.toString()); document.documentElement.style.setProperty(`--${k}`, v.toString());
} }
document.documentElement.style.setProperty('color-schema', colorSchema); document.documentElement.style.setProperty('color-scheme', colorScheme);
if (persist) { if (persist) {
miLocalStorage.setItem('theme', JSON.stringify(props)); miLocalStorage.setItem('theme', JSON.stringify(props));
miLocalStorage.setItem('colorSchema', colorSchema); miLocalStorage.setItem('colorScheme', colorScheme);
} }
// 色計算など再度行えるようにクライアント全体に通知 // 色計算など再度行えるようにクライアント全体に通知