Merge pull request #226 from steptools/styling-fixes

Styling fixes and React 15 Upgrade

Author: Sjbeale

CHANGELOG.md

@@ -12,19 +12,24 @@ Features:
 - Relative pathing can now be used
 - Now supports only running one file
 - Pressing escape will close the properties pane
+- Styling overhaul of the sidebar
 - config.json deprecated and moved to config.js
 
 Bugfixes:
 
 - Sidebar now renders only when needed
 - Sidebar can now be scrolled in Firefox
+- Speed slider is now styled correctly in Edge
 - Render radius is properly calculated when workingstep changes
 - Bounding boxes update properly with each workingstep
 - Tool Locations now properly update when workingstep changes
 - View loads properly without errors on Safari / iOS
 - Properties pane has correct height for scrolling
 - Scrolling happens whenever tab is switched and on all tabs
+- Contents of the Workplan tab can no longer be dragged
 - Colors stopped working after code refactor but are now fixed
+- Nodes in the Workplan tree can no longer be dragged and reordered
+- Transitioned to React 15.2.0
 
 Version 1.1.0
 

config.js

@@ -28,7 +28,7 @@ module.exports = function(environment) {
             "upload": true
           },
           "file" : {
-            "dir": "./moldy.stpnc"
+            "dir": "./model.stpnc"
           },
           "machine" : {
             "dir" : ""
@@ -43,4 +43,4 @@ module.exports = function(environment) {
         return config;
     }
     return config;
-};
+};

package.json

@@ -9,8 +9,8 @@
     "start": "node src/server/api_server.js",
     "start-debug": "node-debug -p 8085 src/server/api_server.js",
     "start-dev": "node src/server/api_server.js -e development",
-    "make" : "./node_modules/.bin/webpack --progress && node src/server/api_server.js",
-    "make-release" : "./node_modules/.bin/webpack --minimize --progress && node src/server/api_server.js"
+    "make": "./node_modules/.bin/webpack --progress && node src/server/api_server.js",
+    "make-release": "./node_modules/.bin/webpack --minimize --progress && node src/server/api_server.js"
   },
   "author": "G. Hemingway",
   "license": "MIT",
@@ -23,7 +23,6 @@
     "errorhandler": "^1.4.3",
     "express": "^4.14.0",
     "express-session": "^1.13.0",
-    "pug": "^2.0.0-beta3",
     "jade": "1.11.0",
     "joi": "8.4.2",
     "jquery": "^2.2.4",
@@ -34,13 +33,14 @@
     "method-override": "^2.3.6",
     "morgan": "^1.7.0",
     "node-sass": "^3.4.2",
+    "pug": "^2.0.0-beta3",
     "qs": "^6.0.1",
     "query-string": "^3.0.0",
     "rc-menu": "4.9.0",
-    "react": "^0.14.8",
-    "react-dom": "^0.14.8",
+    "react": "^15.2.0",
+    "react-dom": "^15.2.0",
     "react-tooltip": "^1.0.4",
-    "react-ui-tree": "^2.4.1",
+    "react-treebeard": "^1.1.2",
     "request": "^2.67.0",
     "serve-favicon": "^2.3.0",
     "serve-static": "^1.11.1",
@@ -69,14 +69,14 @@
     "less": "^2.5.3",
     "less-loader": "^2.2.2",
     "mocha": "^2.5.3",
-    "node-markdown" : "^0.1.1",
+    "node-markdown": "^0.1.1",
     "sass-loader": "^4.0.0",
     "style-loader": "0.13.1",
-    "uglify-js" : "^2.6.4",
+    "uglify-js": "^2.6.4",
     "uglify-loader": "^1.3.0",
     "url-loader": "^0.5.7",
     "webpack": "^1.13.1",
     "webpack-config": "^5.1.0",
     "webpack-glsl-loader": "^1.0.1"
   }
-}
+}

src/client/stylesheets/components/_menu_base.scss

@@ -39,11 +39,11 @@
 .rc-menu-item-active,
 .rc-menu-submenu-active,
 .rc-menu-submenu-inline.rc-menu-submenu-active > .rc-menu-submenu-title:hover {
-    background-color: #eaf8fe;
+    //background-color: #eaf8fe;
 }
 
 .rc-menu-item-selected {
-    background-color: #eaf8fe;
+    //background-color: #eaf8fe;
 }
 
 .rc-menu > li.rc-menu-submenu {