Fix theming.

src/UniversalDashboard/Controllers/DashboardController.cs

@@ -9,6 +9,7 @@
 using Microsoft.AspNetCore.SignalR;
 using System.Threading.Tasks;
 using UniversalDashboard.Interfaces;
+using System.Reflection;
 
 namespace UniversalDashboard.Controllers
 {
@@ -60,14 +61,20 @@ public Page Index(string page)
             return _dashboard.Pages.FirstOrDefault(m => m.Name?.Replace("-", " ").Equals(page?.Replace("-", " "), StringComparison.OrdinalIgnoreCase) == true);
         }
 
-        [Authorize]
 		[Route("theme")]
         [ResponseCache(NoStore = true, Location = ResponseCacheLocation.None)]
         public IActionResult Theme()
 	    {
+            var materializeCss = Path.Combine(Path.GetDirectoryName(GetType().Assembly.Location), "styles", "materialize.min.css");
+            var siteCss = Path.Combine(Path.GetDirectoryName(GetType().Assembly.Location), "styles", "site.css");
+
+            var css = System.IO.File.ReadAllText(materializeCss);
+            css += System.IO.File.ReadAllText(siteCss);
+            css += _dashboard?.Themes?.FirstOrDefault()?.RenderedContent;
+
 			return new ContentResult()
             {
-                Content = _dashboard?.Themes?.FirstOrDefault()?.RenderedContent,
+                Content = css,
                 ContentType = "text/css",
             };
 	    }

src/UniversalDashboard/Services/ThemeService.cs

@@ -162,7 +162,7 @@ private void TranslateHashtable(Hashtable hashtable, StringBuilder stringBuilder
 
                 var setting = value as string;
                 if (setting != null) {
-                    stringBuilder.AppendLine("\t" + identifier + " : " + setting + " !important;");
+                    stringBuilder.AppendLine("\t" + identifier + " : " + setting + ";");
                     continue;
                 }
 

src/UniversalDashboard/UniversalDashboard.csproj

@@ -59,6 +59,14 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="Styles\site.css">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </None>  
+    <None Update="Styles\materialize.min.css">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </None>  
     <None Update="Themes\*.*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>

src/client/src/app/index.jsx

@@ -3,18 +3,15 @@ import React from 'react';
 import {render} from 'react-dom';
 import $ from "jquery";
 import Materialize from "materialize-css";
-import("materialize-css/dist/css/materialize.min.css" /* webpackChunkName: "materialize-css" */)
 import 'whatwg-fetch';
 import Promise from 'promise-polyfill'; 
 import thunk from 'redux-thunk';
-
-import('./styles/site.css' /* webpackChunkName: "ud-site-css" */);
 import { UniversalDashboardService } from './services/universal-dashboard-service.jsx';
 import ConnectedApp from './App';
-
 import { Provider } from 'react-redux'
 import { createStore, applyMiddleware } from 'redux'
 import app from './reducers'
+import {getApiPath} from 'config';
 
 // To add to window
 if (!window.Promise) {
@@ -25,4 +22,11 @@ window.UniversalDashboard = UniversalDashboardService;
 
 const store = createStore(app, applyMiddleware(thunk));
 
+var styles = document.createElement('link');
+styles.rel = 'stylesheet';
+styles.type = 'text/css';
+styles.media = 'screen';
+styles.href = getApiPath() + "/api/internal/dashboard/theme";
+document.getElementsByTagName('head')[0].appendChild(styles);
+
 render(<Provider store={store}><ConnectedApp/></Provider>, document.getElementById('app'));

src/client/src/app/ud-dashboard.jsx

@@ -180,8 +180,6 @@ export default class UdDashboard extends React.Component {
     }
 
     loadData() {
-        this.loadStylesheet(getApiPath() + "/api/internal/dashboard/theme");
-
         fetchGet("/api/internal/dashboard", function(json) {
 
             var dashboard = json.dashboard;