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
This commit is contained in:
parent
bd88a481c6
commit
de945e5f88
@ -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 () {
|
||||
|
@ -4,11 +4,7 @@
|
||||
{{$t('nav.friend_requests')}}
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<List :items="requests">
|
||||
<template slot="item" slot-scope="{item}">
|
||||
<FollowRequestCard :user="item" />
|
||||
</template>
|
||||
</List>
|
||||
<FollowRequestCard v-for="request in requests" :key="request.id" :user="request" class="list-item"/>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
@ -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'
|
||||
|
@ -13,11 +13,7 @@
|
||||
<i class="icon-spin3 animate-spin"/>
|
||||
</div>
|
||||
<div v-else class="panel-body">
|
||||
<List :items="users">
|
||||
<template slot="item" slot-scope="{item}">
|
||||
<FollowCard :user="item" />
|
||||
</template>
|
||||
</List>
|
||||
<FollowCard v-for="user in users" :key="user.id" :user="user" class="list-item"/>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
@ -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 {
|
||||
|
@ -4,11 +4,7 @@
|
||||
{{$t('who_to_follow.who_to_follow')}}
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<List :items="users">
|
||||
<template slot="item" slot-scope="{item}">
|
||||
<FollowCard :user="item" />
|
||||
</template>
|
||||
</List>
|
||||
<FollowCard v-for="user in users" :key="user.id" :user="user" class="list-item"/>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
Loading…
Reference in New Issue
Block a user