diff options
| author | Shpuld Shpuldson <shpuld@gmail.com> | 2017-04-21 19:15:54 +0300 |
|---|---|---|
| committer | Shpuld Shpuldson <shpuld@gmail.com> | 2017-04-21 19:15:54 +0300 |
| commit | c2db700544a3aae58b27c52eaf6cf3b47a2bcff4 (patch) | |
| tree | 4af4d286740c072250b791aebfcadc0a3bb526ff /src/App.vue | |
| parent | 36655002d062183a577f5b8fd66628d56670ec1f (diff) | |
| parent | 1f8d30386388f8b91aa84fdbd7861e588aa0d935 (diff) | |
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/hash-routed
Diffstat (limited to 'src/App.vue')
| -rw-r--r-- | src/App.vue | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/App.vue b/src/App.vue index c4b3cb13..fcfdae97 100644 --- a/src/App.vue +++ b/src/App.vue @@ -15,10 +15,14 @@ <button @click="activatePanel('sidebar')">Sidebar</button> <button @click="activatePanel('timeline')">Timeline</button> </div> - <div class="sidebar" :class="{ 'mobile-hidden': mobileActivePanel != 'sidebar' }"> - <user-panel></user-panel> - <nav-panel></nav-panel> - <notifications v-if="currentUser"></notifications> + <div class="sidebar-flexer" :class="{ 'mobile-hidden': mobileActivePanel != 'sidebar'}"> + <div class="sidebar" :class="{ 'mobile-hidden': mobileActivePanel != 'sidebar' }"> + <div class="sidebar-container"> + <user-panel></user-panel> + <nav-panel></nav-panel> + <notifications v-if="currentUser"></notifications> + </div> + </div> </div> <div class="main" :class="{ 'mobile-hidden': mobileActivePanel != 'timeline' }"> <transition name="fade"> |