Merge branch 'master' into develop

# Conflicts: # cps/web.py
2017-02-22 22:45:19 +00:00
parent ff0e0be2cd a7cd993caa
commit 82d01c9001
21 changed files with 1383 additions and 984 deletions
@@ -65,7 +65,7 @@
        <div class="navbar-collapse collapse">
          {% if g.user.is_authenticated or g.user.is_anonymous() %}
          <ul class="nav navbar-nav ">
-            <li><a href="{{url_for('advanced_search')}}"><span class="glyphicon glyphicon-search"></span> {{_('Advanced Search')}}</a></li>
+            <li><a href="{{url_for('advanced_search')}}"><span class="glyphicon glyphicon-search"></span><span class="hidden-sm"> {{_('Advanced Search')}}</span></a></li>
          </ul>
          {% endif %}
          <ul class="nav navbar-nav navbar-right" id="main-nav">