Commit 72f523dc authored by Karl Hasselbring's avatar Karl Hasselbring
Browse files

Merge branch 'MetaGer-Redesign' of...

Merge branch 'MetaGer-Redesign' of https://gitlab.metager3.de/open-source/MetaGer into MetaGer-Redesign
parents d8d6b44d f44d220d
@extends('layouts.resultPage') @extends('layouts.resultPage')
@section('results') @section('results')
<div id="results">
{{-- Show all errors --}} {{-- Show all errors --}}
@if(sizeof($errors) > 0) @if(sizeof($errors) > 0)
<div class="alert alert-danger"> <div class="alert alert-danger">
...@@ -21,7 +22,6 @@ ...@@ -21,7 +22,6 @@
</ul> </ul>
</div> </div>
@endif @endif
<div id="results">
{{-- Show initial products or ads --}} {{-- Show initial products or ads --}}
@if($metager->hasProducts()) @if($metager->hasProducts())
@if( $metager->getFokus() !== "produktsuche" && !$apiAuthorized) @if( $metager->getFokus() !== "produktsuche" && !$apiAuthorized)
......
...@@ -12,6 +12,12 @@ ...@@ -12,6 +12,12 @@
<a id="settings-btn" class="mutelink btn btn-default" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "settings ") }}"> <a id="settings-btn" class="mutelink btn btn-default" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "settings ") }}">
<i class="fa fa-cog" aria-hidden="true"></i> <i class="fa fa-cog" aria-hidden="true"></i>
</a> </a>
<div class="searchbar-tooltip">
<div class="searchbar-tooltip-arrow"></div>
<div class="searchbar-tooltip-content">
<p>{{{ trans('index.tooltips.settings') }}}</p>
</div>
</div>
</div> </div>
</div> </div>
<select id="focus-select" name="focus" style="font-family: FontAwesome, sans-serif;"> <select id="focus-select" name="focus" style="font-family: FontAwesome, sans-serif;">
......
Supports Markdown
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