Commit 8d9c3b07 authored by Phil Höfer's avatar Phil Höfer
Browse files

navbar ist jetzt ein Bootstrap-Container

parent d7f2c389
......@@ -7224,16 +7224,15 @@ body > div {
.img:hover .hostlabel {
display: block;
}
.row {
margin: 10px 15px;
margin-top: 0;
}
.tab-pane.active {
-moz-box-shadow: 5px 5px 10px 0px rgba(0, 0, 0, 0.55);
padding: 10px 0;
padding-top: 0;
}
/* Hier der Style für unsere Suchleiste */
.navbar-resultpage {
margin-bottom: 0px;
}
.tab-pane .alert {
margin: 10px 0;
padding: 5px 15px;
......@@ -7286,10 +7285,7 @@ nav .input-group {
padding-left: 15px;
padding-right: 15px;
}
#research nav ul li + li {
width: 80%;
}
#research {
.navbar-resultpage {
background-color: white;
position: fixed;
top: 0;
......
This diff is collapsed.
......@@ -17,11 +17,6 @@
display: block;
}
.row {
margin: 10px 15px;
margin-top: 0;
}
.tab-pane.active {
-moz-box-shadow: 5px 5px 10px 0px rgba(0, 0, 0, 0.55);
padding: 10px 0;
......@@ -31,6 +26,10 @@
/* Hier der Style für unsere Suchleiste */
.navbar-resultpage {
margin-bottom: 0px;
}
.tab-pane .alert {
margin: 10px 0;
padding: 5px 15px;
......@@ -99,11 +98,7 @@ nav .input-group {
padding-right: 15px;
}
#research nav ul li + li {
width: 80%;
}
#research {
.navbar-resultpage {
background-color: white;
position: fixed;
top: 0;
......
......@@ -10,14 +10,13 @@
@endif
<div class="content-wrapper">
<header id="research">
<nav class="navbar navbar-default">
<ul class="list-inline">
<li class="pull-left">
<div class="logo">
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><h1>M<span class="hidden-xs">eta</span>G<span class="hidden-xs">er</span></h1></a>
</div>
</li>
<li class="pull-right">
<nav class="navbar navbar-default navbar-resultpage">
<div class="container-fluid">
<div class="row">
<div class="col-xs-3 logo">
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><h1>M<span class="hidden-xs">eta</span>G<span class="hidden-xs">er</span></h1></a>
</div>
<div class="col-xs-9">
<form method="{{ Request::method() }}" accept-charset="UTF-8" class="form" id="submitForm">
<div class="input-group">
<input autocomplete="off" class="form-control" form="submitForm" id="eingabeTop" name="eingabe" placeholder="Suchbegriffe erweitern/verändern, oder völlig neue Suche:" tabindex="1" type="text" value="{{ $eingabe }}" required />
......@@ -34,8 +33,9 @@
@endforeach
</form>
</li>
</div>
</ul>
</div>
</nav>
<ul class="nav nav-tabs" id="foki" role="tablist">
@if( $metager->getFokus() === "web" )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment