summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoriDev <11006910+noridev@users.noreply.github.com>2021-06-08 12:17:17 +0900
committerGitHub <noreply@github.com>2021-06-08 12:17:17 +0900
commita2b8097b4b41505432529823885be09ae4c5307a (patch)
tree88ac54e0dcc191c835748a13b2be9d65eb3fee6c
parentUpdate deps (diff)
downloadmisskey-a2b8097b4b41505432529823885be09ae4c5307a.tar.gz
misskey-a2b8097b4b41505432529823885be09ae4c5307a.tar.bz2
misskey-a2b8097b4b41505432529823885be09ae4c5307a.zip
歓迎ページでバナー画像が表示されない問題を修正 (#7559)
* 歓迎ページでバナー画像が表示されない問題 * revert * 背景画像設定オプションを追加
Diffstat (limited to '')
-rw-r--r--locales/ja-JP.yml1
-rw-r--r--src/client/components/featured-photos.vue4
-rw-r--r--src/client/pages/instance/settings.vue8
3 files changed, 10 insertions, 3 deletions
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 13f7e331ad..9e500f6130 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -326,6 +326,7 @@ driveCapacityPerRemoteAccount: "リモートユーザーひとりあたりのド
inMb: "メガバイト単位"
iconUrl: "アイコン画像のURL (faviconなど)"
bannerUrl: "バナー画像のURL"
+backgroundImageUrl: "背景画像のURL"
basicInfo: "基本情報"
pinnedUsers: "ピン留めユーザー"
pinnedUsersDescription: "「みつける」ページなどにピン留めしたいユーザーを改行で区切って記述します。"
diff --git a/src/client/components/featured-photos.vue b/src/client/components/featured-photos.vue
index daa2190feb..c992a5d1fb 100644
--- a/src/client/components/featured-photos.vue
+++ b/src/client/components/featured-photos.vue
@@ -1,7 +1,5 @@
<template>
-<div class="xfbouadm" v-if="meta" :style="{ backgroundImage: `url(${ meta.backgroundImageUrl })` }">
-
-</div>
+<div class="xfbouadm" v-if="meta" :style="{ backgroundImage: `url(${ meta.backgroundImageUrl })` }"></div>
</template>
<script lang="ts">
diff --git a/src/client/pages/instance/settings.vue b/src/client/pages/instance/settings.vue
index 66f01c42c7..b68d784897 100644
--- a/src/client/pages/instance/settings.vue
+++ b/src/client/pages/instance/settings.vue
@@ -19,6 +19,11 @@
<span>{{ $ts.bannerUrl }}</span>
</FormInput>
+ <FormInput v-model:value="backgroundImageUrl">
+ <template #prefix><i class="fas fa-link"></i></template>
+ <span>{{ $ts.backgroundImageUrl }}</span>
+ </FormInput>
+
<FormInput v-model:value="tosUrl">
<template #prefix><i class="fas fa-link"></i></template>
<span>{{ $ts.tosUrl }}</span>
@@ -88,6 +93,7 @@ export default defineComponent({
maintainerEmail: null,
iconUrl: null,
bannerUrl: null,
+ backgroundImageUrl: null,
maxNoteTextLength: 0,
enableLocalTimeline: false,
enableGlobalTimeline: false,
@@ -106,6 +112,7 @@ export default defineComponent({
this.tosUrl = meta.tosUrl;
this.iconUrl = meta.iconUrl;
this.bannerUrl = meta.bannerUrl;
+ this.backgroundImageUrl = meta.backgroundImageUrl;
this.maintainerName = meta.maintainerName;
this.maintainerEmail = meta.maintainerEmail;
this.maxNoteTextLength = meta.maxNoteTextLength;
@@ -120,6 +127,7 @@ export default defineComponent({
tosUrl: this.tosUrl,
iconUrl: this.iconUrl,
bannerUrl: this.bannerUrl,
+ backgroundImageUrl: this.backgroundImageUrl,
maintainerName: this.maintainerName,
maintainerEmail: this.maintainerEmail,
maxNoteTextLength: this.maxNoteTextLength,