diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-12-22 16:00:12 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-12-22 16:00:12 +0000 |
| commit | a39866308cd7c8cb0d30a04a5215d1fae8bf8d47 (patch) | |
| tree | 59230ab336bf3bd13f0d046c6f45842a7fbdd02c /src/components/account_actions/account_actions.vue | |
| parent | a7567ce6d01781b4b1ff47f805b4a9a5109e960b (diff) | |
| parent | 00cb8d9dcee9a403fedb2800a0cdc4b0f77a0429 (diff) | |
Merge branch 'rc/2.2.2' into 'master'
prepare master for 2.2.2
See merge request pleroma/pleroma-fe!1315
Diffstat (limited to 'src/components/account_actions/account_actions.vue')
| -rw-r--r-- | src/components/account_actions/account_actions.vue | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue index e3ae376e..ab5d1d29 100644 --- a/src/components/account_actions/account_actions.vue +++ b/src/components/account_actions/account_actions.vue @@ -4,6 +4,7 @@ trigger="click" placement="bottom" :bound-to="{ x: 'container' }" + remove-padding > <div slot="content" @@ -13,14 +14,14 @@ <template v-if="relationship.following"> <button v-if="relationship.showing_reblogs" - class="btn btn-default dropdown-item" + class="btn button-default dropdown-item" @click="hideRepeats" > {{ $t('user_card.hide_repeats') }} </button> <button v-if="!relationship.showing_reblogs" - class="btn btn-default dropdown-item" + class="btn button-default dropdown-item" @click="showRepeats" > {{ $t('user_card.show_repeats') }} @@ -32,27 +33,27 @@ </template> <button v-if="relationship.blocking" - class="btn btn-default btn-block dropdown-item" + class="btn button-default btn-block dropdown-item" @click="unblockUser" > {{ $t('user_card.unblock') }} </button> <button v-else - class="btn btn-default btn-block dropdown-item" + class="btn button-default btn-block dropdown-item" @click="blockUser" > {{ $t('user_card.block') }} </button> <button - class="btn btn-default btn-block dropdown-item" + class="btn button-default btn-block dropdown-item" @click="reportUser" > {{ $t('user_card.report') }} </button> <button v-if="pleromaChatMessagesAvailable" - class="btn btn-default btn-block dropdown-item" + class="btn button-default btn-block dropdown-item" @click="openChat" > {{ $t('user_card.message') }} @@ -61,7 +62,7 @@ </div> <div slot="trigger" - class="btn btn-default ellipsis-button" + class="ellipsis-button" > <FAIcon class="icon" |