Merge branch 'master' into 'Aufinal/merge_k-fet'

# Conflicts:
#   kfet/static/kfet/css/index.css
This commit is contained in:
Aurélien Delobelle 2017-03-24 20:23:32 +01:00
commit cb13280458
11 changed files with 83 additions and 53 deletions

View file

@ -23,6 +23,7 @@
{{ trigramme_form.trigramme }}
</div>
<div id="trigramme_valid"></div>
<p class="help-block">Les mots contenant des caractères non alphanumériques seront ignorés</p>
<input type="text" name="q" id="search_autocomplete" spellcheck="false" placeholder="Chercher un utilisateur par nom, prénom ou identifiant clipper" class="form-control">
<div style="position:relative;">
<div id="search_results"></div>