usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor

This commit is contained in:
syuilo 2020-07-10 00:20:26 +09:00
parent ca2e53bd6e
commit a591a334ed
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/init.ts
View File

@ -18,7 +18,7 @@ import PostFormDialog from './components/post-form-dialog.vue';
import Dialog from './components/dialog.vue';
import Menu from './components/menu.vue';
import { router } from './router';
import { applyTheme, lightTheme } from './theme';
import { applyTheme, lightTheme } from './scripts/theme';
import { isDeviceDarkmode } from './scripts/is-device-darkmode';
import createStore from './store';
import { clientDb, get, count } from './db';
@ -114,7 +114,7 @@ os.init(async () => {
}, false);
store.watch(state => state.device.darkMode, darkMode => {
import('./theme').then(({ builtinThemes }) => {
import('./scripts/theme').then(({ builtinThemes }) => {
const themes = builtinThemes.concat(store.state.device.themes);
applyTheme(themes.find(x => x.id === (darkMode ? store.state.device.darkTheme : store.state.device.lightTheme)));
});

2
src/client/pages/preferences/theme.vue
View File

@ -87,7 +87,7 @@ import MkButton from '../../components/ui/button.vue';
import MkSelect from '../../components/ui/select.vue';
import MkSwitch from '../../components/ui/switch.vue';
import MkTextarea from '../../components/ui/textarea.vue';
import { Theme, builtinThemes, applyTheme, validateTheme } from '../../theme';
import { Theme, builtinThemes, applyTheme, validateTheme } from '../../scripts/theme';
import { selectFile } from '../../scripts/select-file';
import { isDeviceDarkmode } from '../../scripts/is-device-darkmode';

28
src/client/theme.ts → src/client/scripts/theme.ts
View File

@ -9,22 +9,22 @@ export type Theme = {
props: { [key: string]: string };
};
export const lightTheme: Theme = require('./themes/_light.json5');
export const darkTheme: Theme = require('./themes/_dark.json5');
export const lightTheme: Theme = require('../themes/_light.json5');
export const darkTheme: Theme = require('../themes/_dark.json5');
export const builtinThemes = [
require('./themes/white.json5'),
require('./themes/black.json5'),
require('./themes/lavender.json5'),
require('./themes/halloween.json5'),
require('./themes/city.json5'),
require('./themes/rainy.json5'),
require('./themes/urban.json5'),
require('./themes/cafe.json5'),
require('./themes/chocolate.json5'),
require('./themes/danboard.json5'),
require('./themes/olive.json5'),
require('./themes/ocean.json5'),
require('../themes/white.json5'),
require('../themes/black.json5'),
require('../themes/lilac.json5'),
require('../themes/halloween.json5'),
require('../themes/city.json5'),
require('../themes/rainy.json5'),
require('../themes/urban.json5'),
require('../themes/cafe.json5'),
require('../themes/chocolate.json5'),
require('../themes/danboard.json5'),
require('../themes/olive.json5'),
require('../themes/ocean.json5'),
] as Theme[];
let timeout = null;

2
src/client/themes/lavender.json5 → src/client/themes/lilac.json5
View File

@ -1,7 +1,7 @@
{
id: 'e9c8c01d-9c15-48d0-9b5c-3d00843b5b36',
name: 'Lavender',
name: 'Lilac',
author: 'syuilo',
base: 'light',