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

Resolve #7096

This commit is contained in:
syuilo 2021-02-06 18:37:32 +09:00
parent 86eb487a38
commit 9b3458fba0
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/client/pages/theme-editor.vue
View File

@ -62,7 +62,7 @@ import FormButton from '@/components/form/button.vue';
import FormTextarea from '@/components/form/textarea.vue'; import FormTextarea from '@/components/form/textarea.vue';
import FormGroup from '@/components/form/group.vue'; import FormGroup from '@/components/form/group.vue';
import { Theme, applyTheme, validateTheme } from '@/scripts/theme'; import { Theme, applyTheme, validateTheme, darkTheme, lightTheme } from '@/scripts/theme';
import { host } from '@/config'; import { host } from '@/config';
import * as os from '@/os'; import * as os from '@/os';
import { ColdDeviceStorage } from '@/store'; import { ColdDeviceStorage } from '@/store';
@ -84,7 +84,7 @@ export default defineComponent({
}, },
theme: { theme: {
base: 'light', base: 'light',
props: {} props: lightTheme.props
} as Theme, } as Theme,
codeEnabled: false, codeEnabled: false,
themeCode: null, themeCode: null,
@ -123,7 +123,6 @@ export default defineComponent({
created() { created() {
this.$watch('theme', this.apply, { deep: true }); this.$watch('theme', this.apply, { deep: true });
window.addEventListener('beforeunload', this.beforeunload); window.addEventListener('beforeunload', this.beforeunload);
}, },
@ -159,6 +158,14 @@ export default defineComponent({
}, },
setBgColor(color) { setBgColor(color) {
if (this.theme.base != color.kind) {
const base = color.kind === 'dark' ? darkTheme : lightTheme;
for (const prop of Object.keys(base.props)) {
if (prop === 'accent') continue;
if (prop === 'fg') continue;
this.theme.props[prop] = base.props[prop];
}
}
this.theme.base = color.kind; this.theme.base = color.kind;
this.theme.props.bg = color.color; this.theme.props.bg = color.color;