diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-08-22 22:29:13 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-08-22 22:29:13 +0000 |
| commit | 272b748f26d0bb7b9f3a00336a908d507f4169bc (patch) | |
| tree | e0d102a21b4a62aab390617b2b217341cb969e3d /src/App.vue | |
| parent | a403f93b478eec67d779400b1fcfdc006bb787da (diff) | |
| parent | 88a3cf8705f925c31b5fad67d0fb709a51447156 (diff) | |
Merge branch 'develop' into 'allow-opening-profile-in-user-popover'
# Conflicts:
# src/components/settings_modal/tabs/general_tab.vue
Diffstat (limited to 'src/App.vue')
| -rw-r--r-- | src/App.vue | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/App.vue b/src/App.vue index 0efadaf0..1f96efe8 100644 --- a/src/App.vue +++ b/src/App.vue @@ -8,7 +8,10 @@ class="app-bg-wrapper" /> <MobileNav v-if="layoutType === 'mobile'" /> - <DesktopNav v-else /> + <DesktopNav + v-else + :class="navClasses" + /> <Notifications v-if="currentUser" /> <div id="content" @@ -65,6 +68,7 @@ <UserReportingModal /> <PostStatusModal /> <SettingsModal /> + <UpdateNotification /> <div id="modal" /> <GlobalNoticeList /> <div id="popovers" /> |