Merge branch 'develop' into centering

Author: ww3637

public/favicon/android-chrome-192x192.png

@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}

public/favicon/android-chrome-512x512.png

@@ -5,38 +5,19 @@
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <meta name="keywords" content="hackathons, hackathon, hack-a-thon, programming, hardware, development, design, rit"/>
     <meta name="theme-color" content="#000000"/>
-    
+
     <meta name="twitter:card" content="summary"/>
     <meta name="twitter:url" content="https://brickhack.io" >
     <!--<meta name="twitter:image" content="https://brickhack.io/assets/brickhack6_card-93cef75c24ae27ec7e263e7e7910228b8bfdab89e7cba2416aa9a9ab464431f9.png">-->
     <meta name="twitter:title" content="BrickHack">
     <meta name="twitter:description" content="RIT's premiere collegiate hackathon devoted to bringing designers, developers, and all sorts of makers together for 24 hours to create something from nothing.">
     <meta name="description" content="RIT's premiere collegiate hackathon devoted to bringing designers, developers, and all sorts of makers together for 24 hours to create something from nothing.">
     <meta name="og:description" content="RIT's premiere collegiate hackathon devoted to bringing designers, developers, and all sorts of makers together for 24 hours to create something from nothing."/>
-    
-    <link rel="apple-touch-icon" sizes="57x57" href="https://brickhack.io/assets/favicon/apple-touch-icon-57x57-6885e3292da31b9a0c24bbc1f9d9d34f8041b44bb8134d3560f09018d389ff9d.png"/>
-    <link rel="apple-touch-icon" sizes="60x60" href="https://brickhack.io/assets/favicon/apple-touch-icon-60x60-6ca26c7216dc51122a18d83cba61f779216cc16ad4b3c9da7ccea05b12ab56fc.png"/>
-    <link rel="apple-touch-icon" sizes="72x72" href="https://brickhack.io/assets/favicon/apple-touch-icon-72x72-24f13f2501384b50aae374d6c18454c8eedf36a5efdc1a539e2c2cc036d1d860.png"/>
-    <link rel="apple-touch-icon" sizes="76x76" href="https://brickhack.io/assets/favicon/apple-touch-icon-76x76-e4fd2f451ee0a8881ff6616a5ea372386c75d374d915374d8f30ca794fb4a441.png"/>
-    <link rel="apple-touch-icon" sizes="114x114" href="https://brickhack.io/assets/favicon/apple-touch-icon-114x114-2d80a86ea1c4e3c887b58537de4a44de471a48ecfa9ac1399af4bb958b831ce1.png"/>
-    <link rel="apple-touch-icon" sizes="120x120" href="https://brickhack.io/assets/favicon/apple-touch-icon-120x120-3d23174c92c39ada2ed1a8341fc5a64fd9b3efba421088418677a6983f879ba4.png"/>
-    <link rel="apple-touch-icon" sizes="144x144" href="https://brickhack.io/assets/favicon/apple-touch-icon-144x144-4f58f8bb6df925e25b56a7994184a9da352af619d85d62534a6c8f3d1acdc0ea.png"/>
-    <link rel="apple-touch-icon" sizes="152x152" href="https://brickhack.io/assets/favicon/apple-touch-icon-152x152-b6ff3b86c9c23b0ccf8f13d9b90a63b8147ad495187d5de3c173f4bb68cc9f1d.png"/>
-    <link rel="apple-touch-icon" sizes="180x180" href="https://brickhack.io/assets/favicon/apple-touch-icon-180x180-16b63c6575b51af623eaeaf4170ad2ecb1b2a3b38469676deadcb666e6f00eff.png"/>
-    
-    <link rel="shortcut icon"href="https://brickhack.io/assets/favicon/favicon-9a251faee6cbe117dc7a886205d084687a1cf0bc84f1d1606422418ab9d546b1.ico"/>
-    <link rel="icon" sizes="16x16" type="image/png" href="https://brickhack.io/assets/favicon/favicon-16x16-5f15aa71cda3f365e7207e6fce13cd58b4644b871e59828923980490940ac084.png"/>
-    <link rel="icon" sizes="32x32" type="image/png" href="https://brickhack.io/assets/favicon/favicon-32x32-294c90d1b12f00da71f0468ccd55c15515bf6149fbac8342b637437580368193.png"/>
-    <link rel="icon" sizes="96x96" type="image/png" href="https://brickhack.io/assets/favicon/favicon-96x96-023cec54783ff811002ab7fb2b21727336861d4b4dbc2267eceadf2fb3061915.png"/>
-    <link rel="icon" sizes="160x160" type="image/png" href="https://brickhack.io/assets/favicon/favicon-160x160-64e38a95284fa1d3991e62cccfa4c20fc261527d016f05d5bf08bbd4361636fd.png"/>
-    <link rel="icon" sizes="192x192" type="image/png" href="https://brickhack.io/assets/favicon/favicon-192x192-c78241a33cd8aa382917b4fb8d36abc9bc5cc290a01235340a1bd9afddccb578.png"/>
-    
-    <meta content="#f9f6f3" name="msapplication-TileColor">
-    <meta name="msapplication-TileImage" content="https://brickhack.io/assets/favicon/mstile-144x144-0ab0c5174d25bd0641fdb94c58f4a75057d59f1679454c43aea07340f8d45948.png"/>
-    <meta name="msapplication-square70x70logo" content="https://brickhack.io/assets/favicon/mstile-70x70-e24d43af89271ac4f50c2963449cb72a8dc68936b47607ea9d81549281f192e0.png"/>
-    <meta name="msapplication-square150x150logo" content="https://brickhack.io/assets/favicon/mstile-150x150-61ebc6afd3a62ecc3fc0564037ddc5294e4b30ccee0f8892f30ccc8e92d65f18.png"/>
-    <meta name="msapplication-wide310x150logo" content="https://brickhack.io/assets/favicon/mstile-310x150-dbff7bf911e978959defdc0a76da8bb0643560353e4ceaac864f128916e8fb79.png"/>
-    <meta name="msapplication-square310x310logo" content="https://brickhack.io/assets/favicon/mstile-310x310-4784973cec202961c15903a1f528248e7b04e9e2ad3c408fdca78c7100c1abb7.png"/>
+
+    <!-- Favicons -->
+    <link rel="apple-touch-icon" sizes="180x180" href="favicon/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="favicon/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="favicon/favicon-16x16.png">
 
     <!--
       manifest.json provides metadata used when your web app is installed on a

public/favicon/apple-touch-icon.png

@@ -1,15 +1 @@
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}

public/favicon/favicon-16x16.png

@@ -2,7 +2,7 @@
 
 $blue: #465491;
 
-/* 
+/*
 tablet & mobile have the column layout
 tablet has fixed widths and font sizes
 mobile has scaling widths and font sizes
@@ -62,7 +62,7 @@ html, body, #root, #app, .full-height {
   width: 100%;
 
   padding: 12px 0px;
-  
+
   font-size: 14px;
   font-weight: 300;
   text-align: center;
@@ -84,7 +84,7 @@ html, body, #root, #app, .full-height {
     height: 150px;
     margin-left: 40px;
   }
-  
+
   @include mobile {
     /*68 px is the current height of the nav bar
     will think of a better way to structure this later*/
@@ -99,14 +99,14 @@ html, body, #root, #app, .full-height {
 
   font-size: 15px;
   font-weight: 500;
-  
+
   color: $blue;
   background-color: white;
 
   ul {
     list-style-type: none;
     float: right;
-  
+
     margin: 0;
     padding: 0;
 
@@ -117,7 +117,7 @@ html, body, #root, #app, .full-height {
 
       a {
         color: $blue;
-      
+
         border-bottom-style: solid;
         border-color: transparentize($blue, 1);
         transition: border-color 0.2s;
@@ -178,6 +178,10 @@ html, body, #root, #app, .full-height {
   max-width: $desktop-width;
   text-align: center;
   margin: auto;
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop
 
   @include tablet {
     flex-direction: column;
@@ -208,7 +212,7 @@ html, body, #root, #app, .full-height {
 }
 
 /*
-note: development on a mac may not have all font-weights, 
+note: development on a mac may not have all font-weights,
 lines of text may be wider than they appear
 */
 #hackathon-name {
@@ -241,7 +245,7 @@ lines of text may be wider than they appear
 
   @include mobile {
     height: 4vw;
-    font-size: 3.2vw; 
+    font-size: 3.2vw;
   }
 }
 
@@ -251,7 +255,8 @@ lines of text may be wider than they appear
   margin: auto;
 
   margin-top: 10px;
-  
+  margin-bottom: 10px;
+
   border-style: solid;
   border-width: 1px;
   border-color: $blue;
@@ -317,7 +322,7 @@ lines of text may be wider than they appear
       background-position: 6.5px;
     }
   }
-  
+
   @include mobile {
       height: 9vw;
       width: 9vw;
@@ -345,3 +350,10 @@ lines of text may be wider than they appear
         font-weight: 500;
     }
 }
+
+#contact {
+
+  p {
+    margin: 0;
+  }
+}