diff options
| author | syuilo <4439005+syuilo@users.noreply.github.com> | 2025-08-05 09:44:59 +0900 |
|---|---|---|
| committer | syuilo <4439005+syuilo@users.noreply.github.com> | 2025-08-05 09:44:59 +0900 |
| commit | 9931fff35ba13f1ed5d7d949d29e0da5e29a050f (patch) | |
| tree | b8d91e493997ff5cfd70917904e3aa598e5e7725 /packages | |
| parent | fix type errors (diff) | |
| download | misskey-9931fff35ba13f1ed5d7d949d29e0da5e29a050f.tar.gz misskey-9931fff35ba13f1ed5d7d949d29e0da5e29a050f.tar.bz2 misskey-9931fff35ba13f1ed5d7d949d29e0da5e29a050f.zip | |
🎨
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/frontend/src/components/global/MkPageHeader.vue | 3 | ||||
| -rw-r--r-- | packages/frontend/src/pages/timeline.vue | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/packages/frontend/src/components/global/MkPageHeader.vue b/packages/frontend/src/components/global/MkPageHeader.vue index 542c3d8d12..2f4de840db 100644 --- a/packages/frontend/src/components/global/MkPageHeader.vue +++ b/packages/frontend/src/components/global/MkPageHeader.vue @@ -52,6 +52,7 @@ export type PageHeaderProps = { actions?: PageHeaderItem[] | null; thin?: boolean; hideTitle?: boolean; + canOmitTitle?: boolean; displayMyAvatar?: boolean; }; </script> @@ -77,7 +78,7 @@ const emit = defineEmits<{ const injectedPageMetadata = inject(DI.pageMetadata, ref(null)); const pageMetadata = computed(() => props.overridePageMetadata ?? injectedPageMetadata.value); -const hideTitle = computed(() => inject('shouldOmitHeaderTitle', false) || props.hideTitle); +const hideTitle = computed(() => inject('shouldOmitHeaderTitle', false) || props.hideTitle || (props.canOmitTitle && props.tabs.length > 0)); const thin_ = props.thin || inject('shouldHeaderThin', false); const el = useTemplateRef('el'); diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue index b8c3ebadd9..3fe48b4d72 100644 --- a/packages/frontend/src/pages/timeline.vue +++ b/packages/frontend/src/pages/timeline.vue @@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only --> <template> -<PageWithHeader v-model:tab="src" :actions="headerActions" :tabs="$i ? headerTabs : headerTabsWhenNotLogin" :swipable="true" :displayMyAvatar="true"> +<PageWithHeader v-model:tab="src" :actions="headerActions" :tabs="$i ? headerTabs : headerTabsWhenNotLogin" :swipable="true" :displayMyAvatar="true" :canOmitTitle="true"> <div class="_spacer" style="--MI_SPACER-w: 800px;"> <MkTip v-if="isBasicTimeline(src)" :k="`tl.${src}`" style="margin-bottom: var(--MI-margin);"> {{ i18n.ts._timelineDescription[src] }} @@ -45,8 +45,6 @@ import { miLocalStorage } from '@/local-storage.js'; import { availableBasicTimelines, hasWithReplies, isAvailableBasicTimeline, isBasicTimeline, basicTimelineIconClass } from '@/timelines.js'; import { prefer } from '@/preferences.js'; -provide('shouldOmitHeaderTitle', true); - const tlComponent = useTemplateRef('tlComponent'); type TimelinePageSrc = BasicTimelineType | `list:${string}`; |