Merge branch '693-parameter-out-results-with-style' into 'development'

Resolve "Parameter out=results-with-style"

Closes #693

See merge request !1246

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

resources/assets/less/metager/searchbar.less

@@ -182,10 +182,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 {

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">

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'])

resources/views/resultpages/results.blade.php

-@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>
\ No newline at end of file
-	<div id="quicktips"></div>
-@endif
\ No newline at end of file