summaryrefslogtreecommitdiff
path: root/packages/frontend/src
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-05-02 12:32:21 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-05-02 12:32:21 +0900
commit379c5a80917af3d7905fc44a4b5d1593c469f4c1 (patch)
treea39b711c2948ab27f48448dfb1488df109fabaf9 /packages/frontend/src
parentfix(backend): フォローリクエストの通知が残る問題を修正 (diff)
downloadmisskey-379c5a80917af3d7905fc44a4b5d1593c469f4c1.tar.gz
misskey-379c5a80917af3d7905fc44a4b5d1593c469f4c1.tar.bz2
misskey-379c5a80917af3d7905fc44a4b5d1593c469f4c1.zip
enhance(frontend): use MkColorInput
Diffstat (limited to 'packages/frontend/src')
-rw-r--r--packages/frontend/src/pages/admin/roles.editor.vue6
-rw-r--r--packages/frontend/src/pages/admin/settings.vue7
2 files changed, 6 insertions, 7 deletions
diff --git a/packages/frontend/src/pages/admin/roles.editor.vue b/packages/frontend/src/pages/admin/roles.editor.vue
index 649f64d125..48f4917c3f 100644
--- a/packages/frontend/src/pages/admin/roles.editor.vue
+++ b/packages/frontend/src/pages/admin/roles.editor.vue
@@ -8,10 +8,9 @@
<template #label>{{ i18n.ts._role.description }}</template>
</MkTextarea>
- <MkInput v-model="role.color">
+ <MkColorInput v-model="role.color">
<template #label>{{ i18n.ts.color }}</template>
- <template #caption>#RRGGBB</template>
- </MkInput>
+ </MkColorInput>
<MkInput v-model="role.iconUrl">
<template #label>{{ i18n.ts._role.iconUrl }}</template>
@@ -414,6 +413,7 @@ import { watch } from 'vue';
import { throttle } from 'throttle-debounce';
import RolesEditorFormula from './RolesEditorFormula.vue';
import MkInput from '@/components/MkInput.vue';
+import MkColorInput from '@/components/MkColorInput.vue';
import MkSelect from '@/components/MkSelect.vue';
import MkTextarea from '@/components/MkTextarea.vue';
import MkFolder from '@/components/MkFolder.vue';
diff --git a/packages/frontend/src/pages/admin/settings.vue b/packages/frontend/src/pages/admin/settings.vue
index 0bf7d772de..7ec3c381f3 100644
--- a/packages/frontend/src/pages/admin/settings.vue
+++ b/packages/frontend/src/pages/admin/settings.vue
@@ -60,11 +60,9 @@
<template #label>{{ i18n.ts.backgroundImageUrl }}</template>
</MkInput>
- <MkInput v-model="themeColor">
- <template #prefix><i class="ti ti-palette"></i></template>
+ <MkColorInput v-model="themeColor">
<template #label>{{ i18n.ts.themeColor }}</template>
- <template #caption>#RRGGBB</template>
- </MkInput>
+ </MkColorInput>
<MkTextarea v-model="defaultLightTheme">
<template #label>{{ i18n.ts.instanceDefaultLightTheme }}</template>
@@ -153,6 +151,7 @@ import { fetchInstance } from '@/instance';
import { i18n } from '@/i18n';
import { definePageMetadata } from '@/scripts/page-metadata';
import MkButton from '@/components/MkButton.vue';
+import MkColorInput from '@/components/MkColorInput.vue';
let name: string | null = $ref(null);
let description: string | null = $ref(null);