diff options
| author | lambadalambda <gitgud@rogerbraun.net> | 2017-06-04 04:19:51 -0400 |
|---|---|---|
| committer | lambadalambda <gitgud@rogerbraun.net> | 2017-06-04 04:19:51 -0400 |
| commit | a4493f05d319e31d677dcf9cf0835d945e37e998 (patch) | |
| tree | f6ffc62c1af089fbc1a5b7074eb82c88a8a8c1eb /src/App.vue | |
| parent | c0b08d508c34fba9925e8e60c44ce3f818878e2b (diff) | |
| parent | d82fa5516b764e2307b042c60f581d1eecb146c2 (diff) | |
Merge branch 'feature/toggleable-user-finder-navbar' into 'develop'
Feature/toggleable user finder navbar
See merge request !87
Diffstat (limited to 'src/App.vue')
| -rw-r--r-- | src/App.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/App.vue b/src/App.vue index d0c6671e..b2d8df8b 100644 --- a/src/App.vue +++ b/src/App.vue @@ -6,6 +6,7 @@ <router-link :to="{ name: 'root'}">{{sitename}}</router-link> </div> <div class='item right'> + <user-finder></user-finder> <router-link :to="{ name: 'settings'}"><i class="icon-cog"></i></router-link> </div> </div> @@ -19,7 +20,6 @@ <div class="sidebar" :class="{ 'mobile-hidden': mobileActivePanel != 'sidebar' }"> <div class="sidebar-container"> <user-panel></user-panel> - <user-finder></user-finder> <nav-panel></nav-panel> <notifications v-if="currentUser"></notifications> </div> |