WIP about pages

6 files changed, 53 insertions, 46 deletions

diff --git a/packages/website/ts/@next/components/footer.tsx b/packages/website/ts/@next/components/footer.tsx
index 0212e0b82..4c6adfae8 100644
--- a/packages/website/ts/@next/components/footer.tsx
+++ b/packages/website/ts/@next/components/footer.tsx
@@ -67,7 +67,7 @@ const linkRows: LinkRows[] = [
 ];
 
 export const Footer: React.StatelessComponent<FooterInterface> = ({}) => (
-    <FooterWrap bgColor="#181818" isNoMargin={true}>
+    <FooterWrap bgColor="#181818" isNoMargin={true} padding={40}>
         <Wrap>
             <FooterColumn width="35%" isNoPadding={true}>
                 <Logo isLight={true} />
diff --git a/packages/website/ts/@next/components/layout.tsx b/packages/website/ts/@next/components/layout.tsx
index 0559d6e3d..fc2a41dd3 100644
--- a/packages/website/ts/@next/components/layout.tsx
+++ b/packages/website/ts/@next/components/layout.tsx
@@ -34,6 +34,7 @@ interface ColumnProps {
     colWidth?: '1/4' | '1/3' | '1/2' | '2/3';
     isNoPadding?: boolean;
     isPadLarge?: boolean;
+    isFlexGrow?: boolean;
     bgColor?: string;
 }
 
@@ -83,7 +84,7 @@ export const Main = styled.main`
 // just <Section asElement?="div/section/footer/header/whatever" /> ?
 export const Section = styled.section<SectionProps>`
     width: ${props => props.isFullWidth ? `calc(100% + ${GUTTER * 2}px)` : '100%'};
-    padding: ${props => !props.isNoPadding && (props.isPadLarge ? `${PADDING_SIZES.large} ${PADDING_SIZES.default}` : PADDING_SIZES.default)};
+    padding: ${props => !props.isNoPadding && (props.isPadLarge ? `${PADDING_SIZES.large}` : PADDING_SIZES.default)};
     background-color: ${props => props.bgColor};
     position: ${props => props.isRelative && 'relative'};
     overflow: ${props => props.isRelative && 'hidden'};
@@ -136,6 +137,7 @@ export const WrapGrid = styled(WrapBase)`
 
 export const Column = styled.div<ColumnProps>`
     background-color: ${props => props.bgColor};
+    flex-grow: ${props => props.isFlexGrow && 1};
 
     @media (min-width: ${BREAKPOINTS.mobile}) {
         padding: ${props => !props.isNoPadding && (props.isPadLarge ? `${PADDING_SIZES.large} ${PADDING_SIZES.default}` : PADDING_SIZES.default)};
diff --git a/packages/website/ts/@next/pages/about/jobs.tsx b/packages/website/ts/@next/pages/about/jobs.tsx
index 3089dfab3..0146995a5 100644
--- a/packages/website/ts/@next/pages/about/jobs.tsx
+++ b/packages/website/ts/@next/pages/about/jobs.tsx
@@ -57,7 +57,7 @@ const Position = ({ position }) => (
 
 export const NextAboutJobs = () => (
   <SiteWrap theme="light">
-    <Section>
+    <Section isPadLarge={true}>
       <Wrap>
          <Column colWidth="1/3">
             <ChapterLink to="/next/about/mission">Our Mission</ChapterLink>
@@ -66,18 +66,20 @@ export const NextAboutJobs = () => (
             <ChapterLink to="/next/about/jobs">Jobs</ChapterLink>
         </Column>
         <Column colWidth="2/3">
-            <Heading size="medium">
-                Join Us in Our Mission
-            </Heading>
-            <Paragraph size="medium">
-                To create a tokenized world where all value can flow freely.We are powering a growing ecosystem of decentralized applications and solving novel challenges to make our technology intuitive, flexible, and accessible to all. Read more about our mission, and join us in building financial infrastructure upon which the exchange of anything of value will take place.
-            </Paragraph>
-            <Link href="#">Our misson and values</Link>
+          <div style={{ maxWidth: '680px' }}>
+              <Heading size="medium">
+                  Join Us in Our Mission
+              </Heading>
+              <Paragraph size="medium">
+                  To create a tokenized world where all value can flow freely. We are powering a growing ecosystem of decentralized applications and solving novel challenges to make our technology intuitive, flexible, and accessible to all. Read more about our mission, and join us in building financial infrastructure upon which the exchange of anything of value will take place.
+              </Paragraph>
+              <Link href="#">Our misson and values</Link>
+            </div>
         </Column>
       </Wrap>
     </Section>
 
-    <Section bgColor="#F3F6F4">
+    <Section bgColor="#F3F6F4" isPadLarge={true}>
         <Wrap>
             <Column colWidth="1/3">
                 <Heading size="medium" isNoMargin={true}>
@@ -98,7 +100,7 @@ export const NextAboutJobs = () => (
         </Wrap>
     </Section>
 
-    <Section>
+    <Section isPadLarge={true}>
       <Wrap>
         <Column colWidth="1/3">
             <Heading size="medium">Benefits</Heading>
@@ -125,9 +127,7 @@ export const NextAboutJobs = () => (
       </Wrap>
     </Section>
 
-    <Separator/>
-
-    <Section>
+    <Section isPadLarge={true}>
       <Wrap>
         <Column colWidth="1/3">
             <Heading size="medium">Current<br/>Openings</Heading>
@@ -150,4 +150,4 @@ const BenefitsList = styled.ul`
     li {
         margin-bottom: 1em;
     }
-`;
\ No newline at end of file
+`;
diff --git a/packages/website/ts/@next/pages/about/mission.tsx b/packages/website/ts/@next/pages/about/mission.tsx
index 1d60d4373..aee49351a 100644
--- a/packages/website/ts/@next/pages/about/mission.tsx
+++ b/packages/website/ts/@next/pages/about/mission.tsx
@@ -2,18 +2,18 @@ import * as React from 'react';
 import { Link as ReactRouterLink } from 'react-router-dom';
 import styled from 'styled-components';
 
+import { Link } from 'ts/@next/components/button';
 import { ChapterLink } from 'ts/@next/components/chapter_link';
 import { Icon } from 'ts/@next/components/icon';
 import { Image } from 'ts/@next/components/image';
 import { Column, Section, Wrap } from 'ts/@next/components/layout';
-import { Link } from 'ts/@next/components/link';
 import { Separator } from 'ts/@next/components/separator';
 import { SiteWrap } from 'ts/@next/components/siteWrap';
 import { Heading, Paragraph } from 'ts/@next/components/text';
 
 export const NextAboutMission = () => (
   <SiteWrap theme="light">
-    <Section>
+    <Section isPadLarge={true}>
       <Wrap>
          <Column colWidth="1/3">
             <ChapterLink to="/next/about/mission">Our Mission</ChapterLink>
@@ -22,9 +22,11 @@ export const NextAboutMission = () => (
             <ChapterLink to="/next/about/jobs">Jobs</ChapterLink>
         </Column>
         <Column colWidth="2/3">
-            <Heading size="medium">Creating a tokenized world where all value can flow freely.</Heading>
-            <Paragraph size="medium">0x Protocol is an important infrastructure layer for the emerging crypto economy and enables markets to be created that couldn't have existed before. As more assets become tokenized, public blockchains provide the opportunity to establish a new financial stack that is more efficient, transparent, and equitable than any system in the past.</Paragraph>
-            <Link href="/mission">Our missions and values</Link>
+            <div style={{ maxWidth: '680px '}}>
+                <Heading size="medium">Creating a tokenized world where all value can flow freely.</Heading>
+                <Paragraph size="medium" marginBottom="60px">0x Protocol is an important infrastructure layer for the emerging crypto economy and enables markets to be created that couldn't have existed before. As more assets become tokenized, public blockchains provide the opportunity to establish a new financial stack that is more efficient, transparent, and equitable than any system in the past.</Paragraph>
+                <Link href="/mission" isNoBorder={true} isWithArrow={true}>Our missions and values</Link>
+            </div>
         </Column>
       </Wrap>
     </Section>
@@ -35,38 +37,38 @@ export const NextAboutMission = () => (
         </Wrap>
     </Section>
 
-    <Section>
+    <Section isPadLarge={true}>
       <Wrap>
         <Column colWidth="1/3">
             <Heading size="medium">Core<br/>Values</Heading>
         </Column>
 
-        <Column colWidth="2/3">
+        <Column colWidth="2/3" isNoPadding={true}>
             <Wrap>
-                <Column colWidth="1/3">
-                    <Icon name="right-thing" size={100} />
+                <Column colWidth="1/4">
+                    <Icon name="right-thing" size={120} />
                 </Column>
-                <Column colWidth="2/3">
+                <Column colWidth="2/3" isFlexGrow={true}>
                     <Heading>Do The Right Thing</Heading>
                     <Paragraph isMuted={true}>We acknowledge the broad subjectivity behind doing “the right thing,” and are committed to rigorously exploring its nuance in our decision making. We believe this responsibility drives our decision making above all else, and pledge to act in the best interest of our peers, community, and society as a whole.</Paragraph>
                 </Column>
             </Wrap>
             <Separator/>
             <Wrap>
-                <Column colWidth="1/3">
-                    <Icon name="consistently-ship" size={100} />
+                <Column colWidth="1/4">
+                    <Icon name="consistently-ship" size={120} />
                 </Column>
-                <Column colWidth="2/3">
+                <Column colWidth="2/3" isFlexGrow={true}>
                     <Heading>Consistently Ship</Heading>
                     <Paragraph isMuted={true}>Achieving our mission requires dedication and diligence. We aspire to be an organization that consistently ships. We set high-impact goals that are rooted in data and pride ourselves in consistently outputting outstanding results across the organization.</Paragraph>
                 </Column>
             </Wrap>
             <Separator/>
             <Wrap>
-                <Column colWidth="1/3">
-                    <Icon name="long-term-impact" size={100} />
+                <Column colWidth="1/4">
+                    <Icon name="long-term-impact" size={120} />
                 </Column>
-                <Column colWidth="2/3">
+                <Column colWidth="2/3" isFlexGrow={true}>
                     <Heading>Focus on long-term Impact</Heading>
                     <Paragraph isMuted={true}>We anticipate that over time, awareness of the fundamentally disruptive nature of frictionless global exchange will cause some to see this technology as a threat. There will be setbacks, some will claim that this technology is too disruptive, and we will face adversity. Persistence and a healthy long-term focus will see us through these battles.</Paragraph>
                 </Column>
diff --git a/packages/website/ts/@next/pages/about/press.tsx b/packages/website/ts/@next/pages/about/press.tsx
index 80307a98f..e03505635 100644
--- a/packages/website/ts/@next/pages/about/press.tsx
+++ b/packages/website/ts/@next/pages/about/press.tsx
@@ -54,7 +54,7 @@ const Highlight = ({ highlight }) => (
 
 export const NextAboutPress = () => (
   <SiteWrap theme="light">
-    <Section>
+    <Section isPadLarge={true}>
       <Wrap>
          <Column colWidth="1/3">
             <ChapterLink to="/next/about/mission">Our Mission</ChapterLink>
@@ -64,7 +64,7 @@ export const NextAboutPress = () => (
         </Column>
         <Column colWidth="2/3">
             <Heading size="medium">Press Highlights</Heading>
-            <Paragraph size="medium">Want to write about 0x? Get in touch, or download our press kit.</Paragraph>
+            <Paragraph size="medium" marginBottom="60px">Want to write about 0x? Get in touch, or download our press kit.</Paragraph>
 
             <Separator/>
 
diff --git a/packages/website/ts/@next/pages/about/team.tsx b/packages/website/ts/@next/pages/about/team.tsx
index c8764b033..20b5a49eb 100644
--- a/packages/website/ts/@next/pages/about/team.tsx
+++ b/packages/website/ts/@next/pages/about/team.tsx
@@ -1,13 +1,13 @@
+import * as _ from 'lodash/core';
 import * as React from 'react';
 import { Link as ReactRouterLink } from 'react-router-dom';
 import styled from 'styled-components';
-import * as _ from 'lodash/core';
 
 import { colors } from 'ts/style/colors';
 
+import { Link } from 'ts/@next/components/button';
 import { ChapterLink } from 'ts/@next/components/chapter_link';
 import { Column, Section, Wrap } from 'ts/@next/components/layout';
-import { Link } from 'ts/@next/components/link';
 import { SiteWrap } from 'ts/@next/components/siteWrap';
 import { Heading, Paragraph } from 'ts/@next/components/text';
 
@@ -153,18 +153,21 @@ const Member = ({ name, title, imageUrl }: TeamMember) => (
 
 export const NextAboutTeam = () => (
   <SiteWrap theme="light">
-    <Section>
+    <Section isPadLarge={true}>
       <Wrap>
-         <Column colWidth="1/3">
-            <ChapterLink to="/next/about/mission">Our Mission</ChapterLink>
-            <ChapterLink to="/next/about/team">Team</ChapterLink>
-            <ChapterLink to="/next/about/press">Press</ChapterLink>
-            <ChapterLink to="/next/about/jobs">Jobs</ChapterLink>
-        </Column>
+          <Column colWidth="1/3">
+             <ChapterLink to="/next/about/mission">Our Mission</ChapterLink>
+             <ChapterLink to="/next/about/team">Team</ChapterLink>
+             <ChapterLink to="/next/about/press">Press</ChapterLink>
+             <ChapterLink to="/next/about/jobs">Jobs</ChapterLink>
+         </Column>
+
         <Column colWidth="2/3">
-            <Heading size="medium">We are a global, growing team</Heading>
-            <Paragraph size="medium">We are a distributed team with backgrounds in engineering, academic research, business, and design. The 0x Core Team is passionate about accelerating the adoption decentralized technology and believe in its potential to be an equalizing force in the world. Join us and do the most impactful work of your life.</Paragraph>
-            <Link href="#">Join the Team</Link>
+            <div style={{ maxWidth: '680px' }}>
+                <Heading size="medium">We are a global, growing team</Heading>
+                <Paragraph size="medium" marginBottom="60px">We are a distributed team with backgrounds in engineering, academic research, business, and design. The 0x Core Team is passionate about accelerating the adoption decentralized technology and believe in its potential to be an equalizing force in the world. Join us and do the most impactful work of your life.</Paragraph>
+                <Link href="/mission" isNoBorder={true} isWithArrow={true}>Join the team</Link>
+            </div>
         </Column>
       </Wrap>
     </Section>