From 4a737cbe4507e0d0a042871725a310eb4307a766 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 13 Feb 2019 07:14:23 -0500
Subject: Add reusable BasicUserCard and UserList components

---
 src/components/basic_user_card/basic_user_card.vue | 94 ++++++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 src/components/basic_user_card/basic_user_card.vue

(limited to 'src/components/basic_user_card/basic_user_card.vue')

diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
new file mode 100644
index 00000000..37f810ed
--- /dev/null
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -0,0 +1,94 @@
+<template>
+  <div class="card">
+    <router-link :to="userProfileLink(user)">
+      <UserAvatar class="avatar" :compact="true" @click.prevent.native="toggleUserExpanded" :src="user.profile_image_url"/>
+    </router-link>
+    <div class="usercard" v-if="userExpanded">
+      <user-card-content :user="user" :switcher="false"></user-card-content>
+    </div>
+    <div class="name-and-screen-name" v-else>
+      <div :title="user.name" class="user-name">
+        <span v-if="user.name_html" v-html="user.name_html"></span>
+        <span v-else>{{ user.name }}</span>
+      </div>
+      <div class="user-link-action">
+        <router-link class='user-screen-name' :to="userProfileLink(user)">
+          @{{user.screen_name}}
+        </router-link>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script src="./basic_user_card.js"></script>
+
+<style lang="scss">
+@import '../../_variables.scss';
+
+.name-and-screen-name {
+  margin-left: 0.7em;
+  margin-top:0.0em;
+  text-align: left;
+  width: 100%;
+  .user-name {
+    display: flex;
+    justify-content: space-between;
+
+    img {
+      object-fit: contain;
+      height: 16px;
+      width: 16px;
+      vertical-align: middle;
+    }
+  }
+  
+  .user-link-action {
+    display: flex;
+    align-items: flex-start;
+    justify-content: space-between;
+
+    button {
+      margin-top: 3px;
+    }
+  }
+}
+
+.card {
+  display: flex;
+  flex: 1 0;
+  padding-top: 0.6em;
+  padding-right: 1em;
+  padding-bottom: 0.6em;
+  padding-left: 1em;
+  border-bottom: 1px solid;
+  margin: 0;
+  border-bottom-color: $fallback--border;
+	border-bottom-color: var(--border, $fallback--border);
+
+  .avatar {
+    padding: 0;
+  }
+}
+
+.usercard {
+  width: fill-available;
+  margin: 0.2em 0 0 0.7em;
+  border-radius: $fallback--panelRadius;
+  border-radius: var(--panelRadius, $fallback--panelRadius);
+  border-style: solid;
+  border-color: $fallback--border;
+  border-color: var(--border, $fallback--border);
+  border-width: 1px;
+  overflow: hidden;
+
+  .panel-heading {
+    background: transparent;
+    flex-direction: column;
+    align-items: stretch;
+  }
+
+  p {
+    margin-bottom: 0;
+  }
+}
+</style>
-- 
cgit v1.2.3-70-g09d2


From 5d6e1864a5602505dedf519ef5f8e64cf19ee158 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 13 Feb 2019 14:31:02 -0500
Subject: Update BasicUserCard template and add a slot for customization

---
 src/components/basic_user_card/basic_user_card.vue | 115 ++++++++++-----------
 1 file changed, 57 insertions(+), 58 deletions(-)

(limited to 'src/components/basic_user_card/basic_user_card.vue')

diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
index 37f810ed..7cbf647c 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -1,20 +1,25 @@
 <template>
-  <div class="card">
+  <div class="user-card">
     <router-link :to="userProfileLink(user)">
       <UserAvatar class="avatar" :compact="true" @click.prevent.native="toggleUserExpanded" :src="user.profile_image_url"/>
     </router-link>
-    <div class="usercard" v-if="userExpanded">
+    <div class="user-card-expanded-content" v-if="userExpanded">
       <user-card-content :user="user" :switcher="false"></user-card-content>
     </div>
-    <div class="name-and-screen-name" v-else>
-      <div :title="user.name" class="user-name">
-        <span v-if="user.name_html" v-html="user.name_html"></span>
-        <span v-else>{{ user.name }}</span>
+    <div class="user-card-collapsed-content" v-else>
+      <div class="user-card-primary-area">
+        <div :title="user.name" class="user-name">
+          <span v-if="user.name_html" v-html="user.name_html"></span>
+          <span v-else>{{ user.name }}</span>
+        </div>
+        <div>
+          <router-link class='user-screen-name' :to="userProfileLink(user)">
+            @{{user.screen_name}}
+          </router-link>
+        </div>
       </div>
-      <div class="user-link-action">
-        <router-link class='user-screen-name' :to="userProfileLink(user)">
-          @{{user.screen_name}}
-        </router-link>
+      <div class="user-card-secondary-area">
+        <slot name="secondary-area"></slot>
       </div>
     </div>
   </div>
@@ -25,35 +30,7 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.name-and-screen-name {
-  margin-left: 0.7em;
-  margin-top:0.0em;
-  text-align: left;
-  width: 100%;
-  .user-name {
-    display: flex;
-    justify-content: space-between;
-
-    img {
-      object-fit: contain;
-      height: 16px;
-      width: 16px;
-      vertical-align: middle;
-    }
-  }
-  
-  .user-link-action {
-    display: flex;
-    align-items: flex-start;
-    justify-content: space-between;
-
-    button {
-      margin-top: 3px;
-    }
-  }
-}
-
-.card {
+.user-card {
   display: flex;
   flex: 1 0;
   padding-top: 0.6em;
@@ -65,30 +42,52 @@
   border-bottom-color: $fallback--border;
 	border-bottom-color: var(--border, $fallback--border);
 
-  .avatar {
-    padding: 0;
+  &-collapsed-content {
+    margin-left: 0.7em;
+    margin-top:0.0em;
+    text-align: left;
+    flex: 1;
+    display: flex;
+    align-items: flex-start;
+    justify-content: space-between;
   }
-}
 
-.usercard {
-  width: fill-available;
-  margin: 0.2em 0 0 0.7em;
-  border-radius: $fallback--panelRadius;
-  border-radius: var(--panelRadius, $fallback--panelRadius);
-  border-style: solid;
-  border-color: $fallback--border;
-  border-color: var(--border, $fallback--border);
-  border-width: 1px;
-  overflow: hidden;
+  &-primary-area {
+    flex: 1;
+    .user-name {
+      img {
+        object-fit: contain;
+        height: 16px;
+        width: 16px;
+        vertical-align: middle;
+      }
+    }
+  }
 
-  .panel-heading {
-    background: transparent;
-    flex-direction: column;
-    align-items: stretch;
+  &-secondary-area {
+    flex: none;
   }
 
-  p {
-    margin-bottom: 0;
+  &-expanded-content {
+    flex: 1;
+    margin: 0.2em 0 0 0.7em;
+    border-radius: $fallback--panelRadius;
+    border-radius: var(--panelRadius, $fallback--panelRadius);
+    border-style: solid;
+    border-color: $fallback--border;
+    border-color: var(--border, $fallback--border);
+    border-width: 1px;
+    overflow: hidden;
+
+    .panel-heading {
+      background: transparent;
+      flex-direction: column;
+      align-items: stretch;
+    }
+
+    p {
+      margin-bottom: 0;
+    }
   }
 }
 </style>
-- 
cgit v1.2.3-70-g09d2


From 46e1f3034788640c57953fbca0e5423dc771b9a9 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 20 Feb 2019 11:22:01 -0500
Subject: Fix indent

---
 src/components/basic_user_card/basic_user_card.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/components/basic_user_card/basic_user_card.vue')

diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
index 7cbf647c..e09b06ce 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -40,7 +40,7 @@
   border-bottom: 1px solid;
   margin: 0;
   border-bottom-color: $fallback--border;
-	border-bottom-color: var(--border, $fallback--border);
+  border-bottom-color: var(--border, $fallback--border);
 
   &-collapsed-content {
     margin-left: 0.7em;
-- 
cgit v1.2.3-70-g09d2


From 5bd36c6476a8a41a3678c7a32e3eb206d57e5c4a Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 20 Feb 2019 11:28:05 -0500
Subject: Remove needless css

---
 src/components/basic_user_card/basic_user_card.vue | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/components/basic_user_card/basic_user_card.vue')

diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
index e09b06ce..4ede15e9 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -44,7 +44,6 @@
 
   &-collapsed-content {
     margin-left: 0.7em;
-    margin-top:0.0em;
     text-align: left;
     flex: 1;
     display: flex;
-- 
cgit v1.2.3-70-g09d2


From 784523b8ec7cb40def78dd6bb3682813f8052ee5 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Mon, 25 Feb 2019 22:49:50 -0500
Subject: Use big avatar in BasicUserCard

---
 src/components/basic_user_card/basic_user_card.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/components/basic_user_card/basic_user_card.vue')

diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
index 4ede15e9..bd7a325e 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="user-card">
     <router-link :to="userProfileLink(user)">
-      <UserAvatar class="avatar" :compact="true" @click.prevent.native="toggleUserExpanded" :src="user.profile_image_url"/>
+      <UserAvatar class="avatar" @click.prevent.native="toggleUserExpanded" :src="user.profile_image_url"/>
     </router-link>
     <div class="user-card-expanded-content" v-if="userExpanded">
       <user-card-content :user="user" :switcher="false"></user-card-content>
-- 
cgit v1.2.3-70-g09d2


From 1337e42b2d728297525e682451602877620c4f80 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Mon, 25 Feb 2019 22:50:34 -0500
Subject: Add third slot area to BasicUserCard

---
 src/components/basic_user_card/basic_user_card.vue | 34 +++++++++++++++-------
 1 file changed, 23 insertions(+), 11 deletions(-)

(limited to 'src/components/basic_user_card/basic_user_card.vue')

diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
index bd7a325e..e10a3749 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -7,19 +7,24 @@
       <user-card-content :user="user" :switcher="false"></user-card-content>
     </div>
     <div class="user-card-collapsed-content" v-else>
-      <div class="user-card-primary-area">
-        <div :title="user.name" class="user-name">
-          <span v-if="user.name_html" v-html="user.name_html"></span>
-          <span v-else>{{ user.name }}</span>
+      <div class="user-card-primary-secondary-wrapper">
+        <div class="user-card-primary-area">
+          <div :title="user.name" class="user-name">
+            <span v-if="user.name_html" v-html="user.name_html"></span>
+            <span v-else>{{ user.name }}</span>
+          </div>
+          <div>
+            <router-link class='user-screen-name' :to="userProfileLink(user)">
+              @{{user.screen_name}}
+            </router-link>
+          </div>
         </div>
-        <div>
-          <router-link class='user-screen-name' :to="userProfileLink(user)">
-            @{{user.screen_name}}
-          </router-link>
+        <div class="user-card-secondary-area">
+          <slot name="secondary-area"></slot>
         </div>
       </div>
-      <div class="user-card-secondary-area">
-        <slot name="secondary-area"></slot>
+      <div class="user-card-third-area">
+        <slot name="third-area"></slot>
       </div>
     </div>
   </div>
@@ -46,6 +51,9 @@
     margin-left: 0.7em;
     text-align: left;
     flex: 1;
+  }
+
+  &-primary-secondary-wrapper {
     display: flex;
     align-items: flex-start;
     justify-content: space-between;
@@ -67,9 +75,13 @@
     flex: none;
   }
 
+  &-third-area {
+    margin-top: .2em;
+  }
+
   &-expanded-content {
     flex: 1;
-    margin: 0.2em 0 0 0.7em;
+    margin-left: 0.7em;
     border-radius: $fallback--panelRadius;
     border-radius: var(--panelRadius, $fallback--panelRadius);
     border-style: solid;
-- 
cgit v1.2.3-70-g09d2


From 4b0a11acef6acbe3a1205568bffb077fab043b2a Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Mon, 25 Feb 2019 22:59:49 -0500
Subject: Improve action button size and position in BasicUserCard

---
 src/components/basic_user_card/basic_user_card.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/components/basic_user_card/basic_user_card.vue')

diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
index e10a3749..020f82c1 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -73,10 +73,11 @@
 
   &-secondary-area {
     flex: none;
-  }
 
-  &-third-area {
-    margin-top: .2em;
+    .btn {
+      margin-top: .5em;
+      width: 10em;
+    }
   }
 
   &-expanded-content {
-- 
cgit v1.2.3-70-g09d2


From 30f5bf1463cf7f850df5a50253eb69c1c48db371 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Tue, 26 Feb 2019 06:57:29 -0500
Subject: Remove legacy class names in BasicUserCard

---
 src/components/basic_user_card/basic_user_card.vue | 25 +++++++++++-----------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'src/components/basic_user_card/basic_user_card.vue')

diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
index 020f82c1..cb73d54d 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -9,15 +9,13 @@
     <div class="user-card-collapsed-content" v-else>
       <div class="user-card-primary-secondary-wrapper">
         <div class="user-card-primary-area">
-          <div :title="user.name" class="user-name">
+          <div :title="user.name" class="user-card-user-name">
             <span v-if="user.name_html" v-html="user.name_html"></span>
             <span v-else>{{ user.name }}</span>
           </div>
-          <div>
-            <router-link class='user-screen-name' :to="userProfileLink(user)">
-              @{{user.screen_name}}
-            </router-link>
-          </div>
+          <router-link :to="userProfileLink(user)">
+            @{{user.screen_name}}
+          </router-link>
         </div>
         <div class="user-card-secondary-area">
           <slot name="secondary-area"></slot>
@@ -61,13 +59,14 @@
 
   &-primary-area {
     flex: 1;
-    .user-name {
-      img {
-        object-fit: contain;
-        height: 16px;
-        width: 16px;
-        vertical-align: middle;
-      }
+  }
+
+  &-user-name {
+    img {
+      object-fit: contain;
+      height: 16px;
+      width: 16px;
+      vertical-align: middle;
     }
   }
 
-- 
cgit v1.2.3-70-g09d2


From 1fecac9ba6350216bb02ef156aa1573b546cee7f Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Tue, 26 Feb 2019 10:14:12 -0500
Subject: Update naming

---
 src/components/basic_user_card/basic_user_card.vue         |  4 ++--
 src/components/follow_card/follow_card.js                  | 10 +++++-----
 src/components/follow_card/follow_card.vue                 | 10 +++++-----
 src/components/follow_request_card/follow_request_card.vue |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/components/basic_user_card/basic_user_card.vue')

diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
index cb73d54d..af4ffc08 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -21,8 +21,8 @@
           <slot name="secondary-area"></slot>
         </div>
       </div>
-      <div class="user-card-third-area">
-        <slot name="third-area"></slot>
+      <div class="user-card-tertiary-area">
+        <slot name="tertiary-area"></slot>
       </div>
     </div>
   </div>
diff --git a/src/components/follow_card/follow_card.js b/src/components/follow_card/follow_card.js
index 85e6a6d2..425c9c3e 100644
--- a/src/components/follow_card/follow_card.js
+++ b/src/components/follow_card/follow_card.js
@@ -8,7 +8,7 @@ const FollowCard = {
   ],
   data () {
     return {
-      progress: false,
+      inProgress: false,
       requestSent: false,
       updated: false
     }
@@ -25,17 +25,17 @@ const FollowCard = {
   },
   methods: {
     followUser () {
-      this.progress = true
+      this.inProgress = true
       requestFollow(this.user, this.$store).then(({ sent, updated }) => {
-        this.progress = false
+        this.inProgress = false
         this.requestSent = sent
         this.updated = updated
       })
     },
     unfollowUser () {
-      this.progress = true
+      this.inProgress = true
       requestUnfollow(this.user, this.$store).then(({ updated }) => {
-        this.progress = false
+        this.inProgress = false
         this.updated = updated
       })
     }
diff --git a/src/components/follow_card/follow_card.vue b/src/components/follow_card/follow_card.vue
index 936307c4..e6933e3c 100644
--- a/src/components/follow_card/follow_card.vue
+++ b/src/components/follow_card/follow_card.vue
@@ -5,10 +5,10 @@
         v-if="showFollow"
         class="btn btn-default"
         @click="followUser"
-        :disabled="progress"
+        :disabled="inProgress"
         :title="requestSent ? $t('user_card.follow_again') : ''"
       >
-        <template v-if="progress">
+        <template v-if="inProgress">
           {{ $t('user_card.follow_progress') }}
         </template>
         <template v-else-if="requestSent">
@@ -18,8 +18,8 @@
           {{ $t('user_card.follow') }}
         </template>
       </button>
-      <button v-if="following" class="btn btn-default pressed" @click="unfollowUser" :disabled="progress">
-        <template v-if="progress">
+      <button v-if="following" class="btn btn-default pressed" @click="unfollowUser" :disabled="inProgress">
+        <template v-if="inProgress">
           {{ $t('user_card.follow_progress') }}
         </template>
         <template v-else>
@@ -27,7 +27,7 @@
         </template>
       </button>
     </template>
-    <template slot="third-area">
+    <template slot="tertiary-area">
       <span class="faint" v-if="!noFollowsYou && user.follows_you">
         {{ isMe ? $t('user_card.its_you') : $t('user_card.follows_you') }}
       </span>
diff --git a/src/components/follow_request_card/follow_request_card.vue b/src/components/follow_request_card/follow_request_card.vue
index 945812fc..4e2f3bf8 100644
--- a/src/components/follow_request_card/follow_request_card.vue
+++ b/src/components/follow_request_card/follow_request_card.vue
@@ -1,6 +1,6 @@
 <template>
   <basic-user-card :user="user">
-    <template slot="third-area">
+    <template slot="tertiary-area">
       <div class="follow-request-card-action-buttons-container">
         <button class="btn btn-default" @click="approveUser">{{ $t('user_card.approve') }}</button>
         <button class="btn btn-default" @click="denyUser">{{ $t('user_card.deny') }}</button>
-- 
cgit v1.2.3-70-g09d2


From c5519fa587925d7c6aabde1375d859ea0865dad8 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Tue, 26 Feb 2019 11:00:25 -0500
Subject: Improve mobile layout of user card

---
 src/components/basic_user_card/basic_user_card.vue | 22 +++++++++++++++++++---
 src/components/follow_card/follow_card.vue         | 10 +++++-----
 .../follow_request_card/follow_request_card.vue    |  4 ++++
 3 files changed, 28 insertions(+), 8 deletions(-)

(limited to 'src/components/basic_user_card/basic_user_card.vue')

diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
index af4ffc08..0563360a 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -13,9 +13,12 @@
             <span v-if="user.name_html" v-html="user.name_html"></span>
             <span v-else>{{ user.name }}</span>
           </div>
-          <router-link :to="userProfileLink(user)">
-            @{{user.screen_name}}
-          </router-link>
+          <div>
+            <router-link :to="userProfileLink(user)">
+              @{{user.screen_name}}
+            </router-link>
+          </div>
+          <slot name="primary-area"></slot>
         </div>
         <div class="user-card-secondary-area">
           <slot name="secondary-area"></slot>
@@ -49,6 +52,7 @@
     margin-left: 0.7em;
     text-align: left;
     flex: 1;
+    min-width: 0;
   }
 
   &-primary-secondary-wrapper {
@@ -59,6 +63,8 @@
 
   &-primary-area {
     flex: 1;
+    margin-right: 1em;
+    min-width: 0;
   }
 
   &-user-name {
@@ -100,5 +106,15 @@
       margin-bottom: 0;
     }
   }
+
+  @media (min-width: 320px) and (max-width: 480px) {
+    &-primary-secondary-wrapper {
+      flex-direction: column;
+    }
+
+    &-primary-area {
+      margin-right: 0;
+    }
+  }
 }
 </style>
diff --git a/src/components/follow_card/follow_card.vue b/src/components/follow_card/follow_card.vue
index e6933e3c..8e6dd2fb 100644
--- a/src/components/follow_card/follow_card.vue
+++ b/src/components/follow_card/follow_card.vue
@@ -1,5 +1,10 @@
 <template>
   <basic-user-card :user="user">
+    <template slot="primary-area">
+      <span class="faint" v-if="!noFollowsYou && user.follows_you">
+        {{ isMe ? $t('user_card.its_you') : $t('user_card.follows_you') }}
+      </span>
+    </template>
     <template slot="secondary-area">
       <button
         v-if="showFollow"
@@ -27,11 +32,6 @@
         </template>
       </button>
     </template>
-    <template slot="tertiary-area">
-      <span class="faint" v-if="!noFollowsYou && user.follows_you">
-        {{ isMe ? $t('user_card.its_you') : $t('user_card.follows_you') }}
-      </span>
-    </template>
   </basic-user-card>
 </template>
 
diff --git a/src/components/follow_request_card/follow_request_card.vue b/src/components/follow_request_card/follow_request_card.vue
index 4e2f3bf8..522db35f 100644
--- a/src/components/follow_request_card/follow_request_card.vue
+++ b/src/components/follow_request_card/follow_request_card.vue
@@ -22,6 +22,10 @@
     flex: 1 1;
     max-width: 12em;
     min-width: 8em;
+
+    &:last-child {
+      margin-right: 0;
+    }
   }
 }
 </style>
-- 
cgit v1.2.3-70-g09d2


From d5f8e2b1ee5ea34c312a3bb1587aa9a427d23a31 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Tue, 26 Feb 2019 16:08:02 -0500
Subject: Minor mobile layout improvement for BasicUserCard

---
 src/components/basic_user_card/basic_user_card.vue | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/components/basic_user_card/basic_user_card.vue')

diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
index 0563360a..1c8def75 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -110,11 +110,16 @@
   @media (min-width: 320px) and (max-width: 480px) {
     &-primary-secondary-wrapper {
       flex-direction: column;
+      align-items: stretch;
     }
 
     &-primary-area {
       margin-right: 0;
     }
+
+    &-secondary-area {
+      align-self: flex-end;
+    }
   }
 }
 </style>
-- 
cgit v1.2.3-70-g09d2


From 6e41b4b546a7ddddefbbae4c4bd8358df7768c1e Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Tue, 26 Feb 2019 16:09:56 -0500
Subject: Revert "Minor mobile layout improvement for BasicUserCard"

This reverts commit 1cd964bffff3ae4d324d0ab99e5c218eae7cd0ca.
---
 src/components/basic_user_card/basic_user_card.vue | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src/components/basic_user_card/basic_user_card.vue')

diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
index 1c8def75..0563360a 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -110,16 +110,11 @@
   @media (min-width: 320px) and (max-width: 480px) {
     &-primary-secondary-wrapper {
       flex-direction: column;
-      align-items: stretch;
     }
 
     &-primary-area {
       margin-right: 0;
     }
-
-    &-secondary-area {
-      align-self: flex-end;
-    }
   }
 }
 </style>
-- 
cgit v1.2.3-70-g09d2


From 0e86681aba522f8c530a030b0e3c9745ec415eed Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 27 Feb 2019 11:58:29 -0500
Subject: Merge all slots of BasicUserCard into one

---
 src/components/basic_user_card/basic_user_card.vue | 58 +++-------------------
 src/components/block_card/block_card.vue           | 16 ++++--
 src/components/follow_card/follow_card.vue         | 25 ++++++++--
 .../follow_request_card/follow_request_card.vue    | 12 ++---
 4 files changed, 46 insertions(+), 65 deletions(-)

(limited to 'src/components/basic_user_card/basic_user_card.vue')

diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
index 0563360a..ff3d0d09 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -7,26 +7,16 @@
       <user-card-content :user="user" :switcher="false"></user-card-content>
     </div>
     <div class="user-card-collapsed-content" v-else>
-      <div class="user-card-primary-secondary-wrapper">
-        <div class="user-card-primary-area">
-          <div :title="user.name" class="user-card-user-name">
-            <span v-if="user.name_html" v-html="user.name_html"></span>
-            <span v-else>{{ user.name }}</span>
-          </div>
-          <div>
-            <router-link :to="userProfileLink(user)">
-              @{{user.screen_name}}
-            </router-link>
-          </div>
-          <slot name="primary-area"></slot>
-        </div>
-        <div class="user-card-secondary-area">
-          <slot name="secondary-area"></slot>
-        </div>
+      <div :title="user.name" class="user-card-user-name">
+        <span v-if="user.name_html" v-html="user.name_html"></span>
+        <span v-else>{{ user.name }}</span>
       </div>
-      <div class="user-card-tertiary-area">
-        <slot name="tertiary-area"></slot>
+      <div>
+        <router-link :to="userProfileLink(user)">
+          @{{user.screen_name}}
+        </router-link>
       </div>
+      <slot></slot>
     </div>
   </div>
 </template>
@@ -52,19 +42,6 @@
     margin-left: 0.7em;
     text-align: left;
     flex: 1;
-    min-width: 0;
-  }
-
-  &-primary-secondary-wrapper {
-    display: flex;
-    align-items: flex-start;
-    justify-content: space-between;
-  }
-
-  &-primary-area {
-    flex: 1;
-    margin-right: 1em;
-    min-width: 0;
   }
 
   &-user-name {
@@ -76,15 +53,6 @@
     }
   }
 
-  &-secondary-area {
-    flex: none;
-
-    .btn {
-      margin-top: .5em;
-      width: 10em;
-    }
-  }
-
   &-expanded-content {
     flex: 1;
     margin-left: 0.7em;
@@ -106,15 +74,5 @@
       margin-bottom: 0;
     }
   }
-
-  @media (min-width: 320px) and (max-width: 480px) {
-    &-primary-secondary-wrapper {
-      flex-direction: column;
-    }
-
-    &-primary-area {
-      margin-right: 0;
-    }
-  }
 }
 </style>
diff --git a/src/components/block_card/block_card.vue b/src/components/block_card/block_card.vue
index ed7fe30b..8eb56e25 100644
--- a/src/components/block_card/block_card.vue
+++ b/src/components/block_card/block_card.vue
@@ -1,6 +1,6 @@
 <template>
   <basic-user-card :user="user">
-    <template slot="secondary-area">
+    <div class="block-card-content-container">
       <button class="btn btn-default" @click="unblockUser" :disabled="progress" v-if="blocked">
         <template v-if="progress">
           {{ $t('user_card.unblock_progress') }}
@@ -17,8 +17,18 @@
           {{ $t('user_card.block') }}
         </template>
       </button>
-    </template>
+    </div>
   </basic-user-card>
 </template>
 
-<script src="./block_card.js"></script>
\ No newline at end of file
+<script src="./block_card.js"></script>
+
+<style lang="scss">
+.block-card-content-container {
+  margin-top: 0.5em;
+  text-align: right;
+  button {
+    width: 10em;
+  }
+}
+</style>
diff --git a/src/components/follow_card/follow_card.vue b/src/components/follow_card/follow_card.vue
index 8e6dd2fb..1ae728a6 100644
--- a/src/components/follow_card/follow_card.vue
+++ b/src/components/follow_card/follow_card.vue
@@ -1,11 +1,9 @@
 <template>
   <basic-user-card :user="user">
-    <template slot="primary-area">
-      <span class="faint" v-if="!noFollowsYou && user.follows_you">
+    <div class="follow-card-content-container">
+      <span class="faint">
         {{ isMe ? $t('user_card.its_you') : $t('user_card.follows_you') }}
       </span>
-    </template>
-    <template slot="secondary-area">
       <button
         v-if="showFollow"
         class="btn btn-default"
@@ -31,8 +29,25 @@
           {{ $t('user_card.follow_unfollow') }}
         </template>
       </button>
-    </template>
+    </div>
   </basic-user-card>
 </template>
 
 <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;
+
+  .btn {
+    margin-top: 0.5em;
+    margin-left: auto;
+    width: 10em;
+  }
+}
+</style>
diff --git a/src/components/follow_request_card/follow_request_card.vue b/src/components/follow_request_card/follow_request_card.vue
index 45d02b89..4a3bbba4 100644
--- a/src/components/follow_request_card/follow_request_card.vue
+++ b/src/components/follow_request_card/follow_request_card.vue
@@ -1,18 +1,16 @@
 <template>
   <basic-user-card :user="user">
-    <template slot="tertiary-area">
-      <div class="follow-request-card-btns-container">
-        <button class="btn btn-default" @click="approveUser">{{ $t('user_card.approve') }}</button>
-        <button class="btn btn-default" @click="denyUser">{{ $t('user_card.deny') }}</button>
-      </div>
-    </template>
+    <div class="follow-request-card-content-container">
+      <button class="btn btn-default" @click="approveUser">{{ $t('user_card.approve') }}</button>
+      <button class="btn btn-default" @click="denyUser">{{ $t('user_card.deny') }}</button>
+    </div>
   </basic-user-card>
 </template>
 
 <script src="./follow_request_card.js"></script>
 
 <style lang="scss">
-.follow-request-card-btns-container {
+.follow-request-card-content-container {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
-- 
cgit v1.2.3-70-g09d2


From a8d11b22e73b707ea5d442843592eabe053535b7 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 27 Feb 2019 14:04:19 -0500
Subject: Add a class to screen name

---
 src/components/basic_user_card/basic_user_card.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/components/basic_user_card/basic_user_card.vue')

diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
index ff3d0d09..0f294330 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -12,7 +12,7 @@
         <span v-else>{{ user.name }}</span>
       </div>
       <div>
-        <router-link :to="userProfileLink(user)">
+        <router-link class="user-card-screen-name" :to="userProfileLink(user)">
           @{{user.screen_name}}
         </router-link>
       </div>
-- 
cgit v1.2.3-70-g09d2


From 36460fd3849816af921efdc0b36a6f31f93976ea Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Thu, 28 Feb 2019 12:48:14 -0500
Subject: Fix layout overflow issue

---
 src/components/basic_user_card/basic_user_card.vue | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/components/basic_user_card/basic_user_card.vue')

diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
index 0f294330..77fb0aa0 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -42,6 +42,7 @@
     margin-left: 0.7em;
     text-align: left;
     flex: 1;
+    min-width: 0;
   }
 
   &-user-name {
-- 
cgit v1.2.3-70-g09d2

