Commit ecadc412 authored by Dominik Hebeler's avatar Dominik Hebeler

Merge branch '474-layout-der-startseite-funktioniert-nicht-im-chrome-browser' into 'development'

Resolve "Layout der Startseite funktioniert nicht im Chrome Browser"

Closes #474

See merge request !821
parents dad64dc6 ed43f8cd
......@@ -3,7 +3,7 @@
namespace App\Console\Commands;
use Illuminate\Console\Command;
use Redis;
use Illuminate\Support\Facades\Redis;
class LogRotate extends Command
{
......
......@@ -3,7 +3,7 @@
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use Redis;
use Illuminate\Support\Facades\Redis;
class AdminInterface extends Controller
{
......
......@@ -3,7 +3,7 @@
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use Redis;
use Illuminate\Support\Facades\Redis;
class LogController extends Controller
{
......
......@@ -6,7 +6,7 @@ use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Redis;
use Illuminate\Support\Facades\Redis;
class Search implements ShouldQueue
{
......
......@@ -8,7 +8,7 @@ use Jenssegers\Agent\Agent;
use LaravelLocalization;
use Log;
use Predis\Connection\ConnectionException;
use Redis;
use Illuminate\Support\Facades\Redis;
class MetaGer
{
......
......@@ -7,7 +7,7 @@ use App\MetaGer;
use Cache;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Log;
use Redis;
use Illuminate\Support\Facades\Redis;
abstract class Searchengine
{
......
......@@ -6,7 +6,7 @@ use Illuminate\Queue\Events\JobProcessed;
use Illuminate\Queue\Events\JobProcessing;
use Illuminate\Support\ServiceProvider;
use Queue;
use Redis;
use Illuminate\Support\Facades\Redis;
class AppServiceProvider extends ServiceProvider
{
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -7019,7 +7019,7 @@ Mixed
li#info {
white-space: pre-line;
}
main fieldset#foki {
main div#foki {
margin: 5px 0;
text-align: center;
}
......
This diff is collapsed.
......@@ -329,7 +329,7 @@ li#info {
white-space: pre-line;
}
main fieldset#foki {
main div#foki {
margin: 5px 0;
text-align: center;
}
......
......@@ -193,7 +193,7 @@
</div>
<h1 id="mglogo"><a class="hidden-xs" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer</a></h1>
<!-- Create the focus selection and options -->
<fieldset id="foki">
<div id="foki">
<div class="focus">
<input id="web" class="focus-radio hide" type="radio" name="focus" value="web" form="searchForm" @if ($focus === 'web') checked @endif required="">
<label id="web-label" class="focus-label" for="web">
......@@ -245,7 +245,7 @@
<a id="settings-btn" class="mutelink btn btn-default" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "settings") }}">
<span class="glyphicon glyphicon-cog"></span>
</a>
</fieldset>
</div>
<fieldset>
<form id="searchForm" @if(Request::has('request') && Request::input('request') === "POST") method="POST" @elseif(Request::has('request') && Request::input('request') === "GET") method="GET" @else method="GET" @endif action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/meta.ger3") }}" accept-charset="UTF-8">
<div class="input-group">
......
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