diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-03-23 07:45:42 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-03-23 07:45:42 +0000 |
| commit | e9b58f1af7d3f67b57757855422617125f348ebe (patch) | |
| tree | cc4d483fa7d82b62ad73f13c82e7e75117b0aa26 /src | |
| parent | f3f006c8e3c6fc067191292578d3a8c994115f60 (diff) | |
| parent | 23bae6714658ec17240a6964b2fb3f91c065e73e (diff) | |
Merge branch 'issue-452-unfollow-button' into 'develop'
#452 - unfollow button issue
Closes #452
See merge request pleroma/pleroma-fe!698
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/follow_card/follow_card.vue | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/components/follow_card/follow_card.vue b/src/components/follow_card/follow_card.vue index 9bd21cfd..9f314fd3 100644 --- a/src/components/follow_card/follow_card.vue +++ b/src/components/follow_card/follow_card.vue @@ -4,12 +4,12 @@ <span class="faint" v-if="!noFollowsYou && user.follows_you"> {{ isMe ? $t('user_card.its_you') : $t('user_card.follows_you') }} </span> - <div class="btn-follow" v-if="showFollow && !loggedIn"> + <div class="follow-card-follow-button" v-if="showFollow && !loggedIn"> <RemoteFollow :user="user" /> </div> <button v-if="showFollow && loggedIn" - class="btn btn-default btn-follow" + class="btn btn-default follow-card-follow-button" @click="followUser" :disabled="inProgress" :title="requestSent ? $t('user_card.follow_again') : ''" @@ -24,7 +24,7 @@ {{ $t('user_card.follow') }} </template> </button> - <button v-if="following" class="btn btn-default pressed" @click="unfollowUser" :disabled="inProgress"> + <button v-if="following" class="btn btn-default follow-card-follow-button pressed" @click="unfollowUser" :disabled="inProgress"> <template v-if="inProgress"> {{ $t('user_card.follow_progress') }} </template> @@ -39,15 +39,17 @@ <script src="./follow_card.js"></script> <style lang="scss"> -.follow-card-content-container { - flex-shrink: 0; - display: flex; - flex-direction: row; - justify-content: space-between; - flex-wrap: wrap; - line-height: 1.5em; +.follow-card { + &-content-container { + flex-shrink: 0; + display: flex; + flex-direction: row; + justify-content: space-between; + flex-wrap: wrap; + line-height: 1.5em; + } - .btn-follow { + &-follow-button { margin-top: 0.5em; margin-left: auto; width: 10em; |
