diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-04-01 19:57:31 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-04-01 19:57:31 +0000 |
| commit | ac28e8c2f981b6584f0103e10b0a5f5b025fcaae (patch) | |
| tree | a12eb0dff03ce7cbfcd6f5bd8027738662c9d973 /src/App.vue | |
| parent | a595febcb86cfeda927128b8a36756db6457e58d (diff) | |
| parent | 89c944853253463b3a0173425b35f939ac503676 (diff) | |
Merge branch 'feature/mobile-improvements-3' into 'develop'
Mobile notifications in nav bar, separate mobile navbar to its own component
See merge request pleroma/pleroma-fe!703
Diffstat (limited to 'src/App.vue')
| -rw-r--r-- | src/App.vue | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/App.vue b/src/App.vue index 4fff3d1d..3b8623ad 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,17 +1,14 @@ <template> <div id="app" v-bind:style="bgAppStyle"> <div class="app-bg-wrapper" v-bind:style="bgStyle"></div> - <nav class='nav-bar container' @click="scrollToTop()" id="nav"> + <MobileNav v-if="isMobileLayout" /> + <nav v-else class='nav-bar container' @click="scrollToTop()" id="nav"> <div class='logo' :style='logoBgStyle'> <div class='mask' :style='logoMaskStyle'></div> <img :src='logo' :style='logoStyle'> </div> <div class='inner-nav'> <div class='item'> - <a href="#" class="menu-button" @click.stop.prevent="toggleMobileSidebar()"> - <i class="button-icon icon-menu"></i> - <div class="alert-dot" v-if="unseenNotificationsCount"></div> - </a> <router-link class="site-name" :to="{ name: 'root' }" active-class="home">{{sitename}}</router-link> </div> <div class='item right'> @@ -22,8 +19,7 @@ </div> </nav> <div v-if="" class="container" id="content"> - <side-drawer ref="sideDrawer" :logout="logout"></side-drawer> - <div class="sidebar-flexer mobile-hidden"> + <div class="sidebar-flexer mobile-hidden" v-if="!isMobileLayout"> <div class="sidebar-bounds"> <div class="sidebar-scroller"> <div class="sidebar"> @@ -50,7 +46,6 @@ <media-modal></media-modal> </div> <chat-panel :floating="true" v-if="currentUser && chat" class="floating-chat mobile-hidden"></chat-panel> - <MobilePostStatusModal /> </div> </template> |