From 6514c34ed8c2ead8fd64244fb5cab0c0f0e7295f Mon Sep 17 00:00:00 2001 From: fragosti Date: Wed, 18 Jul 2018 08:05:19 -0700 Subject: Make topbar zIndex 1 --- packages/website/ts/pages/wiki/wiki.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/website/ts/pages/wiki/wiki.tsx b/packages/website/ts/pages/wiki/wiki.tsx index 55f532b11..268ced773 100644 --- a/packages/website/ts/pages/wiki/wiki.tsx +++ b/packages/website/ts/pages/wiki/wiki.tsx @@ -95,6 +95,7 @@ export class Wiki extends React.Component { menuSubsectionsBySection={menuSubsectionsBySection} translate={this.props.translate} sidebarHeader={sidebarHeader} + style={{ zIndex: 1 }} /> {_.isUndefined(this.state.articlesBySection) ? (
-- cgit v1.2.3 From fc166dea26b55730a43876628c070f3ca0a3f2ed Mon Sep 17 00:00:00 2001 From: fragosti Date: Thu, 19 Jul 2018 07:36:41 -0700 Subject: Add zIndex 1 to topbar and fix issue where no box-shadow present on /docs --- packages/website/ts/components/top_bar/top_bar.tsx | 7 ++++++- packages/website/ts/pages/wiki/wiki.tsx | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) 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 { 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 { private _shouldDisplayBottomBar(): boolean { return ( this._isViewingWiki() || - this._isViewing0xjsDocs() || this._isViewingFAQ() || + this._isViewingDocs() || + this._isViewing0xjsDocs() || this._isViewingSmartContractsDocs() || this._isViewingWeb3WrapperDocs() || this._isViewingSolCompilerDocs() || diff --git a/packages/website/ts/pages/wiki/wiki.tsx b/packages/website/ts/pages/wiki/wiki.tsx index 268ced773..55f532b11 100644 --- a/packages/website/ts/pages/wiki/wiki.tsx +++ b/packages/website/ts/pages/wiki/wiki.tsx @@ -95,7 +95,6 @@ export class Wiki extends React.Component { menuSubsectionsBySection={menuSubsectionsBySection} translate={this.props.translate} sidebarHeader={sidebarHeader} - style={{ zIndex: 1 }} /> {_.isUndefined(this.state.articlesBySection) ? (
-- cgit v1.2.3 From dd9f020c9bad6f7a0475b942a577fff51491aeaa Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 24 Jul 2018 16:29:37 +0200 Subject: Correct next version --- packages/types/CHANGELOG.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/types/CHANGELOG.json b/packages/types/CHANGELOG.json index 002c281bf..3bb06dc84 100644 --- a/packages/types/CHANGELOG.json +++ b/packages/types/CHANGELOG.json @@ -1,6 +1,6 @@ [ { - "version": "1.0.0-rc.2", + "version": "1.0.1-rc.2", "changes": [ { "note": "Remove `ECSignatureBuffer`" -- cgit v1.2.3 From 9592a9a821dc69d6142cf5cf0d93fd3d280b0d00 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 24 Jul 2018 16:44:40 +0200 Subject: Omit specific version of react types --- packages/typescript-typings/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/typescript-typings/package.json b/packages/typescript-typings/package.json index ec64547e4..5d5b442f5 100644 --- a/packages/typescript-typings/package.json +++ b/packages/typescript-typings/package.json @@ -28,7 +28,7 @@ "ethereum-types": "^1.0.0", "bignumber.js": "~4.1.0", "@types/bn.js": "^4.11.0", - "@types/react": "16.3.13", + "@types/react": "*", "popper.js": "1.14.3" }, "devDependencies": { -- cgit v1.2.3 From fac90c446cc3a79ffe57ae13c685e7555714cf23 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Mon, 23 Jul 2018 16:52:05 -0500 Subject: Update orderEpoch comments --- packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol | 2 +- packages/contracts/src/2.0.0/protocol/Exchange/mixins/MExchangeCore.sol | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol index 6f435892b..354d0e9c3 100644 --- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol +++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol @@ -46,7 +46,7 @@ contract MixinExchangeCore is mapping (bytes32 => bool) public cancelled; // Mapping of makerAddress => senderAddress => lowest salt an order can have in order to be fillable - // Orders with specified senderAddress and with a salt less than their epoch to are considered cancelled + // Orders with specified senderAddress and with a salt less than their epoch are considered cancelled mapping (address => mapping (address => uint256)) public orderEpoch; /// @dev Cancels all orders created by makerAddress with a salt less than or equal to the targetOrderEpoch diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MExchangeCore.sol b/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MExchangeCore.sol index 9e3b5a2e2..c165b647c 100644 --- a/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MExchangeCore.sol +++ b/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MExchangeCore.sol @@ -56,7 +56,7 @@ contract MExchangeCore is event CancelUpTo( address indexed makerAddress, // Orders cancelled must have been created by this address. address indexed senderAddress, // Orders cancelled must have a `senderAddress` equal to this address. - uint256 orderEpoch // Orders specified makerAddress and senderAddress with a salt <= this value are considered cancelled. + uint256 orderEpoch // Orders with specified makerAddress and senderAddress with a salt less than this value are considered cancelled. ); /// @dev Updates state with results of a fill order. -- cgit v1.2.3