diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-05-05 16:48:13 -0400 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-05-05 16:48:13 -0400 |
| commit | 3a7e50932c4fe955c281f5cd17d93ea3c2c56a7f (patch) | |
| tree | e36511a6f9dbc9a095c5a649ff53e4d9089dea68 | |
| parent | merge: Protect featured timeline endpoint (!979) (diff) | |
| parent | merge: "Powered by" changes colors based on accent, Scrolling timeline now hi... (diff) | |
| download | sharkey-3a7e50932c4fe955c281f5cd17d93ea3c2c56a7f.tar.gz sharkey-3a7e50932c4fe955c281f5cd17d93ea3c2c56a7f.tar.bz2 sharkey-3a7e50932c4fe955c281f5cd17d93ea3c2c56a7f.zip | |
Merge branch 'develop' into merge/2025-03-24
# Conflicts:
# packages/frontend/src/pages/welcome.entrance.a.vue
| -rw-r--r-- | packages/frontend/src/pages/welcome.entrance.a.vue | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/frontend/src/pages/welcome.entrance.a.vue b/packages/frontend/src/pages/welcome.entrance.a.vue index 16d9af1f0c..eb0e3269d1 100644 --- a/packages/frontend/src/pages/welcome.entrance.a.vue +++ b/packages/frontend/src/pages/welcome.entrance.a.vue @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only <template> <div v-if="meta" :class="$style.root"> <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.shape2"></div> <div :class="$style.logoWrapper"> @@ -123,6 +123,7 @@ misskeyApiGet('federation/instances', { } .poweredBy { + color: var(--MI_THEME-fgOnAccent); margin-bottom: 2px; } |