From 8a04cb97817f383621b8dafd824fd7cee15a86b4 Mon Sep 17 00:00:00 2001
From: Davide Aprea <davide@suma-ev.de>
Date: Mon, 26 Oct 2020 12:45:35 +0100
Subject: [PATCH] added light css as default
---
resources/views/layouts/resultPage.blade.php | 3 +--
resources/views/layouts/resultpage/resources.blade.php | 4 ++--
resources/views/layouts/staticPages.blade.php | 10 ++++------
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/resources/views/layouts/resultPage.blade.php b/resources/views/layouts/resultPage.blade.php
index bde4f2d55..028449497 100644
--- a/resources/views/layouts/resultPage.blade.php
+++ b/resources/views/layouts/resultPage.blade.php
@@ -23,14 +23,13 @@
<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome.css') }}" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome-solid.css') }}" />
+ <link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}"/>
@if(Cookie::get('dark_mode') === "2")
<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager-dark.css') }}"/>
@elseif(Cookie::get('dark_mode') === "1")
<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}"/>
@else
<link type="text/css" rel="stylesheet" media="(prefers-color-scheme:dark)" href="{{ mix('css/themes/metager-dark.css') }}"/>
- <link type="text/css" rel="stylesheet" media="(prefers-color-scheme:light)" href="{{ mix('css/themes/metager.css') }}"/>
- <!--[if IE]><link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}"><![endif]-->
@endif
@endif
diff --git a/resources/views/layouts/resultpage/resources.blade.php b/resources/views/layouts/resultpage/resources.blade.php
index 6f4939d41..df5f88b49 100644
--- a/resources/views/layouts/resultpage/resources.blade.php
+++ b/resources/views/layouts/resultpage/resources.blade.php
@@ -17,13 +17,13 @@
<link href="/fonts/liberationsans/stylesheet.css" rel="stylesheet">
<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome.css') }}" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome-solid.css') }}" />
+
+ <link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}"/>
@if(Cookie::get('dark_mode') === "2")
<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager-dark.css') }}"/>
@elseif(Cookie::get('dark_mode') === "1")
<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}"/>
@else
<link type="text/css" rel="stylesheet" media="(prefers-color-scheme:dark)" href="{{ mix('css/themes/metager-dark.css') }}"/>
- <link type="text/css" rel="stylesheet" media="(prefers-color-scheme:light)" href="{{ mix('css/themes/metager.css') }}"/>
- <!--[if IE]><link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}"><![endif]-->
@endif
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php
index 0249f3133..55eee8b17 100644
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -27,6 +27,10 @@
<link rel="search" type="application/opensearchdescription+xml" title="{{ trans('staticPages.opensearch') }}" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('StartpageController@loadPlugin', ['key' => Cookie::get('key')])) }}">
@endif
+ <link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}"/>
+ @if(isset($page) && $page === 'startpage')
+ <link type="text/css" rel="stylesheet" href="{{ mix('css/themes/startpage-only-light.css') }}"/>
+ @endif
@if(Cookie::get('dark_mode') === "2")
<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager-dark.css') }}"/>
@if(isset($page) && $page === 'startpage')
@@ -42,12 +46,6 @@
@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="(prefers-color-scheme:light)" href="{{ mix('css/themes/metager.css') }}"/>
- @if(isset($page) && $page === 'startpage')
- <link type="text/css" rel="stylesheet" media="(prefers-color-scheme:light)" href="{{ mix('css/themes/startpage-only-light.css') }}"/>
- @endif
- <!--[if IE]><link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}"><![endif]-->
- <!--[if IE]><link type="text/css" rel="stylesheet" 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