From dff9faaa5d1ed16506c4b48ff9bad7ddc28f729c Mon Sep 17 00:00:00 2001
From: James Brooks <jbrooksuk@me.com>
Date: Sat, 21 Nov 2015 22:47:24 +0000
Subject: [PATCH] Use $app_stylesheet from AppComposer

---
 app/Composers/AppComposer.php                           | 1 +
 resources/views/dashboard/settings/stylesheet.blade.php | 2 +-
 resources/views/layout/master.blade.php                 | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Composers/AppComposer.php b/app/Composers/AppComposer.php
index 0f3bf261..aac3f56f 100644
--- a/app/Composers/AppComposer.php
+++ b/app/Composers/AppComposer.php
@@ -31,6 +31,7 @@ class AppComposer
         $view->withAppBannerType(Setting::get('app_banner_type'));
         $view->withAppDomain(Setting::get('app_domain'));
         $view->withAppName(Setting::get('app_name'));
+        $view->withAppStylesheet(Setting::get('app_stylesheet'));
         $view->withAppUrl(Config::get('app.url'));
         $view->withShowSupport(Setting::get('show_support'));
     }
diff --git a/resources/views/dashboard/settings/stylesheet.blade.php b/resources/views/dashboard/settings/stylesheet.blade.php
index 3a39703b..f5de5cca 100644
--- a/resources/views/dashboard/settings/stylesheet.blade.php
+++ b/resources/views/dashboard/settings/stylesheet.blade.php
@@ -21,7 +21,7 @@
                                 <div class="col-xs-12">
                                     <div class="form-group">
                                         <label>{{ trans('forms.settings.stylesheet.custom-css') }}</label>
-                                        <textarea class="form-control autosize" name="stylesheet" rows="10">{{ Setting::get('stylesheet') }}</textarea>
+                                        <textarea class="form-control autosize" name="stylesheet" rows="10">{{ $app_stylesheet }}</textarea>
                                     </div>
                                 </div>
                             </div>
diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php
index 823ca10f..7bdb6859 100644
--- a/resources/views/layout/master.blade.php
+++ b/resources/views/layout/master.blade.php
@@ -44,7 +44,7 @@
 
     @include('partials.crowdin')
 
-    @if($stylesheet = Setting::get('stylesheet'))
+    @if($stylesheet = $app_stylesheet)
     <style type="text/css">
     {!! $stylesheet !!}
     </style>