Merge branch 'master' into randyridge/our

1 files changed, 30 insertions, 26 deletions

diff --git a/finished-application/frontend/components/Header.js b/finished-application/frontend/components/Header.js
index bb05c34..797eb8e 100644
--- a/finished-application/frontend/components/Header.js
+++ b/finished-application/frontend/components/Header.js
@@ -1,36 +1,21 @@
-import React from 'react';
+import Link from 'next/link';
+import styled from 'styled-components';
 import NProgress from 'nprogress';
 import Router from 'next/router';
-import styled from 'styled-components';
-import Link from 'next/link';
+import Nav from './Nav';
 import Cart from './Cart';
 import Search from './Search';
-import Nav from './Nav';
 
 Router.onRouteChangeStart = () => {
   NProgress.start();
 };
-Router.onRouteChangeComplete = () => NProgress.done();
-Router.onRouteChangeError = () => NProgress.done();
+Router.onRouteChangeComplete = () => {
+  NProgress.done();
+};
 
-const StyledHeader = styled.header`
-  .bar {
-    border-bottom: 10px solid ${props => props.theme.black};
-    display: grid;
-    grid-template-columns: auto 1fr;
-    justify-content: space-between;
-    align-items: stretch;
-    @media (max-width: 1300px) {
-      grid-template-columns: 1fr;
-      justify-content: center;
-    }
-  }
-  .sub-bar {
-    display: grid;
-    grid-template-columns: 1fr auto;
-    border-bottom: 1px solid ${props => props.theme.lightgrey};
-  }
-`;
+Router.onRouteChangeError = () => {
+  NProgress.done();
+};
 
 const Logo = styled.h1`
   font-size: 4rem;
@@ -42,8 +27,8 @@ const Logo = styled.h1`
     padding: 0.5rem 1rem;
     background: ${props => props.theme.red};
     color: white;
-    letter-spacing: -2px;
     text-transform: uppercase;
+    text-decoration: none;
   }
   @media (max-width: 1300px) {
     margin: 0;
@@ -51,12 +36,31 @@ const Logo = styled.h1`
   }
 `;
 
+const StyledHeader = styled.header`
+  .bar {
+    border-bottom: 10px solid ${props => props.theme.black};
+    display: grid;
+    grid-template-columns: auto 1fr;
+    justify-content: space-between;
+    align-items: stretch;
+    @media (max-width: 1300px) {
+      grid-template-columns: 1fr;
+      justify-content: center;
+    }
+  }
+  .sub-bar {
+    display: grid;
+    grid-template-columns: 1fr auto;
+    border-bottom: 1px solid ${props => props.theme.lightgrey};
+  }
+`;
+
 const Header = () => (
   <StyledHeader>
     <div className="bar">
       <Logo>
         <Link href="/">
-          <a>Sick&nbsp;Fits!</a>
+          <a>Sick Fits</a>
         </Link>
       </Logo>
       <Nav />