From 40ebc13292b64271418aa3d5683d0927e6db778e Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Wed, 25 Oct 2017 13:40:57 +1030
Subject: [PATCH] Only apply custom CSS and header HTML on forum, not admin

---
 src/Forum/WebApp.php               | 4 ++++
 src/Http/WebApp/AbstractWebApp.php | 4 ----
 views/admin.blade.php              | 2 --
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Forum/WebApp.php b/src/Forum/WebApp.php
index 310532922..eecfbee44 100644
--- a/src/Forum/WebApp.php
+++ b/src/Forum/WebApp.php
@@ -51,6 +51,10 @@ class WebApp extends AbstractWebApp
             return $this->formatter->getJs();
         });
 
+        $view->getCss()->addString(function () {
+            return $this->settings->get('custom_less');
+        });
+
         return $view;
     }
 
diff --git a/src/Http/WebApp/AbstractWebApp.php b/src/Http/WebApp/AbstractWebApp.php
index 0e2bc24aa..e20ec3cac 100644
--- a/src/Http/WebApp/AbstractWebApp.php
+++ b/src/Http/WebApp/AbstractWebApp.php
@@ -131,10 +131,6 @@ abstract class AbstractWebApp
 
         $css->addString($lessVariables);
         $localeCss->addString($lessVariables);
-
-        $css->addString(function () {
-            return $this->settings->get('custom_less');
-        });
     }
 
     /**
diff --git a/views/admin.blade.php b/views/admin.blade.php
index 80a0856a8..47275da32 100644
--- a/views/admin.blade.php
+++ b/views/admin.blade.php
@@ -1,5 +1,3 @@
-{!! array_get($forum, 'attributes.headerHtml') !!}
-
 <div id="app" class="App">
 
   <div id="app-navigation" class="App-navigation"></div>