From e33054636861da70e56bffad52e43a4f156e3646 Mon Sep 17 00:00:00 2001
From: Karl Hasselbring <Karl Hasselbring>
Date: Fri, 22 Jun 2018 11:12:45 +0200
Subject: [PATCH] =?UTF-8?q?Style=20f=C3=BCr=20Ausgabe=20ohne=20Header=20an?=
=?UTF-8?q?gepasst?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
resources/assets/less/metager/result-page.less | 10 ++++++++--
resources/assets/less/metager/searchbar.less | 3 +--
resources/views/layouts/researchandtabs.blade.php | 5 +++++
resources/views/layouts/resultPage.blade.php | 8 ++++++--
resources/views/resultpages/results.blade.php | 7 +------
5 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/resources/assets/less/metager/result-page.less b/resources/assets/less/metager/result-page.less
index 22d965405..de6313feb 100644
--- a/resources/assets/less/metager/result-page.less
+++ b/resources/assets/less/metager/result-page.less
@@ -378,7 +378,7 @@ a {
/**/
max-width: @results-width-max;
.alert {
- margin: @padding-small-default 0px;
+ margin-bottom: @padding-small-default;
}
}
#additions-container {
@@ -541,7 +541,6 @@ a {
footer.resultPageFooter {
max-width: 700px;
- margin-left: 50px;
margin-top: 20px;
@media (max-width: (2 * @results-margin-left + @results-width-max - 1px)) {
margin: 20px 0 0 0;
@@ -582,4 +581,11 @@ footer.resultPageFooter {
margin-left: 0px;
}
}
+}
+
+/* Style for resultpage container without any header content */
+
+#resultpage-container-noheader {
+ #resultpage-container;
+ grid-template-areas: "results";
}
\ No newline at end of file
diff --git a/resources/assets/less/metager/searchbar.less b/resources/assets/less/metager/searchbar.less
index e3a41ba77..477f62f17 100644
--- a/resources/assets/less/metager/searchbar.less
+++ b/resources/assets/less/metager/searchbar.less
@@ -143,10 +143,9 @@ header:nth-child(1) {
}
#research-bar-placeholder {
- padding: @resultpage-leftbox-min-dist-top-bottom 0px 0px 50px;
width: 100%;
max-width: 760px;
- height: 61px;
+ height: 51px;
}
.search-input {
diff --git a/resources/views/layouts/researchandtabs.blade.php b/resources/views/layouts/researchandtabs.blade.php
index 56fcf4e7f..f972da40f 100644
--- a/resources/views/layouts/researchandtabs.blade.php
+++ b/resources/views/layouts/researchandtabs.blade.php
@@ -28,7 +28,12 @@
</div>
</div>
<div id="results-container">
+ @include('parts.errors')
+ @include('parts.warnings')
@yield('results')
+ @if( $metager->showQuicktips() )
+ <div id="quicktips"></div>
+ @endif
</div>
<div id="additions-container">
<div id="search-settings">
diff --git a/resources/views/layouts/resultPage.blade.php b/resources/views/layouts/resultPage.blade.php
index 0ba342481..192d4a483 100644
--- a/resources/views/layouts/resultPage.blade.php
+++ b/resources/views/layouts/resultPage.blade.php
@@ -34,8 +34,12 @@
@include('modals.create-focus-modal')
@include('layouts.researchandtabs')
@else
- <div id="resultpage-container">
- @yield('results')
+ <div id="resultpage-container-noheader">
+ <div id="results-container">
+ @include('parts.errors')
+ @include('parts.warnings')
+ @yield('results')
+ </div>
</div>
@endif
@include('parts.footer', ['type' => 'resultpage', 'id' => 'resultPageFooter'])
diff --git a/resources/views/resultpages/results.blade.php b/resources/views/resultpages/results.blade.php
index 068624782..7e70ef92c 100644
--- a/resources/views/resultpages/results.blade.php
+++ b/resources/views/resultpages/results.blade.php
@@ -1,5 +1,3 @@
-@include('parts.errors')
-@include('parts.warnings')
<div id="results">
@if($mobile)
@include('layouts.ad', ['ad' => $metager->popAd()])
@@ -22,7 +20,4 @@
@include('layouts.result', ['result' => $result])
@endforeach
@include('parts.pager')
-</div>
-@if( $metager->showQuicktips() )
- <div id="quicktips"></div>
-@endif
\ No newline at end of file
+</div>
\ No newline at end of file
--
GitLab