From 0c76ee6bae637d5929f8e2007dcab6c8dd8a3aa0 Mon Sep 17 00:00:00 2001
From: Davide Aprea <davide@suma-ev.de>
Date: Thu, 22 Oct 2020 11:51:02 +0200
Subject: [PATCH] added os theme awareness
---
app/Http/Controllers/StartpageController.php | 7 +------
resources/views/layouts/resultPage.blade.php | 7 +++++--
.../layouts/resultpage/resources.blade.php | 6 +++++-
resources/views/layouts/staticPages.blade.php | 19 +++++++++++++++++--
4 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/app/Http/Controllers/StartpageController.php b/app/Http/Controllers/StartpageController.php
index 94554a07d..c5e4ff612 100644
--- a/app/Http/Controllers/StartpageController.php
+++ b/app/Http/Controllers/StartpageController.php
@@ -43,10 +43,6 @@ class StartpageController extends Controller
$lang = 'all';
}
- $css = mix('css/themes/startpage-only-light.css');
- if(Cookie::get('dark_mode') === "2")
- $css = mix('css/themes/startpage-only-dark.css');
-
return view('index')
->with('title', trans('titles.index'))
->with('homeIcon')
@@ -57,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('css', [$css]);
+ ->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 8b63a3b37..b36c7f86b 100644
--- a/resources/views/layouts/resultPage.blade.php
+++ b/resources/views/layouts/resultPage.blade.php
@@ -24,9 +24,12 @@
<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome-solid.css') }}" />
@if(Cookie::get('dark_mode') === "2")
- <link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager-dark.css') }}" title="MetaGer Dark"/>
+ <link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager-dark.css') }}" title="MetaGer Dark"/>
+ @elseif(Cookie::get('dark_mode') === "1")
+ <link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}" title="MetaGer Light"/>
@else
- <link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}" title="MetaGer"/>
+ <link type="text/css" rel="stylesheet" media="(prefers-color-scheme: dark)" href="{{ mix('css/themes/metager-dark.css') }}" title="MetaGer Dark"/>
+ <link type="text/css" rel="stylesheet" media="not (prefers-color-scheme: dark)" href="{{ mix('css/themes/metager.css') }}" title="MetaGer Light"/>
@endif
@endif
diff --git a/resources/views/layouts/resultpage/resources.blade.php b/resources/views/layouts/resultpage/resources.blade.php
index f0300a4cc..6d38cc7b8 100644
--- a/resources/views/layouts/resultpage/resources.blade.php
+++ b/resources/views/layouts/resultpage/resources.blade.php
@@ -19,6 +19,10 @@
<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome-solid.css') }}" />
@if(Cookie::get('dark_mode') === "2")
<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager-dark.css') }}" title="MetaGer Dark"/>
+ @elseif(Cookie::get('dark_mode') === "1")
+ <link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}" title="MetaGer Light"/>
@else
- <link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}" title="MetaGer"/>
+ <link type="text/css" rel="stylesheet" media="(prefers-color-scheme: dark)" href="{{ mix('css/themes/metager-dark.css') }}" title="MetaGer Dark"/>
+ <link type="text/css" rel="stylesheet" media="not (prefers-color-scheme: dark)" href="{{ mix('css/themes/metager.css') }}" title="MetaGer Light"/>
@endif
+
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php
index bcad68ca9..91eeec73b 100644
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -28,9 +28,24 @@
@endif
@if(Cookie::get('dark_mode') === "2")
- <link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager-dark.css') }}" title="MetaGer Dark"/>
+ <link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager-dark.css') }}" title="MetaGer Dark"/>
+ @if(isset($page) && $page === 'startpage')
+ <link type="text/css" rel="stylesheet" media="(prefers-color-scheme:dark)" href="{{ mix('css/themes/startpage-only-dark.css') }}"/>
+ @endif
+ @elseif(Cookie::get('dark_mode') === "1")
+ <link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}" title="MetaGer Light"/>
+ @if(isset($page) && $page === 'startpage')
+ <link type="text/css" rel="stylesheet" media="not (prefers-color-scheme:dark)" href="{{ mix('css/themes/startpage-only-light.css') }}"/>
+ @endif
@else
- <link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}" title="MetaGer"/>
+ <link type="text/css" rel="stylesheet" media="(prefers-color-scheme:dark)" href="{{ mix('css/themes/metager-dark.css') }}" title="MetaGer Dark"/>
+ @if(isset($page) && $page === 'startpage')
+ <link type="text/css" rel="stylesheet" media="(prefers-color-scheme:dark)" href="{{ mix('css/themes/startpage-only-dark.css') }}"/>
+ @endif
+ <link type="text/css" rel="stylesheet" media="not (prefers-color-scheme:dark)" href="{{ mix('css/themes/metager.css') }}" title="MetaGer Light"/>
+ @if(isset($page) && $page === 'startpage')
+ <link type="text/css" rel="stylesheet" media="not (prefers-color-scheme:dark)" href="{{ mix('css/themes/startpage-only-light.css') }}"/>
+ @endif
@endif
<link type="text/css" rel="stylesheet" href="{{ mix('css/utility.css') }}" />
<link href="/fonts/liberationsans/stylesheet.css" rel="stylesheet">
--
GitLab