final version

dailybruin · May 18, 2019 · feac738 · feac738
1 parent e0ef13e
commit feac738
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 56 deletions.
diff --git 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<HoverPhotoProps, HoverPhotoState
               <PerformerHover>
                 <TextWrapper>
                   <ArtistName className={css`
-                    font-size: ${this.props.item.artist.toUpperCase() == "NEWS: GERSHWIN AWARD RESCINDED" ? "48px":"64px"};
+                    font-size: ${this.props.item.artist.toUpperCase() == "NEWS: GERSHWIN AWARD RESCINDED" ? "48px":"56px"};
+                    @media only screen and (max-width: 1250px) {
+                      font-size: ${this.props.item.artist.toUpperCase() == "NEWS: GERSHWIN AWARD RESCINDED" ? "40px":"48px"};
+                    }
                   `}>
                     {this.props.item.artist.toUpperCase()}
                   </ArtistName>

diff --git 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 (
     <div>
-      {/* <div ontouchstart> */}
-        {/* <CoverPic /> */}
+      {typeof document !== `undefined` && document.addEventListener("touchstart", function() {}, true)}
+        <Head {...data.site.siteMetadata}/>
         <div className={css`
           height: 100vh;
           width: 100%;
@@ -145,8 +97,7 @@ const IndexPage = ({ data }) => {
         <ItemGrid items={data.kerckhoffArticle.duets} id="bands" />
         <ItemGrid items={data.kerckhoffArticle.bands} id="extras" />
         <ItemGrid items={data.kerckhoffArticle.extras} id="" />
-        <Ftr>- design by Lauren Ho -</Ftr>
-      {/* </div> */}
+        <Footer developers={["Max Wu", "Henry Trinh", "Richard Yang", "Lauren Ho"]} copyrightYear={2019} />
     </div>
   )
 }

diff --git 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