From 6a319154d94c51f0464e0de31c6f88fbe20defea Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 5 Apr 2022 19:22:15 +0300 Subject: [PATCH] teleport bread --- src/App.js | 4 +- src/App.scss | 10 +- src/App.vue | 9 +- src/components/mobile_nav/mobile_nav.js | 3 +- src/components/mobile_nav/mobile_nav.vue | 5 +- src/components/notifications/notifications.js | 15 ++- .../notifications/notifications.vue | 120 +++++++++--------- 7 files changed, 90 insertions(+), 76 deletions(-) diff --git a/src/App.js b/src/App.js index b2ec95d4..827692a6 100644 --- a/src/App.js +++ b/src/App.js @@ -1,6 +1,5 @@ import UserPanel from './components/user_panel/user_panel.vue' import NavPanel from './components/nav_panel/nav_panel.vue' -import Notifications from './components/notifications/notifications.vue' import InstanceSpecificPanel from './components/instance_specific_panel/instance_specific_panel.vue' import FeaturesPanel from './components/features_panel/features_panel.vue' import WhoToFollowPanel from './components/who_to_follow_panel/who_to_follow_panel.vue' @@ -16,13 +15,14 @@ import PostStatusModal from './components/post_status_modal/post_status_modal.vu import GlobalNoticeList from './components/global_notice_list/global_notice_list.vue' import { windowWidth, windowHeight } from './services/window_utils/window_utils' import { mapGetters } from 'vuex' +import { defineAsyncComponent } from 'vue' export default { name: 'app', components: { UserPanel, NavPanel, - Notifications, + Notifications: defineAsyncComponent(() => import('./components/notifications/notifications.vue')), InstanceSpecificPanel, FeaturesPanel, WhoToFollowPanel, diff --git a/src/App.scss b/src/App.scss index e32a2d36..1867a54d 100644 --- a/src/App.scss +++ b/src/App.scss @@ -64,10 +64,10 @@ nav { #sidebar { grid-area: sidebar; +} - @media all and (max-width: 800px) { - display: none; - } +#notifs-column { + grid-area: notifs; } #main-scroller { @@ -177,6 +177,10 @@ nav { .underlay { display: none; } + + #sidebar { + display: none; + } } } diff --git a/src/App.vue b/src/App.vue index f87d895b..70084538 100644 --- a/src/App.vue +++ b/src/App.vue @@ -9,23 +9,21 @@ /> +
- +
= scrollHeight) { diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue index 09680910..6c810bba 100644 --- a/src/components/mobile_nav/mobile_nav.vue +++ b/src/components/mobile_nav/mobile_nav.vue @@ -69,12 +69,9 @@
-
-
-
-
-
- {{ $t('notifications.notifications') }} - {{ unseenCount }} -
- - -
-
+ +
+
-
- -
-
- +
+
+
+ +
+
+
-
+