diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-11-30 19:49:09 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-11-30 19:49:09 +0000 |
| commit | 7d12a65b3b61c1a0018e1361e19f8ae285f67cd0 (patch) | |
| tree | a8612ab5d752d18a4077e8ab37d36c69e41cd78f /src/App.vue | |
| parent | 91272dc5558e1326dac872f927dc8da7f9109cd0 (diff) | |
| parent | 2d48292683f335f77b884229cb5fe36ed2267d5b (diff) | |
Merge branch 'fix/switch-to-timeline-on-mobile' into 'develop'
Switch to timeline view on mobile when clicking relevant actions
See merge request pleroma/pleroma-fe!383
Diffstat (limited to 'src/App.vue')
| -rw-r--r-- | src/App.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/App.vue b/src/App.vue index 059460f9..a7c2beda 100644 --- a/src/App.vue +++ b/src/App.vue @@ -11,7 +11,7 @@ </div> <div class='item right'> <user-finder class="nav-icon"></user-finder> - <router-link :to="{ name: 'settings'}"><i class="icon-cog nav-icon"></i></router-link> + <router-link @click.native="activatePanel('timeline')" :to="{ name: 'settings'}"><i class="icon-cog nav-icon"></i></router-link> <a href="#" v-if="currentUser" @click.prevent="logout"><i class="icon-logout nav-icon" :title="$t('login.logout')"></i></a> </div> </div> @@ -26,7 +26,7 @@ <div class="sidebar-scroller"> <div class="sidebar"> <user-panel></user-panel> - <nav-panel></nav-panel> + <nav-panel :activatePanel="activatePanel"></nav-panel> <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> |