diff options
author | Fred Carlsen <fred@sjelfull.no> | 2018-12-20 06:59:07 +0800 |
---|---|---|
committer | Fred Carlsen <fred@sjelfull.no> | 2018-12-20 06:59:07 +0800 |
commit | 5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf (patch) | |
tree | aed059ac8540233b7fbd20aa32bc3a0f21734182 /packages/website/ts/@next/pages/landing.tsx | |
parent | aa5c2c249d43c980c06d3a5541233f2407a83371 (diff) | |
parent | 125a940560a01305781bfb6754f52fa64669a6f3 (diff) | |
download | dexon-0x-contracts-5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf.tar dexon-0x-contracts-5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf.tar.gz dexon-0x-contracts-5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf.tar.bz2 dexon-0x-contracts-5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf.tar.lz dexon-0x-contracts-5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf.tar.xz dexon-0x-contracts-5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf.tar.zst dexon-0x-contracts-5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf.zip |
Merge remote-tracking branch 'upstream/feature/website/0x-org' into feature/website/0x-org
# Conflicts:
# packages/website/ts/@next/components/button.tsx
# packages/website/ts/@next/components/definition.tsx
# packages/website/ts/@next/components/hero.tsx
# packages/website/ts/@next/components/sections/landing/about.tsx
# packages/website/ts/@next/pages/market_maker.tsx
Diffstat (limited to 'packages/website/ts/@next/pages/landing.tsx')
-rw-r--r-- | packages/website/ts/@next/pages/landing.tsx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/packages/website/ts/@next/pages/landing.tsx b/packages/website/ts/@next/pages/landing.tsx index 8696cf022..ae560e8e3 100644 --- a/packages/website/ts/@next/pages/landing.tsx +++ b/packages/website/ts/@next/pages/landing.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; -import {SiteWrap} from 'ts/@next/components/siteWrap'; +import { SiteWrap } from 'ts/@next/components/siteWrap'; -import {SectionLandingAbout} from 'ts/@next/components/sections/landing/about'; -import {SectionLandingClients} from 'ts/@next/components/sections/landing/clients'; -import {SectionLandingCta} from 'ts/@next/components/sections/landing/cta'; -import {SectionLandingHero} from 'ts/@next/components/sections/landing/hero'; +import { SectionLandingAbout } from 'ts/@next/components/sections/landing/about'; +import { SectionLandingClients } from 'ts/@next/components/sections/landing/clients'; +import { SectionLandingCta } from 'ts/@next/components/sections/landing/cta'; +import { SectionLandingHero } from 'ts/@next/components/sections/landing/hero'; import { ModalContact } from 'ts/@next/components/modals/modal_contact'; @@ -21,7 +21,7 @@ export class NextLanding extends React.Component<Props> { isContactModalOpen: false, }; public render(): React.ReactNode { - return ( + return ( <SiteWrap theme="dark"> <SectionLandingHero /> <SectionLandingAbout /> @@ -34,9 +34,9 @@ export class NextLanding extends React.Component<Props> { public _onOpenContactModal = (): void => { this.setState({ isContactModalOpen: true }); - } + }; public _onDismissContactModal = (): void => { this.setState({ isContactModalOpen: false }); - } + }; } |