diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-01-17 20:55:53 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-01-17 20:55:53 +0100 |
| commit | c6f266302f4c75ff99e6dcda83019d1c3eaf73af (patch) | |
| tree | 203c4fb82acbcc202560644df9126789a9668eab /src/App.vue | |
| parent | 198eee82bedddf6028cf3fe731a45503039ec24d (diff) | |
| parent | c7a375068d3337144dde85fabf4b4d5a874d70a0 (diff) | |
Merge branch 'develop' into feature/hash-routed
Diffstat (limited to 'src/App.vue')
| -rw-r--r-- | src/App.vue | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/App.vue b/src/App.vue index 18a8ad15..5d5463fb 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,17 +1,24 @@ <template> <div id="app" v-bind:style="style" class="base02-background"> <nav class='container base01-background base04'> - <div class='item'> - <a route-to='friends-timeline' href="#">Pleroma FE</a> + <div class='inner-nav'> + <div class='item'> + <a route-to='friends-timeline' href="#">Pleroma FE</a> + </div> + <style-switcher></style-switcher> </div> </nav> <div class="container" id="content"> - <div class="sidebar"> + <div class="panel-switcher"> + <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> - <div class="main"> + <div class="main" :class="{ 'mobile-hidden': mobileActivePanel != 'timeline' }"> <transition name="fade"> <router-view></router-view> </transition> |