Merge branch 'develop' into merge/2025-03-24

# Conflicts:
#	packages/frontend/src/pages/welcome.entrance.a.vue
This commit is contained in:
Hazelnoot 2025-05-05 16:48:13 -04:00
commit 3a7e50932c

View file

@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template> <template>
<div v-if="meta" :class="$style.root"> <div v-if="meta" :class="$style.root">
<MkFeaturedPhotos :class="$style.bg"/> <MkFeaturedPhotos :class="$style.bg"/>
<XTimeline :class="$style.tl"/> <XTimeline v-if="meta.policies.ltlAvailable" :class="$style.tl"/>
<div :class="$style.shape1"></div> <div :class="$style.shape1"></div>
<div :class="$style.shape2"></div> <div :class="$style.shape2"></div>
<div :class="$style.logoWrapper"> <div :class="$style.logoWrapper">
@ -123,6 +123,7 @@ misskeyApiGet('federation/instances', {
} }
.poweredBy { .poweredBy {
color: var(--MI_THEME-fgOnAccent);
margin-bottom: 2px; margin-bottom: 2px;
} }