Merge branch 'master' of git.fsmpi.rwth-aachen.de:julianundandyfrickelnkram/videoagwebsite

templates/base.html

@@ -27,8 +27,8 @@
 					<div class="col-xs-1 hidden-xs hidden-sm">
 						<a href="/"><img src="/static/logo.png" style="width: 80px; padding: 5px"></a>
 					</div>
-					<div class="col-md-11">
-						<div class="row" style="">
+					<div class="col-xs-12 col-md-11">
+						<div class="row">
 							<ul class="list-inline col-xs-12">
 								<li>
 									<a href="#">Vampir</a>
@@ -48,16 +48,7 @@
 							</ul>
 						</div>
 						<div class="row">
-							<div class="hidden-xs col-xs-9">
-								<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">
+							<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 %}>
@@ -66,20 +57,14 @@
 									 {% endfor %}
 								</ul>
 							</div>
+							<div class="col-xs-12 col-sm-4">
 								<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 }}">
 										<span class="input-group-btn"><button class="btn btn-secondary" type="submit"><span class="glyphicon glyphicon-search"></span> </button></span>
 									</div>
 								</form>
 							</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>