waylon/gatsby-starter-blog-forestry
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update packages + update Typography setup

Browse source
This commit is contained in:
Kyle Mathews 2015-11-21 16:59:04 -08:00
parent 950e38687e
commit 1043f18f0c
6 changed files with 38 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pages/_template.jsx
View file

@ -1,11 +1,8 @@
import React from 'react';
import { RouteHandler, Link } from 'react-router';
import { Container, Grid, Breakpoint, Span } from 'react-responsive-grid';
import Typography from 'typography';
import { link } from 'gatsby-helpers';
let typography = new Typography();
let rhythm = typography.rhythm, fontSizeToMS = typography.fontSizeToMS;
import { rhythm, fontSizeToMS } from 'utils/typography'
import '../css/styles.css';
@ -55,7 +52,7 @@ export default class extends React.Component {
}}
>
{header}
<RouteHandler typography={typography} {...this.props}/>
<RouteHandler {...this.props}/>
</Container>
);
}

4
pages/index.jsx
View file

@ -3,6 +3,7 @@ import { RouteHandler, Link } from 'react-router';
import sortBy from 'lodash/collection/sortBy';
import DocumentTitle from 'react-document-title';
import { link } from 'gatsby-helpers';
import { rhythm, fontSizeToMS } from 'utils/typography'
export default class extends React.Component {
static data() {
@ -11,8 +12,7 @@ export default class extends React.Component {
}
}
render() {
let i, len, page, pageLinks, ref, ref1, ref2, rhythm, title;
rhythm = this.props.typography.rhythm;
let i, len, page, pageLinks, ref, ref1, ref2, title;
pageLinks = [];
ref = sortBy(this.props.pages, (page) => {
let ref;