Merge branch 'development' into features/orderwatcher_ws

* development: (107 commits)
  Fix OrderWatcher title to fix sidebar top
  Fix version picker so it doesn't overflow onto two lines
  Fix bug in pull_missing_blocks with incorrect start block (#1438)
  Pull approval events for ZRX and DAI (#1430)
  fix semicolon and apply prettier
  Fix dex order quote/base asset assigning (#1432)
  Apply prettier
  Publish
  Updated CHANGELOGS
  Rename contracts CHANGELOGs to DEPLOYs
  Move Forwarder CHANGELOG entries to extensions CHANGELOG
  Make contracts packages not private
  Publish
  Updated CHANGELOGS
  Show @ price in light grey
  Updated CHANGELOGS
  typeof -> isString
  add special case to scrape OHLCV for eth/usd (#1428)
  run linter
  simplify scaling input logic
  ...

7 files changed, 39 insertions, 21 deletions

diff --git a/packages/website/package.json b/packages/website/package.json
index 5d2e563e9..c24a0ba6e 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/website",
-    "version": "0.0.61",
+    "version": "0.0.63",
     "engines": {
         "node": ">=6.12"
     },
@@ -20,24 +20,24 @@
     "author": "Fabio Berger",
     "license": "Apache-2.0",
     "dependencies": {
-        "@0x/asset-buyer": "^3.0.2",
+        "@0x/asset-buyer": "^3.0.4",
         "@0x/contract-addresses": "^2.0.0",
-        "@0x/contract-wrappers": "^4.1.1",
-        "@0x/json-schemas": "^2.1.2",
-        "@0x/order-utils": "^3.0.4",
-        "@0x/react-docs": "^1.0.20",
-        "@0x/react-shared": "^1.0.23",
-        "@0x/subproviders": "^2.1.6",
-        "@0x/types": "^1.3.0",
-        "@0x/typescript-typings": "^3.0.4",
-        "@0x/utils": "^2.0.6",
-        "@0x/web3-wrapper": "^3.1.6",
+        "@0x/contract-wrappers": "^4.1.3",
+        "@0x/json-schemas": "^2.1.4",
+        "@0x/order-utils": "^3.0.7",
+        "@0x/react-docs": "^1.0.22",
+        "@0x/react-shared": "^1.0.25",
+        "@0x/subproviders": "^2.1.8",
+        "@0x/types": "^1.4.1",
+        "@0x/typescript-typings": "^3.0.6",
+        "@0x/utils": "^2.0.8",
+        "@0x/web3-wrapper": "^3.2.1",
         "accounting": "^0.4.1",
         "basscss": "^8.0.3",
         "blockies": "^0.0.2",
         "bowser": "^1.9.3",
         "deep-equal": "^1.0.1",
-        "ethereum-types": "^1.1.2",
+        "ethereum-types": "^1.1.4",
         "ethereumjs-util": "^5.1.1",
         "find-versions": "^2.0.0",
         "jsonschema": "^1.2.0",
diff --git a/packages/website/public/images/developers/tutorials/integrate_0x_instant.svg b/packages/website/public/images/developers/tutorials/integrate_0x_instant.svg
new file mode 100644
index 000000000..e9c9278a8
--- /dev/null
+++ b/packages/website/public/images/developers/tutorials/integrate_0x_instant.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="39" viewBox="0 0 32 39" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16 1L1 23.242H16L16.0412 38L31 15.7159H16V1Z" stroke="#3289F1" stroke-width="1.5" stroke-miterlimit="10" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/website/translations/english.json b/packages/website/translations/english.json
index 78f29d0f6..2914ffead 100644
--- a/packages/website/translations/english.json
+++ b/packages/website/translations/english.json
@@ -92,6 +92,9 @@
     "ORDER_BASICS_DESCRIPTION": "Tutorial on how to create, validate and fill an order using 0x",
     "USE_NETWORKED_LIQUIDITY": "use networked liquidity",
     "USE_NETWORKED_LIQUIDITY_DESCRIPTION": "Learn how to tap into networked liquidity using the Standard Relayer API",
+    "INTEGRATE_0X_INSTANT": "add seamless purchasing of crypto assets to your website or app",
+    "INTEGRATE_0X_INSTANT_DESCRIPTION":
+        "learn how to use 0x Instant or AssetBuyer to give your users the power of purchasing crypto assets using 0x",
     "VIEW_ALL_DOCUMENTATION": "view all documentation",
     "SANDBOX": "0x.js sandbox",
     "GITHUB": "github",
diff --git a/packages/website/ts/components/documentation/sidebar_header.tsx b/packages/website/ts/components/documentation/sidebar_header.tsx
index 9ced52c74..0ab24ab5e 100644
--- a/packages/website/ts/components/documentation/sidebar_header.tsx
+++ b/packages/website/ts/components/documentation/sidebar_header.tsx
@@ -24,7 +24,7 @@ export const SidebarHeader: React.StatelessComponent<SidebarHeaderProps> = ({
     return (
         <Container>
             <Container className="flex justify-bottom">
-                <Container className="left pl1" width="150px">
+                <Container className="col col-7 pl1">
                     <Text
                         fontColor={colors.lightLinkBlue}
                         fontSize={screenWidth === ScreenWidths.Sm ? '20px' : '22px'}
@@ -37,12 +37,14 @@ export const SidebarHeader: React.StatelessComponent<SidebarHeaderProps> = ({
                 {!_.isUndefined(docsVersion) &&
                     !_.isUndefined(availableDocVersions) &&
                     !_.isUndefined(onVersionSelected) && (
-                        <div className="right" style={{ alignSelf: 'flex-end', paddingBottom: 4 }}>
-                            <VersionDropDown
-                                selectedVersion={docsVersion}
-                                versions={availableDocVersions}
-                                onVersionSelected={onVersionSelected}
-                            />
+                        <div className="col col-5 pl1" style={{ alignSelf: 'flex-end', paddingBottom: 4 }}>
+                            <Container className="right">
+                                <VersionDropDown
+                                    selectedVersion={docsVersion}
+                                    versions={availableDocVersions}
+                                    onVersionSelected={onVersionSelected}
+                                />
+                            </Container>
                         </div>
                     )}
             </Container>
diff --git a/packages/website/ts/containers/order_watcher_documentation.ts b/packages/website/ts/containers/order_watcher_documentation.ts
index ac92e6a22..683e1fe9f 100644
--- a/packages/website/ts/containers/order_watcher_documentation.ts
+++ b/packages/website/ts/containers/order_watcher_documentation.ts
@@ -24,7 +24,7 @@ const docsInfoConfig: DocsInfoConfig = {
     id: DocPackages.OrderWatcher,
     packageName: '@0x/order-watcher',
     type: SupportedDocJson.TypeDoc,
-    displayName: 'OrderWatcher',
+    displayName: 'Order Watcher',
     packageUrl: 'https://github.com/0xProject/0x-monorepo',
     markdownMenu: {
         'getting-started': [markdownSections.introduction, markdownSections.installation],
diff --git a/packages/website/ts/pages/documentation/docs_home.tsx b/packages/website/ts/pages/documentation/docs_home.tsx
index f68d2892f..9dc779e96 100644
--- a/packages/website/ts/pages/documentation/docs_home.tsx
+++ b/packages/website/ts/pages/documentation/docs_home.tsx
@@ -44,6 +44,14 @@ const TUTORIALS: TutorialInfo[] = [
             to: `${WebsitePaths.Wiki}#Find,-Submit,-Fill-Order-From-Relayer`,
         },
     },
+    {
+        iconUrl: '/images/developers/tutorials/integrate_0x_instant.svg',
+        description: Key.Integrate0xInstantDescription,
+        link: {
+            title: Key.Integrate0xInstant,
+            to: `${WebsitePaths.Wiki}#Get-Started-With-Instant`,
+        },
+    },
 ];
 
 const CATEGORY_TO_PACKAGES: ObjectMap<Package[]> = {
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index b20dd7095..2967fdac5 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -474,6 +474,8 @@ export enum Key {
     OrderBasicsDescription = 'ORDER_BASICS_DESCRIPTION',
     UseNetworkedLiquidity = 'USE_NETWORKED_LIQUIDITY',
     UseNetworkedLiquidityDescription = 'USE_NETWORKED_LIQUIDITY_DESCRIPTION',
+    Integrate0xInstant = 'INTEGRATE_0X_INSTANT',
+    Integrate0xInstantDescription = 'INTEGRATE_0X_INSTANT_DESCRIPTION',
     ViewAllDocumentation = 'VIEW_ALL_DOCUMENTATION',
     Sandbox = 'SANDBOX',
     Github = 'GITHUB',