sjw
/
pleroma-fe
mirror of https://git.pleroma.social/sjw/pleroma-fe.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'dev_vald_fe/tooltip' into 'develop' 

Added user setting tooltip

Closes #156

See merge request pleroma/pleroma-fe!395
This commit is contained in:
Henry 2018-12-04 10:06:36 +00:00
parent 480f617c09 ea4fafb27e
commit 29ced0c08b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/user_card_content/user_card_content.vue
View File

@ -3,7 +3,7 @@
<div class="panel-heading text-center"> <div class="panel-heading text-center">
<div class='user-info'> <div class='user-info'>
<router-link to='/user-settings' style="float: right; margin-top:16px;" v-if="!isOtherUser"> <router-link to='/user-settings' style="float: right; margin-top:16px;" v-if="!isOtherUser">
<i class="icon-cog usersettings"></i> <i class="icon-cog usersettings" :title="$t('tool_tip.user_settings')"></i>
</router-link> </router-link>
<a :href="user.statusnet_profile_url" target="_blank" class="floater" v-if="isOtherUser"> <a :href="user.statusnet_profile_url" target="_blank" class="floater" v-if="isOtherUser">
<i class="icon-link-ext usersettings"></i> <i class="icon-link-ext usersettings"></i>

3
src/i18n/en.json
View File

@ -214,6 +214,7 @@
"media_upload": "Upload Media", "media_upload": "Upload Media",
"repeat": "Repeat", "repeat": "Repeat",
"reply": "Reply", "reply": "Reply",
"favorite": "Favorite" "favorite": "Favorite",
"user_settings": "User Settings"
} }
} }