From de945e5f88919fe27f4cb16735d6d91a26ec95c9 Mon Sep 17 00:00:00 2001 From: taehoon Date: Tue, 16 Apr 2019 23:29:11 -0400 Subject: [PATCH] Revert "recover border between basic-user-card using list component" This reverts commit 1d56d486f1f679e793e710969ad54cce5fdb1ebc. # Conflicts: # src/components/follow_requests/follow_requests.vue # src/components/user_search/user_search.vue # src/components/who_to_follow/who_to_follow.vue --- src/components/follow_requests/follow_requests.js | 4 +--- src/components/follow_requests/follow_requests.vue | 6 +----- src/components/user_search/user_search.js | 4 +--- src/components/user_search/user_search.vue | 6 +----- src/components/who_to_follow/who_to_follow.js | 4 +--- src/components/who_to_follow/who_to_follow.vue | 6 +----- 6 files changed, 6 insertions(+), 24 deletions(-) diff --git a/src/components/follow_requests/follow_requests.js b/src/components/follow_requests/follow_requests.js index 69c48d14..704a76c6 100644 --- a/src/components/follow_requests/follow_requests.js +++ b/src/components/follow_requests/follow_requests.js @@ -1,10 +1,8 @@ import FollowRequestCard from '../follow_request_card/follow_request_card.vue' -import List from '../list/list.vue' const FollowRequests = { components: { - FollowRequestCard, - List + FollowRequestCard }, computed: { requests () { diff --git a/src/components/follow_requests/follow_requests.vue b/src/components/follow_requests/follow_requests.vue index d5e45b9d..36901fb4 100644 --- a/src/components/follow_requests/follow_requests.vue +++ b/src/components/follow_requests/follow_requests.vue @@ -4,11 +4,7 @@ {{$t('nav.friend_requests')}}
- - - +
diff --git a/src/components/user_search/user_search.js b/src/components/user_search/user_search.js index f02d22ad..55040826 100644 --- a/src/components/user_search/user_search.js +++ b/src/components/user_search/user_search.js @@ -1,10 +1,8 @@ import FollowCard from '../follow_card/follow_card.vue' -import List from '../list/list.vue' import userSearchApi from '../../services/new_api/user_search.js' const userSearch = { components: { - FollowCard, - List + FollowCard }, props: [ 'query' diff --git a/src/components/user_search/user_search.vue b/src/components/user_search/user_search.vue index c0636e43..890b3c13 100644 --- a/src/components/user_search/user_search.vue +++ b/src/components/user_search/user_search.vue @@ -13,11 +13,7 @@
- - - +
diff --git a/src/components/who_to_follow/who_to_follow.js b/src/components/who_to_follow/who_to_follow.js index 9b100334..be0b8827 100644 --- a/src/components/who_to_follow/who_to_follow.js +++ b/src/components/who_to_follow/who_to_follow.js @@ -1,11 +1,9 @@ import apiService from '../../services/api/api.service.js' import FollowCard from '../follow_card/follow_card.vue' -import List from '../list/list.vue' const WhoToFollow = { components: { - FollowCard, - List + FollowCard }, data () { return { diff --git a/src/components/who_to_follow/who_to_follow.vue b/src/components/who_to_follow/who_to_follow.vue index 412a2fbe..8bc9a728 100644 --- a/src/components/who_to_follow/who_to_follow.vue +++ b/src/components/who_to_follow/who_to_follow.vue @@ -4,11 +4,7 @@ {{$t('who_to_follow.who_to_follow')}}
- - - +