diff --git a/src/components/global-styles.tsx b/src/components/global-styles.tsx index 2746086..9ae0e00 100644 --- a/src/components/global-styles.tsx +++ b/src/components/global-styles.tsx @@ -1,5 +1,5 @@ import React, {FC} from 'react'; -import {Global} from '@emotion/core'; +import {Global, css} from '@emotion/core'; import {raleway, ralewayBold} from '../../lib/constants'; const GlobalStyles: FC = () => { @@ -7,6 +7,13 @@ const GlobalStyles: FC = () => { <> + ); }; diff --git a/src/components/home.tsx b/src/components/home.tsx index fd4366a..e386cbd 100644 --- a/src/components/home.tsx +++ b/src/components/home.tsx @@ -37,7 +37,7 @@ const Home: FC = ({slug}) => { return ( ( href="#focus" sx={{ display: 'inline-block', - fontSize: '1.25rem', - lineHeight: '3rem', + fontSize: '1rem', + lineHeight: '1rem', whiteSpace: 'nowrap', textAlign: ['right', 'left'] }} diff --git a/src/components/nav-bar/nav.tsx b/src/components/nav-bar/nav.tsx index a5df027..e946b07 100644 --- a/src/components/nav-bar/nav.tsx +++ b/src/components/nav-bar/nav.tsx @@ -55,6 +55,12 @@ const NavLink: FC = props => ( const NavItem: FC = props => ; +/* +Nav is currently hard-coded - when and if FOCUS want +different segments on their front page we can use +Sanity to dynamically build the Nav +*/ + const Nav: FC = ({isCollapsed}) => { return ( diff --git a/src/components/theme.tsx b/src/components/theme.tsx index 7d36077..aae02d6 100644 --- a/src/components/theme.tsx +++ b/src/components/theme.tsx @@ -10,6 +10,7 @@ const theme = { monospace: 'Menlo, monospace' }, fontSizes: [15, 16, 20, 28, 35, 50], + // fontSizes: [18.75, 20, 25, 35, 43.75, 62.5], fontWeights: { body: 200, heading: 200, @@ -26,6 +27,7 @@ const theme = { white: '#fff', text: 'rgb(85, 85, 85)', heading: 'hsl(120, 60%, 40%)', + headingLight: 'rgb(51, 204, 51)', background: '#fff' }, images: { @@ -103,7 +105,7 @@ const theme = { marginBottom: 4 }, h3: { - color: 'heading', + color: 'headingLight', fontFamily: 'heading', lineHeight: 'heading', fontWeight: 'heading', diff --git a/src/components/welcome.tsx b/src/components/welcome.tsx index 237cc17..94f2e68 100644 --- a/src/components/welcome.tsx +++ b/src/components/welcome.tsx @@ -64,7 +64,8 @@ const Welcome: FC = ({children, image}) => ( fontWeight: 700, lineHeight: '1.1', fontSize: ['3rem', '3rem', '6rem'], - letterSpacing: [0, '-2pt'] + letterSpacing: [0, '-2pt'], + marginTop: 0 }} > Welcome