-
+
{{ user.name }}
-
-
- @{{user.screen_name}}
-
-
+
+ @{{user.screen_name}}
+
@@ -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
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 @@
-
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') : ''"
>
-
+
{{ $t('user_card.follow_progress') }}
@@ -18,8 +18,8 @@
{{ $t('user_card.follow') }}
-
-
-
-
-
- {{ user.name }}
-
-
-
- @{{user.screen_name}}
-
-
-
-
-
-
-
+
+
+ {{ user.name }}
-
-
+
+
+ @{{user.screen_name}}
+
+
@@ -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;
- }
- }
}
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 @@
-
+
{{ $t('user_card.unblock_progress') }}
@@ -17,8 +17,18 @@
{{ $t('user_card.block') }}
-
+
-
\ No newline at end of file
+
+
+
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 @@
-
-
+
+
{{ isMe ? $t('user_card.its_you') : $t('user_card.follows_you') }}
-
-
-
+
+
+
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 @@
-
-
- {{ $t('user_card.approve') }}
- {{ $t('user_card.deny') }}
-
-
+
+ {{ $t('user_card.approve') }}
+ {{ $t('user_card.deny') }}
+