From 708b1a962ce1efd25ea5018219c6e9c8887e9cc2 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 25 Jul 2018 19:01:47 -0700 Subject: [PATCH] Split out custom_css from custom_header This makes it so that the custom_css will still be respected even if there is no custom header --- resources/views/layouts/basic.blade.php | 9 ++++++--- resources/views/layouts/default.blade.php | 10 +++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/resources/views/layouts/basic.blade.php b/resources/views/layouts/basic.blade.php index 3ea432d3ef..699446b330 100644 --- a/resources/views/layouts/basic.blade.php +++ b/resources/views/layouts/basic.blade.php @@ -33,13 +33,16 @@ border-color: {{ $snipeSettings->header_color }}; } - @if ($snipeSettings->custom_css) - {{ $snipeSettings->show_custom_css() }} - @endif @endif + @if (($snipeSettings) && ($snipeSettings->custom_css)) + + @endif + diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index 78adec2d8b..196b085bbc 100644 --- a/resources/views/layouts/default.blade.php +++ b/resources/views/layouts/default.blade.php @@ -54,9 +54,7 @@ } @endif - @if (($snipeSettings) && ($snipeSettings->custom_css!='')) - {!! $snipeSettings->show_custom_css() !!} - @endif + @media (max-width: 400px) { .navbar-left { @@ -69,6 +67,12 @@ } + @if (($snipeSettings) && ($snipeSettings->custom_css)) + + @endif +