diff options
| author | Henry <spam@hjkos.com> | 2018-12-05 07:34:27 +0000 |
|---|---|---|
| committer | Henry <spam@hjkos.com> | 2018-12-05 07:34:27 +0000 |
| commit | 914386270796fa2ec460b828710ee31ef870ea69 (patch) | |
| tree | ad2ebf199a5bbe2cf5b3c8c04bdd320f5670b067 /src/components/user_card_content/user_card_content.vue | |
| parent | 9591d179f48b90b072e70b4fc475ae1691b96313 (diff) | |
| parent | 5eced8bf09ddd169ba174ece4b790d916cea32d9 (diff) | |
Merge branch 'fix/user-settings-switch' into 'develop'
Switch to "timeline" when pressing user-settings
See merge request pleroma/pleroma-fe!397
Diffstat (limited to 'src/components/user_card_content/user_card_content.vue')
| -rw-r--r-- | src/components/user_card_content/user_card_content.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue index d2fd7591..4b8a730f 100644 --- a/src/components/user_card_content/user_card_content.vue +++ b/src/components/user_card_content/user_card_content.vue @@ -2,7 +2,7 @@ <div id="heading" class="profile-panel-background" :style="headingStyle"> <div class="panel-heading text-center"> <div class='user-info'> - <router-link to='/user-settings' style="float: right; margin-top:16px;" v-if="!isOtherUser"> + <router-link @click.native="activatePanel('timeline')" to='/user-settings' style="float: right; margin-top:16px;" v-if="!isOtherUser"> <i class="icon-cog usersettings" :title="$t('tool_tip.user_settings')"></i> </router-link> <a :href="user.statusnet_profile_url" target="_blank" class="floater" v-if="isOtherUser"> |