summaryrefslogtreecommitdiff
path: root/packages/frontend/src
diff options
context:
space:
mode:
authorsyuilo <4439005+syuilo@users.noreply.github.com>2025-04-08 10:38:04 +0900
committersyuilo <4439005+syuilo@users.noreply.github.com>2025-04-08 10:38:04 +0900
commitbaf04a1e2572d25e8343b0904a3c0263631cff8b (patch)
tree115fd1f6b9d2bcb2039f0fc5d8882549195f5b95 /packages/frontend/src
parentclean up (diff)
downloadsharkey-baf04a1e2572d25e8343b0904a3c0263631cff8b.tar.gz
sharkey-baf04a1e2572d25e8343b0904a3c0263631cff8b.tar.bz2
sharkey-baf04a1e2572d25e8343b0904a3c0263631cff8b.zip
fix(frontend): Fix #15764
Diffstat (limited to 'packages/frontend/src')
-rw-r--r--packages/frontend/src/ui/zen.vue20
1 files changed, 8 insertions, 12 deletions
diff --git a/packages/frontend/src/ui/zen.vue b/packages/frontend/src/ui/zen.vue
index 3e4d452281..800aef8696 100644
--- a/packages/frontend/src/ui/zen.vue
+++ b/packages/frontend/src/ui/zen.vue
@@ -6,16 +6,14 @@ SPDX-License-Identifier: AGPL-3.0-only
<template>
<div :class="$style.root">
<div :class="$style.contents">
- <div style="flex: 1; min-height: 0;">
- <RouterView/>
- </div>
-
<!--
デッキUIが設定されている場合はデッキUIに戻れるようにする (ただし?zenが明示された場合は表示しない)
See https://github.com/misskey-dev/misskey/issues/10905
-->
- <div v-if="showBottom" :class="$style.bottom">
- <button v-tooltip="i18n.ts.goToMisskey" :class="['_button', '_shadow', $style.button]" @click="goToMisskey"><i class="ti ti-home"></i></button>
+ <button v-if="showDeckNav" class="_buttonPrimary" :class="$style.deckNav" @click="goToDeck">{{ i18n.ts.goToDeck }}</button>
+
+ <div style="flex: 1; min-height: 0;">
+ <RouterView/>
</div>
</div>
@@ -37,7 +35,7 @@ const isRoot = computed(() => mainRouter.currentRoute.value.name === 'index');
const pageMetadata = ref<null | PageMetadata>(null);
-const showBottom = !(new URLSearchParams(window.location.search)).has('zen') && ui === 'deck';
+const showDeckNav = !(new URLSearchParams(window.location.search)).has('zen') && ui === 'deck';
provide(DI.router, mainRouter);
provideMetadataReceiver((metadataGetter) => {
@@ -53,7 +51,7 @@ provideMetadataReceiver((metadataGetter) => {
});
provideReactiveMetadata(pageMetadata);
-function goToMisskey() {
+function goToDeck() {
window.location.href = '/';
}
</script>
@@ -68,10 +66,8 @@ function goToMisskey() {
height: 100dvh;
}
-.bottom {
- height: calc(60px + (var(--MI-margin) * 2) + env(safe-area-inset-bottom, 0px));
- width: 100%;
- margin-top: auto;
+.deckNav {
+ padding: 4px;
}
.button {