Merge upstream

This commit is contained in:
ASTRO:? 2024-12-30 23:28:39 +09:00
commit 5f931855be
No known key found for this signature in database
GPG key ID: 8947F3AF5B0B4BFE
147 changed files with 1778 additions and 1044 deletions

View file

@ -11,9 +11,9 @@ SPDX-License-Identifier: AGPL-3.0-only
<div class="_gaps_m">
<div :class="$style.banner" :style="{ backgroundImage: `url(${ instance.bannerUrl })` }">
<div style="overflow: clip;">
<img v-if="miLocalStorage.getItem('kawaii')" src="/client-assets/kawaii/about-icon.png" alt="" :class="$style.bannerIconAlt"/>
<img v-else :src="instance.iconUrl ?? '/favicon.ico'" alt="" :class="$style.bannerIcon"/>
<Mfm v-if="miLocalStorage.getItem('kawaii')" text="Logo by @sawaratsuki@misskey.io" :class="$style.iconCredit"/>
<img v-if="kawaiiMode" src="/client-assets/kawaii/about-icon.png" alt="" :class="$style.bannerIconAlt"/>
<img v-else :src="instance.iconUrl ?? instance.faviconUrl ?? '/favicon.ico'" alt="" :class="$style.bannerIcon"/>
<Mfm v-if="kawaiiMode" text="Logo by @sawaratsuki@misskey.io" :class="$style.iconCredit"/>
<div :class="$style.bannerName">
<b>{{ instance.name ?? host }}</b>
</div>
@ -211,6 +211,7 @@ const props = withDefaults(defineProps<{
initialTab: 'overview',
});
const kawaiiMode = miLocalStorage.getItem('kawaii') === 'true';
const stats = ref<Misskey.entities.StatsResponse | null>(null);
const tab = ref(props.initialTab);
const staffs = ref<Misskey.entities.User[]>([]);