From b8b9086dae0243812e41163452b5b2702280e9ee Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Fri, 2 Dec 2016 15:21:25 +0100
Subject: [PATCH] React library update (#3704)

* Update React & MaterialUI

* Adjust TabBar layouts for new MUI
---
 js/package.json                            | 17 ++++++++---------
 js/src/views/Application/TabBar/tabBar.css |  4 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/js/package.json b/js/package.json
index 420bc831e..3693e6578 100644
--- a/js/package.json
+++ b/js/package.json
@@ -107,9 +107,8 @@
     "postcss-simple-vars": "~3.0.0",
     "progress": "~1.1.8",
     "raw-loader": "~0.5.1",
-    "react-addons-perf": "~15.3.2",
-    "react-addons-test-utils": "~15.3.2",
-    "react-dom": "~15.3.2",
+    "react-addons-perf": "~15.4.1",
+    "react-addons-test-utils": "~15.4.1",
     "react-hot-loader": "~3.0.0-beta.6",
     "rucksack-css": "~0.8.6",
     "sinon": "~1.17.4",
@@ -141,25 +140,25 @@
     "js-sha3": "~0.5.2",
     "lodash": "~4.11.1",
     "marked": "~0.3.6",
-    "material-ui": "0.16.1",
-    "material-ui-chip-input": "~0.8.0",
+    "material-ui": "~0.16.4",
+    "material-ui-chip-input": "~0.11.1",
     "mobx": "~2.6.1",
     "mobx-react": "~3.5.8",
     "mobx-react-devtools": "~4.2.9",
     "moment": "~2.14.1",
     "phoneformat.js": "~1.0.3",
     "qs": "~6.3.0",
-    "react": "~15.3.2",
+    "react": "~15.4.1",
     "react-ace": "~4.0.0",
-    "react-addons-css-transition-group": "~15.3.2",
+    "react-addons-css-transition-group": "~15.4.1",
     "react-chartjs-2": "~1.5.0",
     "react-copy-to-clipboard": "~4.2.3",
-    "react-dom": "~15.3.2",
+    "react-dom": "~15.4.1",
     "react-dropzone": "~3.7.3",
     "react-redux": "~4.4.5",
     "react-router": "~2.6.1",
     "react-router-redux": "~4.0.5",
-    "react-tap-event-plugin": "~1.0.0",
+    "react-tap-event-plugin": "~2.0.1",
     "react-tooltip": "~2.0.3",
     "recharts": "~0.15.2",
     "redux": "~3.5.2",
diff --git a/js/src/views/Application/TabBar/tabBar.css b/js/src/views/Application/TabBar/tabBar.css
index 8ee1254f8..b11df4e40 100644
--- a/js/src/views/Application/TabBar/tabBar.css
+++ b/js/src/views/Application/TabBar/tabBar.css
@@ -65,7 +65,7 @@ button.tabactive:hover {
 
 .logo {
   margin: 0 0 0 -24px;
-  padding: 22px 24px 0 24px;
+  padding: 20px 24px;
   white-space: nowrap;
 }
 
@@ -84,6 +84,6 @@ button.tabactive:hover {
 
 .last {
   margin: 0 -24px 0 0;
-  padding: 22px 12px 0 12px;
+  padding: 36px 12px;
   white-space: nowrap;
 }