Merge branch 'master' into randyridge/our

1 files changed, 32 insertions, 31 deletions

diff --git a/finished-application/frontend/components/Page.js b/finished-application/frontend/components/Page.js
index c3e04ac..75ab84a 100644
--- a/finished-application/frontend/components/Page.js
+++ b/finished-application/frontend/components/Page.js
@@ -1,8 +1,7 @@
-import React from 'react';
+import React, { Component } from 'react';
 import styled, { ThemeProvider, injectGlobal } from 'styled-components';
-import PropTypes from 'prop-types';
-import Header from './Header';
-import Meta from './Meta';
+import Header from '../components/Header';
+import Meta from '../components/Meta';
 
 const theme = {
   red: '#FF0000',
@@ -10,47 +9,49 @@ const theme = {
   grey: '#3A3A3A',
   lightgrey: '#E1E1E1',
   offWhite: '#EDEDED',
-  maxWidth: '1300px',
+  maxWidth: '1000px',
   bs: '0 12px 24px 0 rgba(0, 0, 0, 0.09)',
 };
 
+const StyledPage = styled.div`
+  background: white;
+  color: ${props => props.theme.black};
+`;
+
+const Inner = styled.div`
+  max-width: ${props => props.theme.maxWidth};
+  margin: 0 auto;
+  padding: 2rem;
+`;
+
 injectGlobal`
-  html {
-   box-sizing: border-box;
-   font-size: 10px;
+  @font-face {
+    font-family: 'radnika_next';
+    src: url('/static/radnikanext-medium-webfont.woff2') format('woff2');
+    font-weight: normal;
+    font-style: normal;
   }
-  body {
-   font-family: 'radnika next', sans-serif;
-   padding: 0;
-   background-color: #ffffff;
-   margin: 0;
-   font-size: 1.5rem;
-   line-height: 2;
+  html {
+    box-sizing: border-box;
+    font-size: 10px;
   }
   *, *:before, *:after {
     box-sizing: inherit;
   }
+  body {
+    padding: 0;
+    margin: 0;
+    font-size: 1.5rem;
+    line-height: 2;
+    font-family: 'radnika_next';
+  }
   a {
-    color: ${theme.black};
     text-decoration: none;
+    color: ${theme.black};
   }
 `;
 
-const Inner = styled.div`
-  max-width: 1000px;
-  margin: 0 auto;
-  padding: 2rem;
-`;
-
-const StyledPage = styled.div`
-  color: ${props => props.theme.black};
-  background: white;
-`;
-
-class Page extends React.Component {
-  static propTypes = {
-    children: PropTypes.node.isRequired,
-  };
+class Page extends Component {
   render() {
     return (
       <ThemeProvider theme={theme}>