aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website/ts
diff options
context:
space:
mode:
authorfragosti <francesco.agosti93@gmail.com>2018-06-22 06:39:00 +0800
committerfragosti <francesco.agosti93@gmail.com>2018-06-22 08:40:33 +0800
commit82789d53155772e339c1c500bb538638dfc20376 (patch)
tree0e28663936981c1aa285438a57ffb0bcab975e71 /packages/website/ts
parent3df58827119b2dd70a1a41ceccd304b6055500b8 (diff)
downloaddexon-sol-tools-82789d53155772e339c1c500bb538638dfc20376.tar
dexon-sol-tools-82789d53155772e339c1c500bb538638dfc20376.tar.gz
dexon-sol-tools-82789d53155772e339c1c500bb538638dfc20376.tar.bz2
dexon-sol-tools-82789d53155772e339c1c500bb538638dfc20376.tar.lz
dexon-sol-tools-82789d53155772e339c1c500bb538638dfc20376.tar.xz
dexon-sol-tools-82789d53155772e339c1c500bb538638dfc20376.tar.zst
dexon-sol-tools-82789d53155772e339c1c500bb538638dfc20376.zip
Fix issues that arose from merge
Diffstat (limited to 'packages/website/ts')
-rw-r--r--packages/website/ts/components/onboarding/onboarding_flow.tsx6
-rw-r--r--packages/website/ts/components/portal/portal.tsx6
2 files changed, 8 insertions, 4 deletions
diff --git a/packages/website/ts/components/onboarding/onboarding_flow.tsx b/packages/website/ts/components/onboarding/onboarding_flow.tsx
index 331899469..ec8d96191 100644
--- a/packages/website/ts/components/onboarding/onboarding_flow.tsx
+++ b/packages/website/ts/components/onboarding/onboarding_flow.tsx
@@ -42,7 +42,11 @@ export class OnboardingFlow extends React.Component<OnboardingFlowProps> {
onboardingElement = <Animation type="easeUpFromBottom">{this._renderOnboardignCard()}</Animation>;
} else {
onboardingElement = (
- <Popper referenceElement={this._getElementForStep()} placement={this._getCurrentStep().placement}>
+ <Popper
+ referenceElement={this._getElementForStep()}
+ placement={this._getCurrentStep().placement}
+ positionFixed={true}
+ >
{this._renderPopperChildren.bind(this)}
</Popper>
);
diff --git a/packages/website/ts/components/portal/portal.tsx b/packages/website/ts/components/portal/portal.tsx
index ec46fd4cd..8606eed1b 100644
--- a/packages/website/ts/components/portal/portal.tsx
+++ b/packages/website/ts/components/portal/portal.tsx
@@ -226,7 +226,7 @@ export class Portal extends React.Component<PortalProps, PortalState> {
? TokenVisibility.UNTRACKED
: TokenVisibility.TRACKED;
return (
- <div>
+ <Container position="relative">
<DocumentTitle title="0x Portal DApp" />
<TopBar
userAddress={this.props.userAddress}
@@ -243,7 +243,7 @@ export class Portal extends React.Component<PortalProps, PortalState> {
style={{ backgroundColor: colors.lightestGrey, position: 'fixed' }}
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>
<Route path={`${WebsitePaths.Portal}/:route`} render={this._renderOtherRoutes.bind(this)} />
<Route
@@ -288,7 +288,7 @@ export class Portal extends React.Component<PortalProps, PortalState> {
trackedTokenStateByAddress={this.state.trackedTokenStateByAddress}
refetchTokenStateAsync={this._refetchTokenStateAsync.bind(this)}
/>
- </div>
+ </Container>
);
}
private _renderMainRoute(): React.ReactNode {