Update to latest typography

This commit is contained in:
Kyle Mathews 2016-10-15 12:23:30 -07:00
parent f058f67701
commit ed3087926f
4 changed files with 8 additions and 8 deletions

1
.gitignore vendored
View file

@ -2,3 +2,4 @@ node_modules/
public
.gatsby-context.js
.DS_Store
.intermediate-representation/

View file

@ -3,7 +3,7 @@ import { Link } from 'react-router'
import { prefixLink } from 'gatsby-helpers'
import { prune, include as includes } from 'underscore.string'
import find from 'lodash/find'
import { rhythm, fontSizeToMS } from 'utils/typography'
import { rhythm, scale } from 'utils/typography'
class ReadNext extends React.Component {
render () {
@ -29,9 +29,8 @@ class ReadNext extends React.Component {
<div>
<h6
style={{
...scale(-0.5),
margin: 0,
fontSize: fontSizeToMS(-0.5).fontSize,
lineHeight: fontSizeToMS(-0.5).lineHeight,
letterSpacing: -0.25,
}}
>

View file

@ -12,10 +12,10 @@
"moment": "^2.14.1",
"react-helmet": "^3.1.0",
"react-responsive-grid": "^0.3.3",
"react-typography": "^0.12.0",
"react-typography": "^0.14.0",
"safe-access": "^0.1.0",
"typography": "^0.13.0",
"typography-theme-wordpress-2016": "^0.13.0",
"typography": "^0.14.0",
"typography-theme-wordpress-2016": "^0.14.0",
"underscore.string": "^3.2.3"
},
"devDependencies": {

View file

@ -2,7 +2,7 @@ import React from 'react'
import { Link } from 'react-router'
import { Container } from 'react-responsive-grid'
import { prefixLink } from 'gatsby-helpers'
import { rhythm, adjustFontSizeToMSValue } from 'utils/typography'
import { rhythm, scale } from 'utils/typography'
import { config } from 'config'
class Template extends React.Component {
@ -13,7 +13,7 @@ class Template extends React.Component {
header = (
<h1
style={{
...adjustFontSizeToMSValue(1.5),
...scale(1.5),
marginBottom: rhythm(1.5),
marginTop: 0,
}}