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

fix #8861

This commit is contained in:
syuilo 2022-06-24 00:47:55 +09:00
parent 5ee53c222b
commit c9e9129373
2 changed files with 72 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
packages/client/src/pages/theme-editor.vue
View File

@ -1,68 +1,70 @@
<template><MkStickyContainer> <template>
<MkStickyContainer>
<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template> <template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
<MkSpacer :content-max="800" :margin-min="16" :margin-max="32"> <MkSpacer :content-max="800" :margin-min="16" :margin-max="32">
<div class="cwepdizn _formRoot"> <div class="cwepdizn _formRoot">
<FormFolder :default-open="true" class="_formBlock"> <FormFolder :default-open="true" class="_formBlock">
<template #label>{{ i18n.ts.backgroundColor }}</template> <template #label>{{ i18n.ts.backgroundColor }}</template>
<div class="cwepdizn-colors"> <div class="cwepdizn-colors">
<div class="row"> <div class="row">
<button v-for="color in bgColors.filter(x => x.kind === 'light')" :key="color.color" class="color _button" :class="{ active: theme.props.bg === color.color }" @click="setBgColor(color)"> <button v-for="color in bgColors.filter(x => x.kind === 'light')" :key="color.color" class="color _button" :class="{ active: theme.props.bg === color.color }" @click="setBgColor(color)">
<div class="preview" :style="{ background: color.forPreview }"></div> <div class="preview" :style="{ background: color.forPreview }"></div>
</button> </button>
</div>
<div class="row">
<button v-for="color in bgColors.filter(x => x.kind === 'dark')" :key="color.color" class="color _button" :class="{ active: theme.props.bg === color.color }" @click="setBgColor(color)">
<div class="preview" :style="{ background: color.forPreview }"></div>
</button>
</div>
</div> </div>
<div class="row"> </FormFolder>
<button v-for="color in bgColors.filter(x => x.kind === 'dark')" :key="color.color" class="color _button" :class="{ active: theme.props.bg === color.color }" @click="setBgColor(color)">
<div class="preview" :style="{ background: color.forPreview }"></div> <FormFolder :default-open="true" class="_formBlock">
</button> <template #label>{{ i18n.ts.accentColor }}</template>
<div class="cwepdizn-colors">
<div class="row">
<button v-for="color in accentColors" :key="color" class="color rounded _button" :class="{ active: theme.props.accent === color }" @click="setAccentColor(color)">
<div class="preview" :style="{ background: color }"></div>
</button>
</div>
</div> </div>
</div> </FormFolder>
</FormFolder>
<FormFolder :default-open="true" class="_formBlock"> <FormFolder :default-open="true" class="_formBlock">
<template #label>{{ i18n.ts.accentColor }}</template> <template #label>{{ i18n.ts.textColor }}</template>
<div class="cwepdizn-colors"> <div class="cwepdizn-colors">
<div class="row"> <div class="row">
<button v-for="color in accentColors" :key="color" class="color rounded _button" :class="{ active: theme.props.accent === color }" @click="setAccentColor(color)"> <button v-for="color in fgColors" :key="color" class="color char _button" :class="{ active: (theme.props.fg === color.forLight) || (theme.props.fg === color.forDark) }" @click="setFgColor(color)">
<div class="preview" :style="{ background: color }"></div> <div class="preview" :style="{ color: color.forPreview ? color.forPreview : theme.base === 'light' ? '#5f5f5f' : '#dadada' }">A</div>
</button> </button>
</div>
</div> </div>
</div> </FormFolder>
</FormFolder>
<FormFolder :default-open="true" class="_formBlock"> <FormFolder :default-open="false" class="_formBlock">
<template #label>{{ i18n.ts.textColor }}</template> <template #icon><i class="fas fa-code"></i></template>
<div class="cwepdizn-colors"> <template #label>{{ i18n.ts.editCode }}</template>
<div class="row">
<button v-for="color in fgColors" :key="color" class="color char _button" :class="{ active: (theme.props.fg === color.forLight) || (theme.props.fg === color.forDark) }" @click="setFgColor(color)"> <div class="_formRoot">
<div class="preview" :style="{ color: color.forPreview ? color.forPreview : theme.base === 'light' ? '#5f5f5f' : '#dadada' }">A</div> <FormTextarea v-model="themeCode" tall class="_formBlock">
</button> <template #label>{{ i18n.ts._theme.code }}</template>
</FormTextarea>
<FormButton primary class="_formBlock" @click="applyThemeCode">{{ i18n.ts.apply }}</FormButton>
</div> </div>
</div> </FormFolder>
</FormFolder>
<FormFolder :default-open="false" class="_formBlock"> <FormFolder :default-open="false" class="_formBlock">
<template #icon><i class="fas fa-code"></i></template> <template #label>{{ i18n.ts.addDescription }}</template>
<template #label>{{ i18n.ts.editCode }}</template>
<div class="_formRoot"> <div class="_formRoot">
<FormTextarea v-model="themeCode" tall class="_formBlock"> <FormTextarea v-model="description">
<template #label>{{ i18n.ts._theme.code }}</template> <template #label>{{ i18n.ts._theme.description }}</template>
</FormTextarea> </FormTextarea>
<FormButton primary class="_formBlock" @click="applyThemeCode">{{ i18n.ts.apply }}</FormButton> </div>
</div> </FormFolder>
</FormFolder> </div>
</MkSpacer>
<FormFolder :default-open="false" class="_formBlock"> </MkStickyContainer>
<template #label>{{ i18n.ts.addDescription }}</template>
<div class="_formRoot">
<FormTextarea v-model="description">
<template #label>{{ i18n.ts._theme.description }}</template>
</FormTextarea>
</div>
</FormFolder>
</div>
</MkSpacer></MkStickyContainer>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
@ -85,6 +87,7 @@ import { ColdDeviceStorage, defaultStore } from '@/store';
import { addTheme } from '@/theme-store'; import { addTheme } from '@/theme-store';
import { i18n } from '@/i18n'; import { i18n } from '@/i18n';
import { useLeaveGuard } from '@/scripts/use-leave-guard'; import { useLeaveGuard } from '@/scripts/use-leave-guard';
import { definePageMetadata } from '@/scripts/page-metadata';
const bgColors = [ const bgColors = [
{ color: '#f5f5f5', kind: 'light', forPreview: '#f5f5f5' }, { color: '#f5f5f5', kind: 'light', forPreview: '#f5f5f5' },
@ -204,7 +207,17 @@ async function saveAs() {
watch($$(theme), apply, { deep: true }); watch($$(theme), apply, { deep: true });
const headerActions = $computed(() => []); const headerActions = $computed(() => [{
asFullButton: true,
icon: 'fas fa-eye',
text: i18n.ts.preview,
handler: showPreview,
}, {
asFullButton: true,
icon: 'fas fa-check',
text: i18n.ts.saveAs,
handler: saveAs,
}]);
const headerTabs = $computed(() => []); const headerTabs = $computed(() => []);
@ -212,17 +225,6 @@ definePageMetadata({
title: i18n.ts.themeEditor, title: i18n.ts.themeEditor,
icon: 'fas fa-palette', icon: 'fas fa-palette',
bg: 'var(--bg)', bg: 'var(--bg)',
actions: [{
asFullButton: true,
icon: 'fas fa-eye',
text: i18n.ts.preview,
handler: showPreview,
}, {
asFullButton: true,
icon: 'fas fa-check',
text: i18n.ts.saveAs,
handler: saveAs,
}],
}); });
</script> </script>

2
packages/client/src/scripts/use-leave-guard.ts
View File

@ -3,6 +3,7 @@ import { i18n } from '@/i18n';
import * as os from '@/os'; import * as os from '@/os';
export function useLeaveGuard(enabled: Ref<boolean>) { export function useLeaveGuard(enabled: Ref<boolean>) {
/* TODO
const setLeaveGuard = inject('setLeaveGuard'); const setLeaveGuard = inject('setLeaveGuard');
if (setLeaveGuard) { if (setLeaveGuard) {
@ -28,6 +29,7 @@ export function useLeaveGuard(enabled: Ref<boolean>) {
return !canceled; return !canceled;
}); });
} }
*/
/* /*
function onBeforeLeave(ev: BeforeUnloadEvent) { function onBeforeLeave(ev: BeforeUnloadEvent) {