crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issues that arose from merge

Browse Source
This commit is contained in:
fragosti
2018-06-21 15:39:00 -07:00
parent 3df5882711
commit 82789d5315
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/website/ts/components/onboarding/onboarding_flow.tsx
View File

@@ -42,7 +42,11 @@ export class OnboardingFlow extends React.Component<OnboardingFlowProps> {
onboardingElement = <Animation type="easeUpFromBottom">{this._renderOnboardignCard()}</Animation>; onboardingElement = <Animation type="easeUpFromBottom">{this._renderOnboardignCard()}</Animation>;
} else { } else {
onboardingElement = ( onboardingElement = (
<Popper referenceElement={this._getElementForStep()} placement={this._getCurrentStep().placement}> <Popper
referenceElement={this._getElementForStep()}
placement={this._getCurrentStep().placement}
positionFixed={true}
>
{this._renderPopperChildren.bind(this)} {this._renderPopperChildren.bind(this)}
</Popper> </Popper>
); );

6
packages/website/ts/components/portal/portal.tsx
View File

@@ -226,7 +226,7 @@ export class Portal extends React.Component<PortalProps, PortalState> {
? TokenVisibility.UNTRACKED ? TokenVisibility.UNTRACKED
: TokenVisibility.TRACKED; : TokenVisibility.TRACKED;
return ( return (
<div> <Container position="relative">
<DocumentTitle title="0x Portal DApp" /> <DocumentTitle title="0x Portal DApp" />
<TopBar <TopBar
userAddress={this.props.userAddress} userAddress={this.props.userAddress}
@@ -243,7 +243,7 @@ export class Portal extends React.Component<PortalProps, PortalState> {
style={{ backgroundColor: colors.lightestGrey, position: 'fixed' }} style={{ backgroundColor: colors.lightestGrey, position: 'fixed' }}
maxWidth={LARGE_LAYOUT_MAX_WIDTH} maxWidth={LARGE_LAYOUT_MAX_WIDTH}
/> />
<Container marginTop={TOP_BAR_HEIGHT} minHeight="110vh" backgroundColor={colors.lightestGrey}> <Container marginTop={TOP_BAR_HEIGHT} minHeight="100vh" backgroundColor={colors.lightestGrey}>
<Switch> <Switch>
<Route path={`${WebsitePaths.Portal}/:route`} render={this._renderOtherRoutes.bind(this)} /> <Route path={`${WebsitePaths.Portal}/:route`} render={this._renderOtherRoutes.bind(this)} />
<Route <Route
@@ -288,7 +288,7 @@ export class Portal extends React.Component<PortalProps, PortalState> {
trackedTokenStateByAddress={this.state.trackedTokenStateByAddress} trackedTokenStateByAddress={this.state.trackedTokenStateByAddress}
refetchTokenStateAsync={this._refetchTokenStateAsync.bind(this)} refetchTokenStateAsync={this._refetchTokenStateAsync.bind(this)}
/> />
</div> </Container>
); );
} }
private _renderMainRoute(): React.ReactNode { private _renderMainRoute(): React.ReactNode {