diff options
| author | Henry Jameson <me@hjkos.com> | 2018-12-14 17:10:26 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2018-12-14 17:10:26 +0300 |
| commit | bd745543b6fa7ede1d08a85379101d5e409b0eab (patch) | |
| tree | f1f981f14b9af677b4927ace6c9efc648524b9b7 /src/components/user_finder/user_finder.vue | |
| parent | 7a13c530c76586a56309bfd2347374ece345ad08 (diff) | |
| parent | 5b6c1aa97c0d13101ebddb4c34b79a2e428ec30b (diff) | |
Merge remote-tracking branch 'upstream/develop' into search-mobile-fixes
* upstream/develop: (176 commits)
fix chrome
Prevent html-minifier to remove placeholder comment in index.html template
Add placeholder to insert server generated metatags. Related to #430
added condition to check for logined user
fix gradients and minor artifacts
keep track of new instance options
fix old MR
oof
get rid of slots
fix timeago font
added hide_network option, fixed properties naming
Fix fetching new users, add storing local users in usersObjects with their screen_name as well as id, so that they could be fetched zero-state with screen-name link.
improve notification subscription
Fix typo that prevented scope copy from working.
Refactor arrays to individual options
Reset enableFollowsExport to true after 2 sec when an export file is available to download
added check for activatePanel is function or not
addressed PR comments
activate panel on user screen click
added not preload check so hidden toggles asap
...
Diffstat (limited to 'src/components/user_finder/user_finder.vue')
| -rw-r--r-- | src/components/user_finder/user_finder.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/user_finder/user_finder.vue b/src/components/user_finder/user_finder.vue index e0a7962a..9efdfab7 100644 --- a/src/components/user_finder/user_finder.vue +++ b/src/components/user_finder/user_finder.vue @@ -1,5 +1,5 @@ <template> - <span class="user-finder-container"> + <div class="user-finder-container"> <i class="icon-spin4 user-finder-icon animate-spin-slow" v-if="loading" /> <a href="#" v-if="hidden" :title="$t('finder.find_user')"><i class="icon-user-plus user-finder-icon" @click.prevent.stop="toggleHidden" /></a> <template v-else> @@ -9,7 +9,7 @@ </button> <i class="icon-cancel user-finder-icon" @click.prevent.stop="toggleHidden"/> </template> - </span> + </div> </template> <script src="./user_finder.js"></script> |