fixed issues with theme loading

intersystems-community · Oct 30, 2017 · 5bb4ced · 5bb4ced
1 parent cd35125
commit 5bb4ced
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,6 @@
+#2.1.10
+* fixed issues with theme loading
+
 #2.1.9
 * added black theme
 * added configuration for chart colors and some other colors as well

diff --git a/index.html b/index.html
@@ -19,7 +19,7 @@
     <meta name="theme-color" content="#ffffff">
 
 
-    <link rel="stylesheet" type="text/css" href="node_modules/angularjs-color-picker/dist/angularjs-color-picker.min.css">
+    <link rel="stylesheet" type="text/css" href="css/angularjs-color-picker.min.css">
     <link rel="stylesheet" type="text/css" href="css/ol.min.css">
     <link rel="stylesheet" type="text/css" href="css/bootstrap.min.css">
     <link rel="stylesheet" type="text/css" href="css/bootstrap-theme.min.css">
@@ -32,7 +32,7 @@
     <link rel="stylesheet" type="text/css" href="css/lightPivotTable.min.css">
     <link rel="stylesheet" type="text/css" href="css/main.css">
     <link rel="stylesheet" type="text/css" href="css/new.min.css">
-    <link rel="stylesheet" type="text/css" href="css/default.css">
+    <link rel="stylesheet" type="text/css" href="css/themes/default.css">
     <!--<link rel="stylesheet" type="text/css" href="css/contrast.css">-->
     <link rel="stylesheet" type="text/css" href="" id="pagestyle">
     <!--<link rel="stylesheet" type="text/css" href="css/mobile.css">-->
@@ -62,8 +62,8 @@
     <script src="src/lib/lightPivotTable.js"></script>
     <script src="src/lib/ocLazyLoad.min.js"></script>
     <script src="src/lib/fastclick.js"></script>
-    <script src="node_modules/tinycolor2/dist/tinycolor-min.js"></script>
-    <script src="node_modules/angularjs-color-picker/dist/angularjs-color-picker.min.js"></script>
+    <script src="src/lib/tinycolor-min.js"></script>
+    <script src="src/lib/angularjs-color-picker.min.js"></script>
     <!-- build:js src/app.js -->
     <script src="src/app.js"></script>
     <script src="src/services/utils.js"></script>

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "DeepSeeWeb",
   "author": "Gnibeda A.A",
-  "version": "2.1.9",
+  "version": "2.1.10",
   "description": "Renderer for DeepSee Dashboards in Browser with MDX2JSON as a Serverside and JS web-client",
   "repository": {
     "type": "git",

diff --git a/src/services/storage.js b/src/services/storage.js
@@ -133,7 +133,6 @@
             if (!_this.settings.app) _this.settings.app = {};
             var settings = _this.settings.app;
             if (lang) settings.language = lang;
-            settings.theme = 'black.css';
             return settings;
         }