From feac738425b3a37ca6a85adfe6e4189dcdf1c0ad Mon Sep 17 00:00:00 2001 From: legitmaxwu Date: Sat, 18 May 2019 12:35:58 -0700 Subject: [PATCH] final version --- src/components/HoverPhoto.tsx | 13 +++++++-- src/pages/index.tsx | 55 ++--------------------------------- src/utils/typography.js | 2 +- 3 files changed, 14 insertions(+), 56 deletions(-) diff --git a/src/components/HoverPhoto.tsx b/src/components/HoverPhoto.tsx index 8c1561b..76c1a83 100644 --- a/src/components/HoverPhoto.tsx +++ b/src/components/HoverPhoto.tsx @@ -58,13 +58,17 @@ const PerformerPic = styled('div')` &:active ${PerformerHover} { opacity: 1; } + @media only screen and (max-width: 900px) { + ${PerformerHover} { + } + } overflow-y: hidden; ` const ArtistName = styled('p')` font-family: Bebas Neue, Oswald, sans-serif; - /* font-size: 64px; */ - @media only screen and (max-width: 900px) { + font-size: 56px; + @media only screen and (max-width: 1250px) { font-size: 48px; } margin-bottom: 15px; @@ -154,7 +158,10 @@ export class HoverPhoto extends React.Component {this.props.item.artist.toUpperCase()} diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 88e9662..5e1516d 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -70,59 +70,11 @@ export const query = graphql` } ` -const TESTPROPS = [ - { - artist: 'hi', - author: 'hi2', - explainer: 'ex3', - imageURL: - 'https://upload.wikimedia.org/wikipedia/commons/thumb/4/47/PNG_transparency_demonstration_1.png/280px-PNG_transparency_demonstration_1.png', - link: '/', - }, - { - artist: 'hAHAAHA', - author: 'hi2', - explainer: 'ex3', - imageURL: 'lol', - link: '/', - }, - { - artist: 'custom artist names!', - author: 'hi2', - explainer: 'ex3', - imageURL: 'lol', - link: '/', - }, - { - artist: 'look another artist', - author: 'hi2', - explainer: 'ex3', - imageURL: 'lol', - link: '/', - }, - { - artist: 'passing in props is cool!', - author: 'hi2', - explainer: 'ex3', - imageURL: 'lol', - link: '/', - }, - { - artist: 'hAHAAHA', - author: 'hi2', - explainer: 'ex3', - imageURL: 'lol', - link: '/', - }, -] - const IndexPage = ({ data }) => { - // AOS.init() - return (
- {/*
*/} - {/* */} + {typeof document !== `undefined` && document.addEventListener("touchstart", function() {}, true)} +
{ - - design by Lauren Ho - - {/*
*/} +
) } diff --git a/src/utils/typography.js b/src/utils/typography.js index 291c107..1cdc42f 100644 --- a/src/utils/typography.js +++ b/src/utils/typography.js @@ -26,7 +26,7 @@ const typography = new Typography({ }, ], headerFontFamily: ['Georgia', 'serif'], - bodyFontFamily: ['Libre Baskerville', 'serif'], + bodyFontFamily: ['Nunito', 'serif'], }) export default typography