moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

restore notifications page, fix z-index issues

Closes #1166

See merge request pleroma/pleroma-fe!1534
This commit is contained in:
HJ 2022-06-07 13:59:07 +00:00
parent 0aa334515b 9b5fe24ca4
commit 15229d27b4
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.vue
View File

@ -9,7 +9,7 @@
/> />
<MobileNav v-if="layoutType === 'mobile'" /> <MobileNav v-if="layoutType === 'mobile'" />
<DesktopNav v-else /> <DesktopNav v-else />
<notifications v-if="currentUser" /> <Notifications v-if="currentUser" />
<div <div
id="content" id="content"
class="app-layout container" class="app-layout container"

2
src/boot/routes.js
View File

@ -62,7 +62,7 @@ export default (store) => {
{ name: 'password-reset', path: '/password-reset', component: PasswordReset, props: true }, { name: 'password-reset', path: '/password-reset', component: PasswordReset, props: true },
{ name: 'registration-token', path: '/registration/:token', component: Registration }, { name: 'registration-token', path: '/registration/:token', component: Registration },
{ name: 'friend-requests', path: '/friend-requests', component: FollowRequests, beforeEnter: validateAuthenticatedRoute }, { 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: 'login', path: '/login', component: AuthForm },
{ name: 'shout-panel', path: '/shout-panel', component: ShoutPanel, props: () => ({ floating: false }) }, { 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 }) }, { name: 'oauth-callback', path: '/oauth-callback', component: OAuthCallback, props: (route) => ({ code: route.query.code }) },

4
src/components/notifications/notifications.js
View File

@ -27,7 +27,9 @@ const Notifications = {
// meant for "Interactions" timeline // meant for "Interactions" timeline
minimalMode: Boolean, 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 // 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 () { data () {
return { return {

2
src/components/notifications/notifications.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<teleport :disabled="minimalMode" :to="teleportTarget"> <teleport :disabled="minimalMode || disableTeleport" :to="teleportTarget">
<div <div
:class="{ minimal: minimalMode }" :class="{ minimal: minimalMode }"
class="Notifications" class="Notifications"

2
src/components/timeline/timeline.scss
View File

@ -11,7 +11,7 @@
.conversation-heading { .conversation-heading {
top: calc(var(--__panel-heading-height) * var(--currentPanelStack, 2)); top: calc(var(--__panel-heading-height) * var(--currentPanelStack, 2));
z-index: 1; z-index: 2;
} }
&.-nonpanel { &.-nonpanel {