Skip to content
Snippets Groups Projects
Commit 205157f2 authored by Julian Rother's avatar Julian Rother
Browse files

Simplified base template

parent a0694556
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 9 additions and 24 deletions
templates/base.html
+ 9
− 24
View file @ 205157f2
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
<div class="col-xs-1 hidden-xs hidden-sm"> <div class="col-xs-1 hidden-xs hidden-sm">
<a href="/"><img src="/static/logo.png" style="width: 80px; padding: 5px"></a> <a href="/"><img src="/static/logo.png" style="width: 80px; padding: 5px"></a>
</div> </div>
<div class="col-md-11"> <div class="col-xs-12 col-md-11">
<div class="row" style=""> <div class="row">
<ul class="list-inline col-xs-12"> <ul class="list-inline col-xs-12">
<li> <li>
<a href="#">Vampir</a> <a href="#">Vampir</a>
...@@ -48,16 +48,7 @@ ...@@ -48,16 +48,7 @@
</ul> </ul>
</div> </div>
<div class="row"> <div class="row">
<div class="hidden-xs col-xs-9"> <div class="col-xs-12 col-sm-8">
<ul class="nav nav-pills">
{% for href, id, caption, gly in navigation_bar %}
<li{% if id == active_page %} class="active"{% endif %}>
<a href="{{ href|e }}">{% if gly != '' %}<span class="glyphicon glyphicon-{{ gly }}"></span> {% endif %}{{ caption }}</a>
</li>
{% endfor %}
</ul>
</div>
<div class="visible-xs col-xs-12">
<ul class="nav nav-pills"> <ul class="nav nav-pills">
{% for href, id, caption, gly in navigation_bar %} {% for href, id, caption, gly in navigation_bar %}
<li{% if id == active_page %} class="active"{% endif %}> <li{% if id == active_page %} class="active"{% endif %}>
...@@ -66,20 +57,14 @@ ...@@ -66,20 +57,14 @@
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
<div class="col-xs-12 col-sm-4">
<form action="search"> <form action="search">
<div class="hidden-xs col-xs-3 input-group"> <div class="input-group">
<input class="form-control" type="text" name="q" placeholder="Search" value="{{ searchtext }}"> <input class="form-control" type="text" name="q" placeholder="Search" value="{{ searchtext }}">
<span class="input-group-btn"><button class="btn btn-secondary" type="submit"><span class="glyphicon glyphicon-search"></span> </button></span> <span class="input-group-btn"><button class="btn btn-secondary" type="submit"><span class="glyphicon glyphicon-search"></span> </button></span>
</div> </div>
</form> </form>
</div> </div>
<div class="row visible-xs">
<form action="search">
<div class="col-xs-12 input-group">
<input class="form-control" type="text" name="q" placeholder="Search" value="{{ searchtext }}">
<span class="input-group-btn"><button class="btn btn-secondary" type="submit"><span class="glyphicon glyphicon-search"></span> </button></span>
</div>
</form>
</div> </div>
</div> </div>
</div> </div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment