diff options
| author | Maxim Filippov <colixer@gmail.com> | 2018-12-17 02:39:37 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2018-12-17 02:39:37 +0300 |
| commit | 2211c533ddf7a05723afb2e2a8664b9b49c9648d (patch) | |
| tree | d5bcfbdb55536db01bc0bfda38991db8f159a3e9 /src/App.vue | |
| parent | 5fc0fe28e45882da0fab635e839a2977104d2f46 (diff) | |
| parent | ada4bd0d9874d98213cf79ccd9f7cddda36d1b6c (diff) | |
Merge branch 'develop' into feature/new-user-routes
Diffstat (limited to 'src/App.vue')
| -rw-r--r-- | src/App.vue | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/App.vue b/src/App.vue index 9d66b9d4..a3a7ecf6 100644 --- a/src/App.vue +++ b/src/App.vue @@ -7,10 +7,13 @@ </div> <div class='inner-nav'> <div class='item'> - <router-link :to="{ name: 'root'}">{{sitename}}</router-link> + <router-link class="back-button" @click.native="activatePanel('timeline')" :to="{ name: 'root' }" active-class="hidden"> + <i class="icon-left-open" :title="$t('nav.back')"></i> + </router-link> + <router-link class="site-name" :to="{ name: 'root' }" active-class="home">{{sitename}}</router-link> </div> <div class='item right'> - <user-finder class="nav-icon"></user-finder> + <user-finder class="nav-icon" @toggled="onFinderToggled"></user-finder> <router-link @click.native="activatePanel('timeline')" :to="{ name: 'settings'}"><i class="icon-cog nav-icon" :title="$t('nav.preferences')"></i></router-link> <a href="#" v-if="currentUser" @click.prevent="logout"><i class="icon-logout nav-icon" :title="$t('login.logout')"></i></a> </div> @@ -30,7 +33,7 @@ <instance-specific-panel v-if="showInstanceSpecificPanel"></instance-specific-panel> <features-panel v-if="!currentUser"></features-panel> <who-to-follow-panel v-if="currentUser && suggestionsEnabled"></who-to-follow-panel> - <notifications v-if="currentUser"></notifications> + <notifications :activatePanel="activatePanel" v-if="currentUser"></notifications> </div> </div> </div> |