From 1b7c9b0775b12a2a1dac4a4a548a32bdf6aeedc8 Mon Sep 17 00:00:00 2001 From: Ezekiel Aquino Date: Tue, 11 Dec 2018 14:21:41 +0100 Subject: WIP about pages --- packages/website/ts/@next/components/footer.tsx | 2 +- packages/website/ts/@next/components/layout.tsx | 4 ++- packages/website/ts/@next/pages/about/jobs.tsx | 28 +++++++++---------- packages/website/ts/@next/pages/about/mission.tsx | 34 ++++++++++++----------- packages/website/ts/@next/pages/about/press.tsx | 4 +-- packages/website/ts/@next/pages/about/team.tsx | 27 ++++++++++-------- 6 files changed, 53 insertions(+), 46 deletions(-) (limited to 'packages/website/ts') 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 = ({}) => ( - + 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
? export const Section = styled.section` 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` 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 = () => ( -
+
Our Mission @@ -66,18 +66,20 @@ export const NextAboutJobs = () => ( Jobs - - Join Us in Our Mission - - - 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. - - Our misson and values +
+ + Join Us in Our Mission + + + 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. + + Our misson and values +
-
+
@@ -98,7 +100,7 @@ export const NextAboutJobs = () => (
-
+
Benefits @@ -125,9 +127,7 @@ export const NextAboutJobs = () => (
- - -
+
Current
Openings @@ -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 = () => ( -
+
Our Mission @@ -22,9 +22,11 @@ export const NextAboutMission = () => ( Jobs - Creating a tokenized world where all value can flow freely. - 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. - Our missions and values +
+ Creating a tokenized world where all value can flow freely. + 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. + Our missions and values +
@@ -35,38 +37,38 @@ export const NextAboutMission = () => (
-
+
Core
Values - + - - + + - + Do The Right Thing 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. - - + + - + Consistently Ship 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. - - + + - + Focus on long-term Impact 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. 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 = () => ( -
+
Our Mission @@ -64,7 +64,7 @@ export const NextAboutPress = () => ( Press Highlights - Want to write about 0x? Get in touch, or download our press kit. + Want to write about 0x? Get in touch, or download our press kit. 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 = () => ( -
+
- - Our Mission - Team - Press - Jobs - + + Our Mission + Team + Press + Jobs + + - We are a global, growing team - 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. - Join the Team +
+ We are a global, growing team + 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. + Join the team +
-- cgit