From 668087a29e9b50e6c74dae0037ea18999eb03ea6 Mon Sep 17 00:00:00 2001
From: eal <eal@waifu.club>
Date: Sun, 25 Nov 2018 19:00:24 +0200
Subject: Switch to timeline on nav panel actions

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/App.vue')

diff --git a/src/App.vue b/src/App.vue
index 059460f9..37bcdcac 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -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>
-- 
cgit v1.2.3-70-g09d2


From 2d48292683f335f77b884229cb5fe36ed2267d5b Mon Sep 17 00:00:00 2001
From: eal <eal@waifu.club>
Date: Sun, 25 Nov 2018 19:18:16 +0200
Subject: Switch to settings when touching settings

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/App.vue')

diff --git a/src/App.vue b/src/App.vue
index 37bcdcac..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>
-- 
cgit v1.2.3-70-g09d2

