Skip to content

Commit

Permalink
Stepped Solutions
Browse files Browse the repository at this point in the history
  • Loading branch information
jm35g committed Sep 20, 2018
1 parent 09b5fe3 commit 8858b3d
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 6 deletions.
20 changes: 15 additions & 5 deletions stepped-solutions/08/frontend/components/Nav.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,24 @@
import Link from 'next/link';
import NavStyles from './styles/NavStyles';

const Nav = () => (
<div>
<NavStyles>
<Link href="/items">
<a>Items</a>
</Link>
<Link href="/sell">
<a>Sell!</a>
<a>Sell</a>
</Link>
<Link href="/signup">
<a>Signup</a>
</Link>
<Link href="/orders">
<a>Orders</a>
</Link>
<Link href="/">
<a>Home!</a>
<Link href="/me">
<a>Account</a>
</Link>
</div>
</NavStyles>
);

export default Nav;
29 changes: 28 additions & 1 deletion stepped-solutions/08/frontend/components/Page.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import styled, { ThemeProvider, injectGlobal } from 'styled-components';
import Header from './Header';
import Meta from './Meta';
import styled, { ThemeProvider, injectGlobal } from 'styled-components';

const theme = {
red: '#FF0000',
Expand All @@ -24,6 +24,33 @@ const Inner = styled.div`
padding: 2rem;
`;

injectGlobal`
@font-face {
font-family: 'radnika_next';
src: url('/static/radnikanext-medium-webfont.woff2') format('woff2');
font-weight: normal;
font-style: normal;
}
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 {
text-decoration: none;
color: ${theme.black};
}
`;

class Page extends Component {
render() {
return (
Expand Down

0 comments on commit 8858b3d

Please sign in to comment.