From 82d6f2150b5a96b9effbaf86b9c28abb5b2b750a Mon Sep 17 00:00:00 2001 From: Ezekiel Aquino Date: Fri, 30 Nov 2018 14:35:17 +0100 Subject: Adds wrapGrid, bit of cleanup --- packages/website/ts/@next/components/layout.tsx | 7 ++- packages/website/ts/@next/components/text.tsx | 2 +- packages/website/ts/@next/pages/landing.tsx | 84 ++++++++++--------------- 3 files changed, 41 insertions(+), 52 deletions(-) (limited to 'packages') diff --git a/packages/website/ts/@next/components/layout.tsx b/packages/website/ts/@next/components/layout.tsx index 9bf063040..ce5d6d578 100644 --- a/packages/website/ts/@next/components/layout.tsx +++ b/packages/website/ts/@next/components/layout.tsx @@ -1,4 +1,3 @@ -import * as React from 'react'; import styled from 'styled-components'; interface WrapWidths { @@ -106,6 +105,12 @@ export const WrapCentered = styled(WrapBase)` align-items: center; `; +export const WrapGrid = styled(WrapBase)` + display: flex; + flex-wrap: wrap; + justify-content: center; +`; + export const Column = styled.div` padding: ${props => !props.noPadding && (props.padLarge ? '60px 30px' : '30px')}; border: 1px dotted rgba(255, 0, 0, 0.3); diff --git a/packages/website/ts/@next/components/text.tsx b/packages/website/ts/@next/components/text.tsx index 7954a5f28..6c45cc211 100644 --- a/packages/website/ts/@next/components/text.tsx +++ b/packages/website/ts/@next/components/text.tsx @@ -5,7 +5,7 @@ import { colors } from 'ts/style/colors'; interface HeadingProps { asElement?: 'h1'| 'h2'| 'h3'| 'h4'; - size?: 'default' | 'medium' | 'large'; + size?: 'default' | 'medium' | 'large' | 'small'; center?: boolean; children: Node | string; noMargin?: any; diff --git a/packages/website/ts/@next/pages/landing.tsx b/packages/website/ts/@next/pages/landing.tsx index 69be9ee79..61d07641b 100644 --- a/packages/website/ts/@next/pages/landing.tsx +++ b/packages/website/ts/@next/pages/landing.tsx @@ -1,8 +1,10 @@ import * as React from 'react'; +import * as _ from 'lodash'; +import styled from 'styled-components'; import {colors} from 'ts/style/colors'; import {Button, ButtonWrap} from 'ts/@next/components/button'; -import {Column, Section, Wrap, WrapCentered} from 'ts/@next/components/layout'; +import {Column, Section, Wrap, WrapCentered, WrapGrid} from 'ts/@next/components/layout'; import {SiteWrap} from 'ts/@next/components/siteWrap'; import {Heading, Paragraph} from 'ts/@next/components/text'; @@ -11,6 +13,16 @@ import ProtocolIcon from 'ts/@next/icons/illustrations/protocol.svg'; import IconReadyToBuild from 'ts/@next/icons/illustrations/ready-to-build.svg'; +/** + Note(ez): Maybe when we're done at least with a basic structure, + we can take out each section into e.g. LandingSectionIntro.tsx in + @next/sections/landing ? so then our routes would only look like + + + + + +*/ export const NextLanding = () => (
@@ -41,7 +53,7 @@ export const NextLanding = () => (
-
+
@@ -91,6 +103,18 @@ export const NextLanding = () => (
+
+ + You're in good company + + + + {_.map([...Array(9)], (item, index) => ( + + ))} + +
+
@@ -108,53 +132,13 @@ export const NextLanding = () => (
- -
- - - Powering Decentralized Exchange
- Example of a 2/3 1/3 assymetric composition -
- - - RIGHT IMAGE - -
-
- -
- - - SAMPLE FLUSHED width - - - - RIGHT IMAGE - - -
- -
- - 0x is an open protocol that enables the peer-to-peer exchange of Ethereum-based tokens. Anyone can utilize 0x to service a wide variety of markets ranging from gaming items to traditional financial assets. - - - - - This - - - - is a - - - - three-column module - - -
); + + +const SampleLogo = styled.div` + width: 60px; + height: 60px; + border: 1px solid blue; + margin: 30px 60px; +`; -- cgit