diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-03-07 15:11:11 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-03-07 15:11:11 +0000 |
| commit | 7e9c8c3d219aa3b787c5606efbb54a73c1738b07 (patch) | |
| tree | 1847fa78707d800e28997bd8828327cf5c890838 /src/components/user_search/user_search.vue | |
| parent | 4800169f36e0a71c322b9707a797c3b1ad48bf58 (diff) | |
| parent | c44f0a9bde08c50598207494b121ae4bdf1f0fb1 (diff) | |
Merge branch 'develop' into 'master'
Update master
See merge request pleroma/pleroma-fe!646
Diffstat (limited to 'src/components/user_search/user_search.vue')
| -rw-r--r-- | src/components/user_search/user_search.vue | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/components/user_search/user_search.vue b/src/components/user_search/user_search.vue index 3c2bd3fb..1269eea6 100644 --- a/src/components/user_search/user_search.vue +++ b/src/components/user_search/user_search.vue @@ -4,13 +4,16 @@ {{$t('nav.user_search')}} </div> <div class="user-search-input-container"> - <input class="user-finder-input" @keyup.enter="newQuery(username)" v-model="username" :placeholder="$t('finder.find_user')"/> + <input class="user-finder-input" ref="userSearchInput" @keyup.enter="newQuery(username)" v-model="username" :placeholder="$t('finder.find_user')"/> <button class="btn search-button" @click="newQuery(username)"> <i class="icon-search"/> </button> </div> - <div class="panel-body"> - <user-card v-for="user in users" :key="user.id" :user="user" :showFollows="true"></user-card> + <div v-if="loading" class="text-center loading-icon"> + <i class="icon-spin3 animate-spin"/> + </div> + <div v-else class="panel-body"> + <FollowCard v-for="user in users" :key="user.id" :user="user"/> </div> </div> </template> @@ -27,4 +30,8 @@ margin-left: 0.5em; } } + +.loading-icon { + padding: 1em; +} </style> |