From dfcdf4f32cf1779ecd85271dabc2919cdc51783a Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Thu, 21 Mar 2019 13:19:10 -0400
Subject: [PATCH 1/2] #452 - unfollow button issue
---
src/components/follow_card/follow_card.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/follow_card/follow_card.vue b/src/components/follow_card/follow_card.vue
index 9bd21cfd..72a1de62 100644
--- a/src/components/follow_card/follow_card.vue
+++ b/src/components/follow_card/follow_card.vue
@@ -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 btn-follow pressed" @click="unfollowUser" :disabled="inProgress">
<template v-if="inProgress">
{{ $t('user_card.follow_progress') }}
</template>
From 23bae6714658ec17240a6964b2fb3f91c065e73e Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Thu, 21 Mar 2019 15:03:54 -0400
Subject: [PATCH 2/2] #452 - update button class name
---
src/components/follow_card/follow_card.vue | 24 ++++++++++++----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/components/follow_card/follow_card.vue b/src/components/follow_card/follow_card.vue
index 72a1de62..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 btn-follow 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;