From 2c6f84eab567ba91171a747553a05b6b790419a0 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 9 Aug 2022 10:35:47 -0700
Subject: [PATCH] fix: caption in admin settings
Move splash below theme
Splash below theme
---
package.json | 2 +-
packages/client/src/pages/admin/settings.vue | 34 +++++++++++---------
2 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/package.json b/package.json
index 6fe1d479d..392ab0893 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "misskey",
- "version": "12.118.1-calc.rc.7",
+"version": "12.118.1-calc.rc.8",
"codename": "aqua",
"repository": {
"type": "git",
diff --git a/packages/client/src/pages/admin/settings.vue b/packages/client/src/pages/admin/settings.vue
index 43d1f43f9..2871abab2 100644
--- a/packages/client/src/pages/admin/settings.vue
+++ b/packages/client/src/pages/admin/settings.vue
@@ -46,8 +46,10 @@
<FormSection>
<FormSwitch v-model="enableRecommendedTimeline" class="_formBlock">{{ i18n.ts.enableRecommendedTimeline }}</FormSwitch>
- <FormTextarea v-model="recommendedInstances" class="_formBlock"></FormTextarea>
- <template #caption>{{ i18n.ts.recommendedInstancesDescription }}</template>
+ <FormTextarea v-model="recommendedInstances" class="_formBlock">
+ <template #label>{{ i18n.ts.recommendedInstances }}</template>
+ <template #caption>{{ i18n.ts.recommendedInstancesDescription }}</template>
+ </FormTextarea>
</FormSection>
<FormSection>
@@ -56,20 +58,6 @@
<FormInfo class="_formBlock">{{ i18n.ts.disablingTimelinesInfo }}</FormInfo>
</FormSection>
- <FormSection>
- <template #label>{{ i18n.ts.splash }}</template>
-
- <FormTextarea v-model="customMOTD" class="_formBlock">
- <template #label>{{ i18n.ts.customMOTD }}</template>
- <template #caption>{{ i18n.ts.customMOTDDescription }}</template>
- </FormTextarea>
-
- <FormTextarea v-model="customSplashIcons" class="_formBlock">
- <template #label>{{ i18n.ts.customSplashIcons }}</template>
- <template #caption>{{ i18n.ts.customSplashIconsDescription }}</template>
- </FormTextarea>
- </FormSection>
-
<FormSection>
<template #label>{{ i18n.ts.theme }}</template>
@@ -105,6 +93,20 @@
</FormTextarea>
</FormSection>
+ <FormSection>
+ <template #label>{{ i18n.ts.splash }}</template>
+
+ <FormTextarea v-model="customMOTD" class="_formBlock">
+ <template #label>{{ i18n.ts.customMOTD }}</template>
+ <template #caption>{{ i18n.ts.customMOTDDescription }}</template>
+ </FormTextarea>
+
+ <FormTextarea v-model="customSplashIcons" class="_formBlock">
+ <template #label>{{ i18n.ts.customSplashIcons }}</template>
+ <template #caption>{{ i18n.ts.customSplashIconsDescription }}</template>
+ </FormTextarea>
+ </FormSection>
+
<FormSection>
<template #label>{{ i18n.ts.files }}</template>