From a2b8097b4b41505432529823885be09ae4c5307a Mon Sep 17 00:00:00 2001 From: NoriDev <11006910+noridev@users.noreply.github.com> Date: Tue, 8 Jun 2021 12:17:17 +0900 Subject: [PATCH] =?UTF-8?q?=E6=AD=93=E8=BF=8E=E3=83=9A=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=81=A7=E3=83=90=E3=83=8A=E3=83=BC=E7=94=BB=E5=83=8F=E3=81=8C?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E5=95=8F?= =?UTF-8?q?=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=20(#7559)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 歓迎ページでバナー画像が表示されない問題 * revert * 背景画像設定オプションを追加 --- locales/ja-JP.yml | 1 + src/client/components/featured-photos.vue | 4 +--- src/client/pages/instance/settings.vue | 8 ++++++++ 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,