summaryrefslogtreecommitdiff
path: root/src/client/scripts/theme.ts
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2021-04-14 16:39:53 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2021-04-14 16:39:53 +0900
commit449dc17df8fe3b6cc220aaabd576b0f04f6028da (patch)
tree33e5c4da1b43f1bba0a02501150c760623fc9798 /src/client/scripts/theme.ts
parentMerge branch 'develop' (diff)
parent12.76.0 (diff)
downloadmisskey-449dc17df8fe3b6cc220aaabd576b0f04f6028da.tar.gz
misskey-449dc17df8fe3b6cc220aaabd576b0f04f6028da.tar.bz2
misskey-449dc17df8fe3b6cc220aaabd576b0f04f6028da.zip
Merge branch 'develop'
Diffstat (limited to 'src/client/scripts/theme.ts')
-rw-r--r--src/client/scripts/theme.ts19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/client/scripts/theme.ts b/src/client/scripts/theme.ts
index c1580c6367..b0bf620a7d 100644
--- a/src/client/scripts/theme.ts
+++ b/src/client/scripts/theme.ts
@@ -9,18 +9,19 @@ export type Theme = {
props: Record<string, string>;
};
-export const lightTheme: Theme = require('../themes/_light.json5');
-export const darkTheme: Theme = require('../themes/_dark.json5');
+export const lightTheme: Theme = require('@client/themes/_light.json5');
+export const darkTheme: Theme = require('@client/themes/_dark.json5');
export const themeProps = Object.keys(lightTheme.props).filter(key => !key.startsWith('X'));
export const builtinThemes = [
- require('../themes/l-light.json5'),
- require('../themes/l-apricot.json5'),
+ require('@client/themes/l-light.json5'),
+ require('@client/themes/l-apricot.json5'),
+ require('@client/themes/l-rainy.json5'),
- require('../themes/d-dark.json5'),
- require('../themes/d-persimmon.json5'),
- require('../themes/d-black.json5'),
+ require('@client/themes/d-dark.json5'),
+ require('@client/themes/d-persimmon.json5'),
+ require('@client/themes/d-black.json5'),
] as Theme[];
let timeout = null;
@@ -28,10 +29,10 @@ let timeout = null;
export function applyTheme(theme: Theme, persist = true) {
if (timeout) clearTimeout(timeout);
- document.documentElement.classList.add('changing-theme');
+ document.documentElement.classList.add('_themeChanging_');
timeout = setTimeout(() => {
- document.documentElement.classList.remove('changing-theme');
+ document.documentElement.classList.remove('_themeChanging_');
}, 1000);
// Deep copy