aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol2
-rw-r--r--packages/contracts/src/2.0.0/protocol/Exchange/mixins/MExchangeCore.sol2
-rw-r--r--packages/types/CHANGELOG.json11
-rw-r--r--packages/website/ts/components/top_bar/top_bar.tsx7
4 files changed, 9 insertions, 13 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.
diff --git a/packages/types/CHANGELOG.json b/packages/types/CHANGELOG.json
index 06f274828..c40d27014 100644
--- a/packages/types/CHANGELOG.json
+++ b/packages/types/CHANGELOG.json
@@ -1,18 +1,9 @@
[
{
- "version": "1.0.1-rc.2",
- "changes": [
- {
- "note": "Remove `ECSignatureBuffer`"
- }
- ]
- },
- {
- "timestamp": 1532030860,
"version": "1.0.1-rc.1",
"changes": [
{
- "note": "Dependencies updated"
+ "note": "Remove `ECSignatureBuffer`"
}
]
},
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() ||