aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfragosti <francesco.agosti93@gmail.com>2018-08-31 02:37:58 +0800
committerfragosti <francesco.agosti93@gmail.com>2018-08-31 02:49:27 +0800
commitb1f97a27f3b0114ee1d9e648e0365932217c8dc8 (patch)
treee669e0dac92ec409e3f190d639bbb5ee5118d967
parentfebddcb356de32c29ff45e885a0c202a03e064cf (diff)
downloaddexon-sol-tools-b1f97a27f3b0114ee1d9e648e0365932217c8dc8.tar
dexon-sol-tools-b1f97a27f3b0114ee1d9e648e0365932217c8dc8.tar.gz
dexon-sol-tools-b1f97a27f3b0114ee1d9e648e0365932217c8dc8.tar.bz2
dexon-sol-tools-b1f97a27f3b0114ee1d9e648e0365932217c8dc8.tar.lz
dexon-sol-tools-b1f97a27f3b0114ee1d9e648e0365932217c8dc8.tar.xz
dexon-sol-tools-b1f97a27f3b0114ee1d9e648e0365932217c8dc8.tar.zst
dexon-sol-tools-b1f97a27f3b0114ee1d9e648e0365932217c8dc8.zip
Final tweaks
-rw-r--r--packages/website/ts/components/ui/button.tsx1
-rw-r--r--packages/website/ts/components/ui/typed_text.tsx1
-rw-r--r--packages/website/ts/pages/landing/landing.tsx26
3 files changed, 17 insertions, 11 deletions
diff --git a/packages/website/ts/components/ui/button.tsx b/packages/website/ts/components/ui/button.tsx
index 2952c8859..75ba7bcff 100644
--- a/packages/website/ts/components/ui/button.tsx
+++ b/packages/website/ts/components/ui/button.tsx
@@ -96,4 +96,5 @@ export const CallToAction: React.StatelessComponent<CallToActionProps> = ({
CallToAction.defaultProps = {
type: 'dark',
fontSize: '14px',
+ padding: '0.9em 1.6em',
};
diff --git a/packages/website/ts/components/ui/typed_text.tsx b/packages/website/ts/components/ui/typed_text.tsx
index a59309139..2bb2d40b0 100644
--- a/packages/website/ts/components/ui/typed_text.tsx
+++ b/packages/website/ts/components/ui/typed_text.tsx
@@ -35,6 +35,7 @@ export class TypedText extends React.Component<TypedTextProps, TypedTextState> {
wordDelayMs,
avgKeystrokeDelayMs,
stdKeystrokeDelay,
+ // tslint:disable-next-line
...textProps
} = this.props;
const { cycleCount } = this.state;
diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index fc4194849..5a82576a1 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -61,7 +61,7 @@ const ROTATING_LIST = [
'derivatives',
'loans',
'cats',
- 'Everything.',
+ 'everything',
];
>>>>>>> Add TypedText component and use it on landing page
@@ -170,8 +170,10 @@ export class Landing extends React.Component<LandingProps, LandingState> {
}
private _renderHero(): React.ReactNode {
const isSmallScreen = this.state.screenWidth === ScreenWidths.Sm;
- const left = 'col lg-col-7 md-col-7 col-12 lg-pl4 md-pl4 sm-pl0 sm-px3 sm-center';
- const flexClassName = isSmallScreen ? 'flex items-center flex-column' : 'flex items-center';
+ const left = 'col lg-col-6 md-col-6 col-12 lg-pl4 md-pl4 sm-pl0 sm-px3 sm-center';
+ const flexClassName = isSmallScreen
+ ? 'flex items-center flex-column justify-center'
+ : 'flex items-center justify-center';
return (
<div className="clearfix py4" style={{ backgroundColor: colors.heroGrey }}>
<div className="mx-auto max-width-4 clearfix">
@@ -194,7 +196,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
display="inline-block"
fontColor={colors.grey300}
fontWeight={500}
- lineHeight="1.2em"
+ lineHeight="1.3em"
fontSize={isSmallScreen ? '28px' : '36px'}
>
{this.props.translate.get(Key.TopHeader, Deco.Cap)}
@@ -207,7 +209,7 @@ export class Landing extends React.Component<LandingProps, LandingState> {
display="inline-block"
fontColor={colors.white}
fontWeight={700}
- lineHeight="1.2em"
+ lineHeight="1.3em"
fontSize={isSmallScreen ? '28px' : '36px'}
textList={ROTATING_LIST}
shouldRepeat={true}
@@ -215,17 +217,19 @@ export class Landing extends React.Component<LandingProps, LandingState> {
</React.Fragment>
)}
</Text>
- <Container className="pt3 clearfix sm-mx-auto" maxWidth="390px">
- <div className="lg-pr2 md-pr2 lg-col lg-col-6 sm-center sm-col sm-col-12 mb2">
+ <Container
+ className={`pt3 flex clearfix sm-mx-auto ${isSmallScreen ? 'justify-center' : ''}`}
+ >
+ <Container paddingRight="20px">
<Link to={WebsitePaths.ZeroExJs} className="text-decoration-none">
- <CallToAction width="175px" type="light">
+ <CallToAction type="light">
{this.props.translate.get(Key.BuildCallToAction, Deco.Cap)}
</CallToAction>
</Link>
- </div>
- <div className="lg-col lg-col-6 sm-center sm-col sm-col-12">
+ </Container>
+ <div>
<Link to={WebsitePaths.Portal} className="text-decoration-none">
- <CallToAction width="175px">
+ <CallToAction>
{this.props.translate.get(Key.TradeCallToAction, Deco.Cap)}
</CallToAction>
</Link>