Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
This commit is contained in:
commit
feb7090cde
13 changed files with 481 additions and 98 deletions
|
@ -12,14 +12,16 @@ import {
|
|||
faBell,
|
||||
faRss,
|
||||
faSearchPlus,
|
||||
faExternalLinkAlt
|
||||
faExternalLinkAlt,
|
||||
faEdit
|
||||
} from '@fortawesome/free-solid-svg-icons'
|
||||
|
||||
library.add(
|
||||
faRss,
|
||||
faBell,
|
||||
faSearchPlus,
|
||||
faExternalLinkAlt
|
||||
faExternalLinkAlt,
|
||||
faEdit
|
||||
)
|
||||
|
||||
export default {
|
||||
|
@ -164,6 +166,9 @@ export default {
|
|||
this.$store.state.instance.restrictedNicknames
|
||||
)
|
||||
},
|
||||
openProfileTab () {
|
||||
this.$store.dispatch('openSettingsModalTab', 'profile')
|
||||
},
|
||||
zoomAvatar () {
|
||||
const attachment = {
|
||||
url: this.user.profile_image_url_original,
|
||||
|
|
|
@ -53,6 +53,18 @@
|
|||
>
|
||||
{{ user.name }}
|
||||
</div>
|
||||
<button
|
||||
v-if="!isOtherUser && user.is_local"
|
||||
class="button-unstyled edit-profile-button"
|
||||
@click.stop="openProfileTab"
|
||||
>
|
||||
<FAIcon
|
||||
fixed-width
|
||||
class="icon"
|
||||
icon="edit"
|
||||
:title="$t('user_card.edit_profile')"
|
||||
/>
|
||||
</button>
|
||||
<button
|
||||
v-if="isOtherUser && !user.is_local"
|
||||
:href="user.statusnet_profile_url"
|
||||
|
@ -442,7 +454,7 @@
|
|||
}
|
||||
}
|
||||
|
||||
.external-link-button {
|
||||
.external-link-button, .edit-profile-button {
|
||||
cursor: pointer;
|
||||
width: 2.5em;
|
||||
text-align: center;
|
||||
|
@ -594,6 +606,10 @@
|
|||
}
|
||||
}
|
||||
|
||||
.sidebar .edit-profile-button {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.user-counts {
|
||||
display: flex;
|
||||
line-height:16px;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue