diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-12-02 12:08:12 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-12-02 12:08:12 +0000 |
| commit | 0c6737f33612f6808f687b896cc6e73ba635f0d2 (patch) | |
| tree | 913dbf52796c9b4f1d72613670332c66fa5997dd /src/components/account_actions/account_actions.vue | |
| parent | 41d2fa2fd66ca33b0c83f65d608ee37f8ffcb152 (diff) | |
| parent | 7ebf3602d5d9a8630ffbe239bfe4431655046821 (diff) | |
Merge branch '712' into 'develop'
Move mention button right next to mute button
Closes #712
See merge request pleroma/pleroma-fe!1015
Diffstat (limited to 'src/components/account_actions/account_actions.vue')
| -rw-r--r-- | src/components/account_actions/account_actions.vue | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue index 046cba93..d3235be1 100644 --- a/src/components/account_actions/account_actions.vue +++ b/src/components/account_actions/account_actions.vue @@ -9,17 +9,7 @@ > <div slot="popover"> <div class="dropdown-menu"> - <button - class="btn btn-default btn-block dropdown-item" - @click="mentionUser" - > - {{ $t('user_card.mention') }} - </button> <template v-if="user.following"> - <div - role="separator" - class="dropdown-divider" - /> <button v-if="user.showing_reblogs" class="btn btn-default dropdown-item" @@ -34,11 +24,11 @@ > {{ $t('user_card.show_repeats') }} </button> + <div + role="separator" + class="dropdown-divider" + /> </template> - <div - role="separator" - class="dropdown-divider" - /> <button v-if="user.statusnet_blocking" class="btn btn-default btn-block dropdown-item" |