diff options
| author | tusooa <tusooa@kazv.moe> | 2022-08-30 00:14:30 +0000 |
|---|---|---|
| committer | tusooa <tusooa@kazv.moe> | 2022-08-30 00:14:30 +0000 |
| commit | 8b25febe36a97d113c846928dab22ab36158ee07 (patch) | |
| tree | f6f63b05e4bbc9d17258a4a559a2dc1970bbf047 /src/components/timeline_menu/timeline_menu.vue | |
| parent | 3b6c31f3b3d2326ffbe258c826f6dbd3f5374cf2 (diff) | |
| parent | dbb6f224425e059e2edc6018d0b009cc87a0aea4 (diff) | |
Merge branch 'navigation-update' into 'develop'
Navigation update + preferences storage (and some minor fixes)
See merge request pleroma/pleroma-fe!1592
Diffstat (limited to 'src/components/timeline_menu/timeline_menu.vue')
| -rw-r--r-- | src/components/timeline_menu/timeline_menu.vue | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue index c24b9d72..e7250282 100644 --- a/src/components/timeline_menu/timeline_menu.vue +++ b/src/components/timeline_menu/timeline_menu.vue @@ -10,7 +10,19 @@ @close="() => isOpen = false" > <template #content> - <TimelineMenuContent /> + <ListsMenuContent + v-if="useListsMenu" + :show-pin="false" + class="timelines" + /> + <ul v-else> + <NavigationEntry + v-for="item in timelinesList" + :key="item.name" + :show-pin="false" + :item="item" + /> + </ul> </template> <template #trigger> <span class="button-unstyled title timeline-menu-title"> @@ -138,8 +150,7 @@ background-color: $fallback--lightBg; background-color: var(--selectedMenu, $fallback--lightBg); color: $fallback--text; - color: var(--selectedMenuText, $fallback--text); - --faint: var(--selectedMenuFaintText, $fallback--faint); + color: var(--selectedMenuText, $fallback--text); --faint: var(--selectedMenuFaintText, $fallback--faint); --faintLink: var(--selectedMenuFaintLink, $fallback--faint); --lightText: var(--selectedMenuLightText, $fallback--lightText); --icon: var(--selectedMenuIcon, $fallback--icon); |