Merge pull request #1513 from 0xProject/fix/website/multiple-react-do…

…m-versions-et-al

[website] Fix multiple react dom versions and layout issue

packages/react-docs/package.json

@@ -47,13 +47,13 @@
         "compare-versions": "^3.0.1",
         "lodash": "^4.17.5",
         "material-ui": "^0.20.0",
-        "react": "^16.4.2",
-        "react-dom": "^16.4.2",
+        "react": "^16.5.2",
+        "react-dom": "^16.5.2",
         "react-markdown": "^3.2.2",
         "react-scroll": "0xproject/react-scroll#pr-330-and-replace-state",
         "react-tooltip": "^3.2.7",
         "semver": "5.5.0",
-        "styled-components": "^3.3.0"
+        "styled-components": "^4.0.1"
     },
     "publishConfig": {
         "access": "public"

packages/react-shared/package.json

@@ -50,13 +50,13 @@
         "is-mobile": "^0.2.2",
         "lodash": "^4.17.5",
         "material-ui": "^0.20.0",
-        "react": "^16.4.2",
-        "react-dom": "^16.4.2",
+        "react": "^16.5.2",
+        "react-dom": "^16.5.2",
         "react-highlight": "0xproject/react-highlight#2f40a42e0a3f0ad126f9f42d505b97b603fc7162",
         "react-markdown": "^3.2.2",
         "react-router-dom": "^4.1.1",
         "react-scroll": "0xproject/react-scroll#pr-330-and-replace-state",
-        "styled-components": "^3.3.0",
+        "styled-components": "^4.0.1",
         "valid-url": "^1.0.9"
     },
     "publishConfig": {

packages/website/package.json

@@ -54,18 +54,20 @@
         "polished": "^1.9.2",
         "query-string": "^6.0.0",
         "rc-slider": "^8.6.3",
-        "react": "^16.4.2",
+        "react": "^16.5.2",
         "react-copy-to-clipboard": "^5.0.0",
         "react-document-title": "^2.0.3",
-        "react-dom": "^16.4.2",
+        "react-dom": "^16.5.2",
         "react-flickity-component": "^3.1.0",
         "react-headroom": "2.2.2",
         "react-helmet": "^5.2.0",
         "react-lazyload": "^2.3.0",
         "react-loadable": "^5.5.0",
+        "react-markdown": "^4.0.6",
         "react-popper": "^1.0.0-beta.6",
         "react-redux": "^5.0.3",
         "react-responsive": "^6.0.1",
+        "react-router-dom": "^4.3.1",
         "react-scroll": "0xproject/react-scroll#pr-330-and-replace-state",
         "react-scrollable-anchor": "^0.6.1",
         "react-syntax-highlighter": "^10.1.1",

packages/website/public/index.html

@@ -18,6 +18,7 @@
         <link rel="stylesheet" href="/css/roboto.css" />
         <link rel="stylesheet" href="/css/roboto_mono.css" />
         <link rel="stylesheet" href="/css/formular.css" />
+        <link rel="stylesheet" href="/css/basscss.min.css" />
         <link rel="stylesheet" href="/css/basscss_responsive_custom.css" />
         <link rel="stylesheet" href="/css/basscss_responsive_padding.css" />
         <link rel="stylesheet" href="/css/basscss_responsive_margin.css" />

packages/website/ts/index.tsx

@@ -31,7 +31,6 @@ import { NextWhy } from 'ts/pages/why';
 tradeHistoryStorage.clearIfRequired();
 trackedTokenStorage.clearIfRequired();
 
-import 'basscss/css/basscss.css';
 import 'less/all.less';
 
 // We pass modulePromise returning lambda instead of module promise,