From fab3a90d5add060f2bfeb1dc470373af03fd6d83 Mon Sep 17 00:00:00 2001 From: Ezekiel Aquino Date: Fri, 14 Dec 2018 12:55:06 +0100 Subject: Adds mission office photo --- .../public/images/@next/about/about-mission@2x.jpg | Bin 148591 -> 0 bytes .../public/images/@next/about/about-office.png | Bin 0 -> 474673 bytes packages/website/ts/@next/components/button.tsx | 6 ++-- packages/website/ts/@next/components/header.tsx | 1 - packages/website/ts/@next/components/siteWrap.tsx | 3 -- packages/website/ts/@next/pages/about/mission.tsx | 34 ++++++++++++++++----- 6 files changed, 30 insertions(+), 14 deletions(-) delete mode 100644 packages/website/public/images/@next/about/about-mission@2x.jpg create mode 100755 packages/website/public/images/@next/about/about-office.png diff --git a/packages/website/public/images/@next/about/about-mission@2x.jpg b/packages/website/public/images/@next/about/about-mission@2x.jpg deleted file mode 100644 index bc701d812..000000000 Binary files a/packages/website/public/images/@next/about/about-mission@2x.jpg and /dev/null differ diff --git a/packages/website/public/images/@next/about/about-office.png b/packages/website/public/images/@next/about/about-office.png new file mode 100755 index 000000000..432d18a8b Binary files /dev/null and b/packages/website/public/images/@next/about/about-office.png differ diff --git a/packages/website/ts/@next/components/button.tsx b/packages/website/ts/@next/components/button.tsx index 4c646e199..fb7c913a5 100644 --- a/packages/website/ts/@next/components/button.tsx +++ b/packages/website/ts/@next/components/button.tsx @@ -2,6 +2,8 @@ import * as React from 'react'; import { Link as ReactRouterLink, NavLink as ReactRouterNavLink } from 'react-router-dom'; import styled from 'styled-components'; +import { ThemeInterface } from 'ts/@next/components/siteWrap'; + import { colors } from 'ts/style/colors'; interface ButtonInterface { @@ -19,9 +21,7 @@ interface ButtonInterface { type?: string; to?: string; onClick?: () => any; - theme?: { - textColor: string; - }; + theme: ThemeInterface; } export const Button = (props: ButtonInterface) => { diff --git a/packages/website/ts/@next/components/header.tsx b/packages/website/ts/@next/components/header.tsx index 881ec799e..fc754af7e 100644 --- a/packages/website/ts/@next/components/header.tsx +++ b/packages/website/ts/@next/components/header.tsx @@ -102,7 +102,6 @@ class HeaderBase extends React.Component { ))} diff --git a/packages/website/ts/@next/components/siteWrap.tsx b/packages/website/ts/@next/components/siteWrap.tsx index e0956c582..cc7e4a098 100644 --- a/packages/website/ts/@next/components/siteWrap.tsx +++ b/packages/website/ts/@next/components/siteWrap.tsx @@ -7,8 +7,6 @@ import { Footer } from 'ts/@next/components/footer'; import { Header } from 'ts/@next/components/header'; import { GlobalStyles } from 'ts/@next/constants/globalStyle'; -// Note(ez): We'll define the theme and provide it via a prop -// e.g. theme dark/light/etc. interface Props { theme?: 'dark' | 'light' | 'gray'; children: any; @@ -22,7 +20,6 @@ interface MainProps { isNavToggled: boolean; } -// we proabbly want to put this somewhere else (themes) export interface ThemeInterface { [key: string]: { bgColor: string; diff --git a/packages/website/ts/@next/pages/about/mission.tsx b/packages/website/ts/@next/pages/about/mission.tsx index b06130345..286d2629f 100644 --- a/packages/website/ts/@next/pages/about/mission.tsx +++ b/packages/website/ts/@next/pages/about/mission.tsx @@ -35,13 +35,14 @@ export const NextAboutMission = () => ( linkLabel="Our mission and values" linkUrl="#" > -
- +
+ + 0x Offices +
@@ -74,3 +75,22 @@ const StyledDefinition = styled(Definition)` border-top: 1px solid #eaeaea; } `; + +const FullWidthImage = styled.figure` + width: 100vw; + margin-left: calc(50% - 50vw); + + img { + width: 100%; + height: 100%; + object-fit: cover; + } + + @media (min-width: 768px) { + height: 500px; + } + + @media (max-width: 768px) { + height: 400px; + } +`; -- cgit v1.2.3