Merge development

4 files changed, 18 insertions, 24 deletions

diff --git a/packages/website/less/all.less b/packages/website/less/all.less
index 5d1dccc98..d288b182b 100644
--- a/packages/website/less/all.less
+++ b/packages/website/less/all.less
@@ -88,13 +88,6 @@ code {
         color: #1d5cde; // linkBlue
     }
 
-    h1,
-    h2,
-    h3,
-    h4 {
-        padding-top: 15px;
-    }
-
     p,
     blockquote,
     ol,
diff --git a/packages/website/package.json b/packages/website/package.json
index ce7ed395f..77295d4de 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/website",
-    "version": "0.0.67",
+    "version": "0.0.70",
     "engines": {
         "node": ">=6.12"
     },
@@ -20,18 +20,18 @@
     "author": "Fabio Berger",
     "license": "Apache-2.0",
     "dependencies": {
-        "@0x/asset-buyer": "^4.0.2",
-        "@0x/contract-addresses": "^2.2.0",
-        "@0x/contract-wrappers": "^5.0.1",
-        "@0x/json-schemas": "^2.1.7",
-        "@0x/order-utils": "^3.1.2",
-        "@0x/react-docs": "^1.0.25",
-        "@0x/react-shared": "^1.1.2",
-        "@0x/subproviders": "^2.1.11",
-        "@0x/types": "^1.5.2",
-        "@0x/typescript-typings": "^3.0.8",
-        "@0x/utils": "^3.0.1",
-        "@0x/web3-wrapper": "^3.2.4",
+        "@0x/asset-buyer": "^5.0.2",
+        "@0x/contract-addresses": "^2.2.1",
+        "@0x/contract-wrappers": "^7.0.1",
+        "@0x/json-schemas": "^3.0.1",
+        "@0x/order-utils": "^6.0.0",
+        "@0x/react-docs": "^2.0.2",
+        "@0x/react-shared": "^2.0.2",
+        "@0x/subproviders": "^3.0.1",
+        "@0x/types": "^2.0.1",
+        "@0x/typescript-typings": "^4.0.0",
+        "@0x/utils": "^4.0.2",
+        "@0x/web3-wrapper": "^4.0.1",
         "@reach/dialog": "^0.1.2",
         "@types/react-lazyload": "^2.3.1",
         "@types/react-loadable": "^5.4.2",
@@ -42,7 +42,7 @@
         "blockies": "^0.0.2",
         "bowser": "^1.9.3",
         "deep-equal": "^1.0.1",
-        "ethereum-types": "^1.1.6",
+        "ethereum-types": "^2.0.0",
         "ethereumjs-util": "^5.1.1",
         "find-versions": "^2.0.0",
         "jsonschema": "^1.2.0",
@@ -97,7 +97,7 @@
         "@types/rc-slider": "^8.6.0",
         "@types/react": "^16.7.7",
         "@types/react-copy-to-clipboard": "^4.2.0",
-        "@types/react-dom": "^16.0.7",
+        "@types/react-dom": "^16.0.6",
         "@types/react-helmet": "^5.0.6",
         "@types/react-redux": "^4.4.37",
         "@types/react-scroll": "1.5.3",
diff --git a/packages/website/ts/components/mobileNav.tsx b/packages/website/ts/components/mobileNav.tsx
index d43bbe50e..1aa826755 100644
--- a/packages/website/ts/components/mobileNav.tsx
+++ b/packages/website/ts/components/mobileNav.tsx
@@ -6,6 +6,7 @@ import { Link } from 'react-router-dom';
 
 import { WrapGrid, WrapProps } from 'ts/components/newLayout';
 import { WebsitePaths } from 'ts/types';
+import { constants } from 'ts/utils/constants';
 
 interface Props {
     isToggled: boolean;
@@ -41,7 +42,7 @@ export class MobileNav extends React.PureComponent<Props> {
                                 <Link to={WebsitePaths.AboutMission}>About</Link>
                             </li>
                             <li>
-                                <a href="https://blog.0xproject.com/latest" target="_blank">
+                                <a href={constants.URL_BLOG} target="_blank">
                                     Blog
                                 </a>
                             </li>
diff --git a/packages/website/ts/utils/constants.ts b/packages/website/ts/utils/constants.ts
index ada8de549..03c1a0b83 100644
--- a/packages/website/ts/utils/constants.ts
+++ b/packages/website/ts/utils/constants.ts
@@ -74,7 +74,7 @@ export const constants = {
     URL_ANGELLIST: 'https://angel.co/0xproject/jobs',
     URL_APACHE_LICENSE: 'http://www.apache.org/licenses/LICENSE-2.0',
     URL_BITLY_API: 'https://api-ssl.bitly.com',
-    URL_BLOG: 'https://blog.0xproject.com/latest',
+    URL_BLOG: 'https://blog.0xproject.com',
     URL_DISCOURSE_FORUM: 'https://forum.0x.org',
     URL_ECOSYSTEM_APPLY: 'https://0x.smapply.io/',
     URL_ECOSYSTEM_BLOG_POST: 'https://blog.0xproject.com/announcing-the-0x-ecosystem-acceleration-program-89d1cb89d565',