Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

This commit is contained in:
tamaina 2022-05-01 06:59:47 +00:00
commit e083205824
1 changed files with 22 additions and 34 deletions

View File

@ -1,6 +1,6 @@
<template> <template>
<div class="_formRoot"> <div class="_formRoot">
<FormInfo warn class="_formBlock">{{ $ts.customCssWarn }}</FormInfo> <FormInfo warn class="_formBlock">{{ i18n.ts.customCssWarn }}</FormInfo>
<FormTextarea v-model="localCustomCss" manual-save tall class="_monospace _formBlock" style="tab-size: 2;"> <FormTextarea v-model="localCustomCss" manual-save tall class="_monospace _formBlock" style="tab-size: 2;">
<template #label>CSS</template> <template #label>CSS</template>
@ -8,50 +8,38 @@
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts" setup>
import { defineComponent } from 'vue'; import { defineExpose, ref, watch } from 'vue';
import FormTextarea from '@/components/form/textarea.vue'; import FormTextarea from '@/components/form/textarea.vue';
import FormInfo from '@/components/ui/info.vue'; import FormInfo from '@/components/ui/info.vue';
import * as os from '@/os'; import * as os from '@/os';
import { unisonReload } from '@/scripts/unison-reload'; import { unisonReload } from '@/scripts/unison-reload';
import * as symbols from '@/symbols'; import * as symbols from '@/symbols';
import { defaultStore } from '@/store'; import { i18n } from '@/i18n';
export default defineComponent({ const localCustomCss = ref(localStorage.getItem('customCss') ?? '');
components: {
FormTextarea,
FormInfo,
},
emits: ['info'], async function apply() {
localStorage.setItem('customCss', localCustomCss.value);
data() { const { canceled } = await os.confirm({
return { type: 'info',
[symbols.PAGE_INFO]: { text: i18n.ts.reloadToApplySetting,
title: this.$ts.customCss, });
icon: 'fas fa-code', if (canceled) return;
bg: 'var(--bg)',
},
localCustomCss: localStorage.getItem('customCss')
}
},
mounted() { unisonReload();
this.$watch('localCustomCss', this.apply); }
},
methods: { watch(localCustomCss, async () => {
async apply() { await apply();
localStorage.setItem('customCss', this.localCustomCss); });
const { canceled } = await os.confirm({ defineExpose({
type: 'info', [symbols.PAGE_INFO]: {
text: this.$ts.reloadToApplySetting, title: i18n.ts.customCss,
}); icon: 'fas fa-code',
if (canceled) return; bg: 'var(--bg)',
unisonReload();
}
} }
}); });
</script> </script>