From: Dan Brown <redacted>
Date: Sun, 12 Jun 2016 12:37:15 +0000 (+0100)
Subject: Fixed theme color elements not showing on new instance
X-Git-Tag: v0.11.0~1^2~10
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/d582e76fed59ecb1e5ea438ff529e90c6b4d361c

Fixed theme color elements not showing on new instance

Also cleaned notification session access
---

diff --git a/config/setting-defaults.php b/config/setting-defaults.php
index 17bae1848..6a55a0dc3 100644
--- a/config/setting-defaults.php
+++ b/config/setting-defaults.php
@@ -5,6 +5,8 @@
  */
 return [
 
-    'app-editor' => 'wysiwyg'
+    'app-editor' => 'wysiwyg',
+    'app-color'  => '#0288D1',
+    'app-color-light' => 'rgba(21, 101, 192, 0.15)'
 
 ];
\ No newline at end of file
diff --git a/resources/views/partials/custom-styles.blade.php b/resources/views/partials/custom-styles.blade.php
index e6f8f7fc2..2e23e267b 100644
--- a/resources/views/partials/custom-styles.blade.php
+++ b/resources/views/partials/custom-styles.blade.php
@@ -1,22 +1,20 @@
-@if(Setting::get('app-color'))
-    <style>
-        header, #back-to-top, .primary-background {
-            background-color: {{ Setting::get('app-color') }} !important;
-        }
-        .faded-small, .primary-background-light {
-            background-color: {{ Setting::get('app-color-light') }};
-        }
-        .button-base, .button, input[type="button"], input[type="submit"] {
-            background-color: {{ Setting::get('app-color') }};
-        }
-        .button-base:hover, .button:hover, input[type="button"]:hover, input[type="submit"]:hover, .button:focus {
-            background-color: {{ Setting::get('app-color') }};
-        }
-        .nav-tabs a.selected, .nav-tabs .tab-item.selected {
-            border-bottom-color: {{ Setting::get('app-color') }};
-        }
-        p.primary:hover, p .primary:hover, span.primary:hover, .text-primary:hover, a, a:hover, a:focus, .text-button, .text-button:hover, .text-button:focus {
-            color: {{ Setting::get('app-color') }};
-        }
-    </style>
-@endif
\ No newline at end of file
+<style>
+    header, #back-to-top, .primary-background {
+        background-color: {{ Setting::get('app-color') }} !important;
+    }
+    .faded-small, .primary-background-light {
+        background-color: {{ Setting::get('app-color-light') }};
+    }
+    .button-base, .button, input[type="button"], input[type="submit"] {
+        background-color: {{ Setting::get('app-color') }};
+    }
+    .button-base:hover, .button:hover, input[type="button"]:hover, input[type="submit"]:hover, .button:focus {
+        background-color: {{ Setting::get('app-color') }};
+    }
+    .nav-tabs a.selected, .nav-tabs .tab-item.selected {
+        border-bottom-color: {{ Setting::get('app-color') }};
+    }
+    p.primary:hover, p .primary:hover, span.primary:hover, .text-primary:hover, a, a:hover, a:focus, .text-button, .text-button:hover, .text-button:focus {
+        color: {{ Setting::get('app-color') }};
+    }
+</style>
\ No newline at end of file
diff --git a/resources/views/partials/notifications.blade.php b/resources/views/partials/notifications.blade.php
index 183934c66..c079080db 100644
--- a/resources/views/partials/notifications.blade.php
+++ b/resources/views/partials/notifications.blade.php
@@ -1,12 +1,12 @@
 
-<div class="notification anim pos" @if(!Session::has('success')) style="display:none;" @endif>
-    <i class="zmdi zmdi-check-circle"></i> <span>{!! nl2br(htmlentities(Session::get('success'))) !!}</span>
+<div class="notification anim pos" @if(!session()->has('success')) style="display:none;" @endif>
+    <i class="zmdi zmdi-check-circle"></i> <span>{!! nl2br(htmlentities(session()->get('success'))) !!}</span>
 </div>
 
-<div class="notification anim warning stopped" @if(!Session::has('warning')) style="display:none;" @endif>
-    <i class="zmdi zmdi-info"></i> <span>{!! nl2br(htmlentities(Session::get('warning'))) !!}</span>
+<div class="notification anim warning stopped" @if(!session()->has('warning')) style="display:none;" @endif>
+    <i class="zmdi zmdi-info"></i> <span>{!! nl2br(htmlentities(session()->get('warning'))) !!}</span>
 </div>
 
-<div class="notification anim neg stopped" @if(!Session::has('error')) style="display:none;" @endif>
-    <i class="zmdi zmdi-alert-circle"></i> <span>{!! nl2br(htmlentities(Session::get('error'))) !!}</span>
+<div class="notification anim neg stopped" @if(!session()->has('error')) style="display:none;" @endif>
+    <i class="zmdi zmdi-alert-circle"></i> <span>{!! nl2br(htmlentities(session()->get('error'))) !!}</span>
 </div>