diff options
Diffstat (limited to 'packages/website')
| -rw-r--r-- | packages/website/package.json | 19 | ||||
| -rw-r--r-- | packages/website/ts/components/top_bar/top_bar.tsx | 7 |
2 files changed, 14 insertions, 12 deletions
diff --git a/packages/website/package.json b/packages/website/package.json index 99fd7cff3..8bea3aa89 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/website", - "version": "0.0.39", + "version": "0.0.40", "engines": { "node": ">=6.12" }, @@ -11,25 +11,22 @@ "clean": "shx rm -f public/bundle*", "lint": "tslint --project . 'ts/**/*.ts' 'ts/**/*.tsx'", "watch_without_deps": "webpack-dev-server --content-base public --https", - "deploy_dogfood": - "npm run build; aws s3 sync ./public/. s3://dogfood.0xproject.com --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers", - "deploy_staging": - "npm run build; aws s3 sync ./public/. s3://staging-0xproject --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers", - "deploy_live": - "DEPLOY_ROLLBAR_SOURCEMAPS=true npm run build; aws s3 sync ./public/. s3://0xproject.com --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --exclude *.map.js" + "deploy_dogfood": "npm run build; aws s3 sync ./public/. s3://dogfood.0xproject.com --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers", + "deploy_staging": "npm run build; aws s3 sync ./public/. s3://staging-0xproject --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers", + "deploy_live": "DEPLOY_ROLLBAR_SOURCEMAPS=true npm run build; aws s3 sync ./public/. s3://0xproject.com --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --exclude *.map.js" }, "author": "Fabio Berger", "license": "Apache-2.0", "dependencies": { "@0xproject/contract-wrappers": "^0.0.5", "@0xproject/order-utils": "^0.0.9", - "@0xproject/react-docs": "^1.0.0", + "@0xproject/react-docs": "^1.0.1", "@0xproject/react-shared": "^0.2.3", - "@0xproject/subproviders": "^1.0.0", + "@0xproject/subproviders": "^1.0.1", "@0xproject/types": "^0.8.1", "@0xproject/typescript-typings": "^0.4.3", - "@0xproject/utils": "^1.0.0", - "@0xproject/web3-wrapper": "^1.0.0", + "@0xproject/utils": "^1.0.1", + "@0xproject/web3-wrapper": "^1.0.1", "accounting": "^0.4.1", "basscss": "^8.0.3", "blockies": "^0.0.2", diff --git a/packages/website/ts/components/top_bar/top_bar.tsx b/packages/website/ts/components/top_bar/top_bar.tsx index 63ea3475a..646d3fc94 100644 --- a/packages/website/ts/components/top_bar/top_bar.tsx +++ b/packages/website/ts/components/top_bar/top_bar.tsx @@ -59,6 +59,7 @@ const styles: Styles = { position: 'relative', top: 0, paddingBottom: 1, + zIndex: 1, }, bottomBar: { boxShadow: 'rgba(0, 0, 0, 0.187647) 0px 1px 3px', @@ -481,6 +482,9 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> { private _isViewingPortal(): boolean { return _.includes(this.props.location.pathname, WebsitePaths.Portal); } + private _isViewingDocs(): boolean { + return _.includes(this.props.location.pathname, WebsitePaths.Docs); + } private _isViewingFAQ(): boolean { return _.includes(this.props.location.pathname, WebsitePaths.FAQ); } @@ -523,8 +527,9 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> { private _shouldDisplayBottomBar(): boolean { return ( this._isViewingWiki() || - this._isViewing0xjsDocs() || this._isViewingFAQ() || + this._isViewingDocs() || + this._isViewing0xjsDocs() || this._isViewingSmartContractsDocs() || this._isViewingWeb3WrapperDocs() || this._isViewingSolCompilerDocs() || |