Move google font request to index.html

2017-03-29 20:52:46 +10:00 · 2017-03-29 20:52:46 +10:00 · 52862752eb
commit 52862752eb
parent ecffe17fc6
4 changed files with 5 additions and 6 deletions
--- a/public/index.html
+++ b/public/index.html
@ -13,7 +13,9 @@
      work correctly both with client-side routing and a non-root public URL.
      Learn how to configure a non-root public URL by running `npm run build`.
    -->
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,500,700">
    <title>HyperStatic</title>
+
  </head>
  <body>
    <div id="root"></div>
--- a/src/App.js
+++ b/src/App.js
@ -32,10 +32,7 @@ class App extends Component {
    return (
      <Router>
        <div>
-          <Helmet
-            titleTemplate={`${siteTitle} | %s`}
-            link={[{rel: 'stylesheet', href: 'https://fonts.googleapis.com/css?family=Open+Sans'}]}
-          />
+          <Helmet titleTemplate={`${siteTitle} | %s`} />
          <Nav>
            <Logo>🍉</Logo>
            {routes.map((route, i) => (
--- a/src/components/PageHeader.js
+++ b/src/components/PageHeader.js
@ -10,7 +10,7 @@ const Header = styled(Section)`
  background: ${color.primary};
  color: white;
  h2{
-    font-weight: 100;
+    font-weight: 200;
  }
 `

--- a/src/globalStyles.js
+++ b/src/globalStyles.js
@ -25,7 +25,7 @@ export default () => injectGlobal`
  }

  body {
-    font-family: ${font.primary};
+    font-family: ${font.system};
    min-height: 100vh;
    position: relative;
    background: white;