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

Seite nutzt jetzt das Bootstrap-Grid

parent c5c7b231
......@@ -7259,10 +7259,6 @@ body > div {
list-style-type: none;
padding-left: 49px;
}
.navbar-resultpage div {
padding: 0px;
margin: 0px;
}
.navbar-resultpage .input-group {
margin: 0px 5px;
}
......@@ -7312,13 +7308,6 @@ nav .input-group {
}
.navbar-resultpage {
background-color: white;
position: fixed;
top: 0;
width: 100%;
z-index: 500;
width: 80%;
left: 50%;
margin-left: -40%;
}
.logo h1 {
font-family: Liberation Sans, sans-serif;
......@@ -7338,8 +7327,6 @@ nav .input-group {
color: black;
}
.content-wrapper {
width: 80%;
margin: 0 auto;
padding-top: 52px;
/* padding: 10px; */
background-color: white;
......
This diff is collapsed.
......@@ -46,8 +46,8 @@ border-radius: 0;
}
.navbar-resultpage div {
padding: 0px;
margin: 0px;
// padding: 0px;
// margin: 0px;
}
.navbar-resultpage .input-group {
margin: 0px 5px;
......@@ -112,14 +112,6 @@ nav .input-group {
.navbar-resultpage {
background-color: white;
position: fixed;
top: 0;
width: 100%;
//height: 60px;
z-index: 500;
width: 80%;
left: 50%;
margin-left: -40%;
}
.logo h1 {
......@@ -143,8 +135,8 @@ nav .input-group {
}
.content-wrapper {
width: 80%;
margin: 0 auto;
//width: 80%;
//margin: 0 auto;
padding-top: 52px;
/* padding: 10px; */
background-color: white;
......
......@@ -8,10 +8,10 @@
</div>
</div>
@endif
<div class="content-wrapper">
<header id="research">
<nav class="navbar navbar-default navbar-resultpage">
<div class="container-fluid">
<div class="content-wrapper container">
<header id="research" class="row">
<nav class="navbar navbar-default navbar-fixed-top navbar-resultpage">
<div class="container">
<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>
......@@ -128,7 +128,7 @@
@endif
</ul>
</header>
<div class="tab-content container-fluid">
<main class="tab-content row">
@if( $metager->getFokus() === "web" )
<div role="tabpanel" class="tab-pane active" id="web">
......@@ -213,5 +213,15 @@
</div>
</div>
@endif
</div>
</main>
<footer>
<div class="row">
<div class="col-xs-6">
<a class="btn btn-default" href="/">{!! trans('resultPage.startseite') !!}</a>
</div>
<div class="col-xs-6">
<a class="btn btn-default" href="/impressum/">{!! trans('resultPage.impressum') !!}</a>
</div>
</div>
</footer>
</div>
......@@ -21,17 +21,18 @@
<div class="tab-content container-fluid">
@yield('results')
</div>
@endif
<footer>
<div class="row">
<div class="col-xs-6">
<a class="btn btn-default" href="/">{!! trans('resultPage.startseite') !!}</a>
</div>
<div class="col-xs-6">
<a class="btn btn-default" href="/impressum/">{!! trans('resultPage.impressum') !!}</a>
<footer>
<div class="row">
<div class="col-xs-6">
<a class="btn btn-default" href="/">{!! trans('resultPage.startseite') !!}</a>
</div>
<div class="col-xs-6">
<a class="btn btn-default" href="/impressum/">{!! trans('resultPage.impressum') !!}</a>
</div>
</div>
</div>
</footer>
</footer>
@endif
<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
<script type="text/javascript" src="/js/all.js"></script>
</body>
......
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