From a5daee811bacd9491a9316ebe78d70b135f8732d Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 25 Jul 2018 19:00:03 -0700 Subject: [PATCH] Split out custom_css from custom_header color --- resources/views/layouts/basic.blade.php | 9 +++++---- resources/views/layouts/default.blade.php | 10 +++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/resources/views/layouts/basic.blade.php b/resources/views/layouts/basic.blade.php index 3ea432d3ef..9d16d06b0e 100644 --- a/resources/views/layouts/basic.blade.php +++ b/resources/views/layouts/basic.blade.php @@ -32,12 +32,13 @@ background-color: {{ $snipeSettings->header_color }}; border-color: {{ $snipeSettings->header_color }}; } - - @if ($snipeSettings->custom_css) - {{ $snipeSettings->show_custom_css() }} - @endif + @endif + @if ($snipeSettings->custom_css) + @endif diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index 78adec2d8b..51f219c592 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->custom_css) + + @endif +