From 48e32ea6b781a54631e6519d44aa79159b92c525 Mon Sep 17 00:00:00 2001
From: Davide <davide@suma-ev.de>
Date: Tue, 20 Oct 2020 09:52:26 +0200
Subject: [PATCH] fixed dark mode cookie awareness
---
app/Http/Controllers/StartpageController.php | 3 +--
resources/views/layouts/resultPage.blade.php | 2 +-
resources/views/layouts/staticPages.blade.php | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/app/Http/Controllers/StartpageController.php b/app/Http/Controllers/StartpageController.php
index 1251e1ff4..c5e4ff612 100644
--- a/app/Http/Controllers/StartpageController.php
+++ b/app/Http/Controllers/StartpageController.php
@@ -53,8 +53,7 @@ class StartpageController extends Controller
->with('request', $request->input('request', 'GET'))
->with('option_values', $option_values)
->with('autocomplete', $autocomplete)
- ->with('pluginmodal', $request->input('plugin-modal', 'off'))
- ->with('darkmode', Cookie::get('dark_mode'));
+ ->with('pluginmodal', $request->input('plugin-modal', 'off'));
}
public function loadPage($subpage)
diff --git a/resources/views/layouts/resultPage.blade.php b/resources/views/layouts/resultPage.blade.php
index 0fe54cf0e..ebd100298 100644
--- a/resources/views/layouts/resultPage.blade.php
+++ b/resources/views/layouts/resultPage.blade.php
@@ -23,7 +23,7 @@
<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome.css') }}" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome-solid.css') }}" />
- @if($darkmode === "2")
+ @if(Cookie::get('dark_mode') === "2")
<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager-dark.css') }}" title="MetaGer Dark"/>
@else
<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}" title="MetaGer"/>
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php
index 9e157c25a..9dd9b9c86 100644
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -27,7 +27,7 @@
<link rel="search" type="application/opensearchdescription+xml" title="{{ trans('staticPages.opensearch') }}" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('StartpageController@loadPlugin', ['key' => Cookie::get('key')])) }}">
@endif
- @if($darkmode === "2")
+ @if(Cookie::get('dark_mode') === "2")
<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager-dark.css') }}" title="MetaGer Dark"/>
@else
<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}" title="MetaGer"/>
--
GitLab