diff options
author | Fabio Berger <me@fabioberger.com> | 2018-05-22 04:38:12 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-05-22 04:38:12 +0800 |
commit | 0fdf32cf6f0f1def41a1733687e977feb3a652f5 (patch) | |
tree | b62110db354e7e221548b6dd95215ffbf00573af /packages/website | |
parent | c70540e7f4ead1f25d1436de3b4dcda06c3e1e68 (diff) | |
parent | a26cc7c14d4e59102d5f84d534f75c42b8683cad (diff) | |
download | dexon-0x-contracts-0fdf32cf6f0f1def41a1733687e977feb3a652f5.tar dexon-0x-contracts-0fdf32cf6f0f1def41a1733687e977feb3a652f5.tar.gz dexon-0x-contracts-0fdf32cf6f0f1def41a1733687e977feb3a652f5.tar.bz2 dexon-0x-contracts-0fdf32cf6f0f1def41a1733687e977feb3a652f5.tar.lz dexon-0x-contracts-0fdf32cf6f0f1def41a1733687e977feb3a652f5.tar.xz dexon-0x-contracts-0fdf32cf6f0f1def41a1733687e977feb3a652f5.tar.zst dexon-0x-contracts-0fdf32cf6f0f1def41a1733687e977feb3a652f5.zip |
merge development
Diffstat (limited to 'packages/website')
-rw-r--r-- | packages/website/package.json | 3 | ||||
-rw-r--r-- | packages/website/ts/components/top_bar/top_bar.tsx | 6 | ||||
-rw-r--r-- | packages/website/ts/pages/about/about.tsx | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/packages/website/package.json b/packages/website/package.json index f1b2a1750..3ef66d269 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/website", "version": "0.0.32", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "private": true, "description": "Website and 0x portal dapp", @@ -80,6 +80,7 @@ "imports-loader": "0.6.x", "json-loader": "^0.5.4", "less-loader": "^2.2.3", + "make-promises-safe": "^1.1.0", "raw-loader": "^0.5.1", "shx": "^0.2.2", "source-map-loader": "^0.1.6", diff --git a/packages/website/ts/components/top_bar/top_bar.tsx b/packages/website/ts/components/top_bar/top_bar.tsx index 2c3273dee..f2d0c6177 100644 --- a/packages/website/ts/components/top_bar/top_bar.tsx +++ b/packages/website/ts/components/top_bar/top_bar.tsx @@ -152,12 +152,6 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> { primaryText={this.props.translate.get(Key.Web3Wrapper, Deco.CapWords)} /> </Link>, - <Link key="subMenuItem-order-utils" to={WebsitePaths.OrderUtils} className="text-decoration-none"> - <MenuItem - style={{ fontSize: styles.menuItem.fontSize }} - primaryText={this.props.translate.get(Key.OrderUtils, Deco.CapWords)} - /> - </Link>, <Link key="subMenuItem-sol-compiler" to={WebsitePaths.SolCompiler} className="text-decoration-none"> <MenuItem style={{ fontSize: styles.menuItem.fontSize }} diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx index 24ea7614f..ac67ca968 100644 --- a/packages/website/ts/pages/about/about.tsx +++ b/packages/website/ts/pages/about/about.tsx @@ -151,7 +151,7 @@ const teamRow5: ProfileInfo[] = [ }, { name: 'Francesco Agosti', - title: 'Engineer', + title: 'Senior Frontend Engineer', description: `Full-stack engineer. Previously senior software engineer at Yelp. Computer Science at Duke.`, image: 'images/team/fragosti.png', linkedIn: 'https://www.linkedin.com/in/fragosti/', |