diff options
| author | Shpuld Shpuldson <shp@cock.li> | 2021-03-15 11:02:16 +0200 |
|---|---|---|
| committer | Shpuld Shpuldson <shp@cock.li> | 2021-03-15 11:02:16 +0200 |
| commit | 19fc7dda9e6d3513c8b57d7bae2bbe3c9ab87ced (patch) | |
| tree | fe55c1e48af9b7c16e9735c03dc0b7caa36c962d /src/components/timeline_menu/timeline_menu.vue | |
| parent | ae159f6ad8d23ce0e3d2d765bf694f1a614c6df4 (diff) | |
| parent | 184364c7e06a982b48bbe6d913f02a73dd428aef (diff) | |
merge conflict, use v-slot:trigger, fix popover svg dimensions bug
Diffstat (limited to 'src/components/timeline_menu/timeline_menu.vue')
| -rw-r--r-- | src/components/timeline_menu/timeline_menu.vue | 48 |
1 files changed, 1 insertions, 47 deletions
diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue index 3c86842b..22dc3432 100644 --- a/src/components/timeline_menu/timeline_menu.vue +++ b/src/components/timeline_menu/timeline_menu.vue @@ -13,53 +13,7 @@ slot="content" class="timeline-menu-popover panel panel-default" > - <ul> - <li v-if="currentUser"> - <router-link :to="{ name: 'friends' }"> - <FAIcon - fixed-width - class="fa-scale-110 fa-old-padding " - icon="home" - />{{ $t("nav.timeline") }} - </router-link> - </li> - <li v-if="currentUser"> - <router-link :to="{ name: 'bookmarks'}"> - <FAIcon - fixed-width - class="fa-scale-110 fa-old-padding " - icon="bookmark" - />{{ $t("nav.bookmarks") }} - </router-link> - </li> - <li v-if="currentUser"> - <router-link :to="{ name: 'dms', params: { username: currentUser.screen_name } }"> - <FAIcon - fixed-width - class="fa-scale-110 fa-old-padding " - icon="envelope" - />{{ $t("nav.dms") }} - </router-link> - </li> - <li v-if="currentUser || !privateMode"> - <router-link :to="{ name: 'public-timeline' }"> - <FAIcon - fixed-width - class="fa-scale-110 fa-old-padding " - icon="users" - />{{ $t("nav.public_tl") }} - </router-link> - </li> - <li v-if="federating && (currentUser || !privateMode)"> - <router-link :to="{ name: 'public-external-timeline' }"> - <FAIcon - fixed-width - class="fa-scale-110 fa-old-padding " - icon="globe" - />{{ $t("nav.twkn") }} - </router-link> - </li> - </ul> + <TimelineMenuContent /> </div> <div slot="trigger" |