From d2349b04f3b0c8826ac490d5b8f9ad616f1d1af7 Mon Sep 17 00:00:00 2001
From: Karl Hasselbring <Karl Hasselbring>
Date: Mon, 23 Oct 2017 10:28:04 +0200
Subject: [PATCH] Fixed: Footer sind jetzt einheitlich korrekt und per Flexbox
---
public/css/styleResultPage.css | 4 ---
resources/assets/less/metager/footer.less | 19 ++++++++++++++
resources/assets/less/metager/metager.less | 3 ++-
.../assets/less/metager/result-page.less | 23 +++++++++++++---
.../assets/less/metager/static-pages.less | 16 ------------
resources/views/layouts/resultPage.blade.php | 12 ++++-----
resources/views/layouts/staticPages.blade.php | 26 +++++++++----------
resources/views/metager3.blade.php | 8 +++---
8 files changed, 60 insertions(+), 51 deletions(-)
create mode 100644 resources/assets/less/metager/footer.less
diff --git a/public/css/styleResultPage.css b/public/css/styleResultPage.css
index 04c9555bd..4ff2e273e 100644
--- a/public/css/styleResultPage.css
+++ b/public/css/styleResultPage.css
@@ -506,10 +506,6 @@ footer a {
width: 30px;
}
-.pager {
- text-align: center;
-}
-
#searchplugin {
display: none;
position: fixed;
diff --git a/resources/assets/less/metager/footer.less b/resources/assets/less/metager/footer.less
new file mode 100644
index 000000000..508afadc8
--- /dev/null
+++ b/resources/assets/less/metager/footer.less
@@ -0,0 +1,19 @@
+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
diff --git a/resources/assets/less/metager/metager.less b/resources/assets/less/metager/metager.less
index abbaa9eb0..671b3ecf0 100644
--- a/resources/assets/less/metager/metager.less
+++ b/resources/assets/less/metager/metager.less
@@ -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
diff --git a/resources/assets/less/metager/result-page.less b/resources/assets/less/metager/result-page.less
index 0294eb690..6fa5bd1f6 100644
--- a/resources/assets/less/metager/result-page.less
+++ b/resources/assets/less/metager/result-page.less
@@ -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;
}
diff --git a/resources/assets/less/metager/static-pages.less b/resources/assets/less/metager/static-pages.less
index 030d3608c..d4811c429 100644
--- a/resources/assets/less/metager/static-pages.less
+++ b/resources/assets/less/metager/static-pages.less
@@ -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;
diff --git a/resources/views/layouts/resultPage.blade.php b/resources/views/layouts/resultPage.blade.php
index 46f670f5b..5af0d8879 100644
--- a/resources/views/layouts/resultPage.blade.php
+++ b/resources/views/layouts/resultPage.blade.php
@@ -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" />
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php
index b63624a60..e6db19bb0 100644
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -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>
diff --git a/resources/views/metager3.blade.php b/resources/views/metager3.blade.php
index 8c4522ffd..e71840925 100644
--- a/resources/views/metager3.blade.php
+++ b/resources/views/metager3.blade.php
@@ -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() )
--
GitLab