Commit 81f49831 authored by Karl Hasselbring's avatar Karl Hasselbring
Browse files

Fixed: Footer sind jetzt einheitlich korrekt und per Flexbox

parent 6d2e4bef
......@@ -506,10 +506,6 @@ footer a {
width: 30px;
}
.pager {
text-align: center;
}
#searchplugin {
display: none;
position: fixed;
......
footer {
margin: 30px 0px;
bottom: 0;
width: 100%;
display: flex;
justify-content: space-around;
white-space: pre-line;
align-items: flex-end;
div {
text-align: center;
margin-left: 10px;
&:first-child {
margin-left: 0px;
}
}
img {
max-width: 100%;
}
}
\ No newline at end of file
......@@ -5,4 +5,5 @@
@import "./start-page.less";
@import "./settings.less";
@import "./variables.less";
@import "./sidebar.less";
\ No newline at end of file
@import "./sidebar.less";
@import "./footer.less";
\ No newline at end of file
......@@ -39,7 +39,7 @@ body {
}
.footer-resultpage {
text-align: center;
justify-content: center;
a {
color: @footer-a-color;
}
......@@ -573,8 +573,23 @@ a {
}
}
.pager {
text-align: center;
.mg-pager {
display: flex;
justify-content: center;
&>div {
border: #aaa solid 1px;
border-radius: 10px;
padding: 5px;
margin-left: 10px;
&:first-child {
margin-left: 0px;
}
}
}
.disabled, .disabled * {
color: #aaa !important;
cursor: not-allowed !important;
}
#searchplugin {
......@@ -667,7 +682,7 @@ a {
.resultContainer {
margin: 0px;
padding: 0px;
padding: 20px 0px;
@media(max-width: @screen-xs-max) {
padding-right: 0px;
}
......
......@@ -53,22 +53,6 @@ body {
}
}
footer {
margin: 30px 0px;
bottom: 0;
width: 100%;
ul.list-inline {
width: 100%;
}
li {
width: 33%;
text-align: center;
}
img {
max-width: 100%;
}
}
.wrapper {
display: flex;
flex-direction: column;
......
......@@ -34,13 +34,11 @@
</strong>
</div>
<footer class="footer-resultpage">
<div class="row">
<div @if(LaravelLocalization::getCurrentLocale() === "de") class="col-xs-4"@else class="col-xs-6"@endif>
<a class="btn btn-default" href="/">{!! trans('resultPage.startseite') !!}</a>
</div>
<div @if(LaravelLocalization::getCurrentLocale() === "de") class="col-xs-4"@else class="col-xs-6"@endif>
<a class="btn btn-default" href="/impressum/">{!! trans('resultPage.impressum') !!}</a>
</div>
<div>
<a class="btn btn-default" href="/">{!! trans('resultPage.startseite') !!}</a>
</div>
<div>
<a class="btn btn-default" href="/impressum/">{!! trans('resultPage.impressum') !!}</a>
</div>
</footer>
<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
......
......@@ -52,20 +52,18 @@
</main>
@yield('optionalContent')
<footer class="footer-static-pages noprint">
<ul class="list-inline hidden-xs">
<li>
<a href="https://www.suma-ev.de/" >
<img src="/img/suma_ev_logo-m1-greyscale.png" alt="SUMA-EV Logo"></a>
</li>
<li id="info">
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "kontakt") }}">{{ trans('staticPages.nav5') }}</a> - <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "impressum") }}">{{ trans('staticPages.nav8') }}</a>
{{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/">{{ trans('staticPages.sumaev.2') }}</a>
</li>
<li>
<a href="https://www.uni-hannover.de/" >
<img src="/img/luh_metager.png" alt="LUH Logo"></a>
</li>
</ul>
<div>
<a href="https://www.suma-ev.de/" >
<img src="/img/suma_ev_logo-m1-greyscale.png" alt="SUMA-EV Logo"></a>
</div>
<div id="info">
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "kontakt") }}">{{ trans('staticPages.nav5') }}</a> - <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "impressum") }}">{{ trans('staticPages.nav8') }}</a>
{{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/">{{ trans('staticPages.sumaev.2') }}</a>
</div>
<div>
<a href="https://www.uni-hannover.de/" >
<img src="/img/luh_metager.png" alt="LUH Logo"></a>
</div>
</footer>
<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
</div>
......
......@@ -47,11 +47,9 @@
@endif
@include('layouts.result', ['result' => $result])
@endforeach
<nav aria-label="...">
<ul class="pager">
<li @if($metager->getPage() === 1) class="disabled" @endif><a href="@if($metager->getPage() === 1) # @else javascript:history.back() @endif">{{ trans('results.zurueck') }}</a></li>
<li @if($metager->nextSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->nextSearchLink() }}">{{ trans('results.weiter') }}</a></li>
</ul>
<nav class="mg-pager" aria-label="...">
<div @if($metager->getPage() === 1) class="disabled" @endif><a href="@if($metager->getPage() === 1) # @else javascript:history.back() @endif">{{ trans('results.zurueck') }}</a></div>
<div @if($metager->nextSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->nextSearchLink() }}">{{ trans('results.weiter') }}</a></div>
</nav>
</div>
@if( $metager->showQuicktips() )
......
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