diff options
| author | Roger Braun <roger@rogerbraun.net> | 2016-12-05 20:49:58 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2016-12-05 20:49:58 +0100 |
| commit | 026ab7c1dffa858d9dbdfada44b50097db1e0bd2 (patch) | |
| tree | 418d7cd37587fd41fb808bbcb28657043508ce84 /src/App.vue | |
| parent | 917917596fe7c9185590bf3c6cc267a0d6a89e5a (diff) | |
| parent | be5fe03972879add14ce2ca6b37524b32adbf1b8 (diff) | |
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop
Diffstat (limited to 'src/App.vue')
| -rw-r--r-- | src/App.vue | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/App.vue b/src/App.vue index e46419e0..2cd6d079 100644 --- a/src/App.vue +++ b/src/App.vue @@ -6,14 +6,16 @@ </div> </nav> <div class="container" id="content"> - <sidebar> + <div class="sidebar"> <user-panel></user-panel> <nav-panel></nav-panel> <notifications v-if="currentUser"></notifications> - </sidebar> - <transition name="fade"> - <router-view></router-view> - </transition> + </div> + <div class="main"> + <transition name="fade"> + <router-view></router-view> + </transition> + </div> </div> </div> </template> |