logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: 15229d27b41c1a378fefbb834a4bfd5c12ff0514
parent 0aa334515bd67ca69e84177c22273592f694fc28
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date:   Tue,  7 Jun 2022 13:59:07 +0000

Merge branch '3c-fixes' into 'develop'

restore notifications page, fix z-index issues

Closes #1166

See merge request pleroma/pleroma-fe!1534

Diffstat:

Msrc/App.vue2+-
Msrc/boot/routes.js2+-
Msrc/components/notifications/notifications.js4+++-
Msrc/components/notifications/notifications.vue2+-
Msrc/components/timeline/timeline.scss2+-
5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/App.vue b/src/App.vue @@ -9,7 +9,7 @@ /> <MobileNav v-if="layoutType === 'mobile'" /> <DesktopNav v-else /> - <notifications v-if="currentUser" /> + <Notifications v-if="currentUser" /> <div id="content" class="app-layout container" diff --git a/src/boot/routes.js b/src/boot/routes.js @@ -62,7 +62,7 @@ export default (store) => { { name: 'password-reset', path: '/password-reset', component: PasswordReset, props: true }, { name: 'registration-token', path: '/registration/:token', component: Registration }, { name: 'friend-requests', path: '/friend-requests', component: FollowRequests, beforeEnter: validateAuthenticatedRoute }, - { name: 'notifications', path: '/:username/notifications', component: Notifications, beforeEnter: validateAuthenticatedRoute }, + { name: 'notifications', path: '/:username/notifications', component: Notifications, props: () => ({ disableTeleport: true }), beforeEnter: validateAuthenticatedRoute }, { name: 'login', path: '/login', component: AuthForm }, { name: 'shout-panel', path: '/shout-panel', component: ShoutPanel, props: () => ({ floating: false }) }, { name: 'oauth-callback', path: '/oauth-callback', component: OAuthCallback, props: (route) => ({ code: route.query.code }) }, diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js @@ -27,7 +27,9 @@ const Notifications = { // meant for "Interactions" timeline minimalMode: Boolean, // Custom filter mode, an array of strings, possible values 'mention', 'repeat', 'like', 'follow', used to override global filter for use in "Interactions" timeline - filterMode: Array + filterMode: Array, + // Disable teleporting (i.e. for /users/user/notifications) + disableTeleport: Boolean }, data () { return { diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue @@ -1,5 +1,5 @@ <template> - <teleport :disabled="minimalMode" :to="teleportTarget"> + <teleport :disabled="minimalMode || disableTeleport" :to="teleportTarget"> <div :class="{ minimal: minimalMode }" class="Notifications" diff --git a/src/components/timeline/timeline.scss b/src/components/timeline/timeline.scss @@ -11,7 +11,7 @@ .conversation-heading { top: calc(var(--__panel-heading-height) * var(--currentPanelStack, 2)); - z-index: 1; + z-index: 2; } &.-nonpanel {