Use typography-theme-wordpress-2016 as default theme

This commit is contained in:
Kyle Mathews 2016-06-28 20:02:19 -07:00
parent 3efd74a20f
commit a865b54d5e
8 changed files with 17 additions and 32 deletions

View file

@ -39,6 +39,7 @@ class ReadNext extends React.Component {
</h6>
<h3
style={{
marginTop: 0,
marginBottom: rhythm(1/4),
}}
>

View file

@ -1,20 +0,0 @@
body {
color: rgb(66,66,66);
}
h1,h2,h3,h4,h5,h6 {
color: rgb(44,44,44);
}
a {
color: rgb(42,93,173);
text-decoration: none;
}
a:hover {
text-decoration: underline;
}
blockquote {
padding-left: 16.875px;
border-left: 6px solid lightgray;
margin-left: 10.875px;
margin-right: 0;
padding-right: 0;
}

View file

@ -1,7 +1,7 @@
import React from 'react'
import DocumentTitle from 'react-document-title'
import { prefixLink } from 'gatsby-helpers'
import { TypographyStyle } from 'typography-react'
import { GoogleFont, TypographyStyle } from 'typography-react'
import typography from './utils/typography'
const BUILD_TIME = new Date().getTime()
@ -31,6 +31,7 @@ module.exports = React.createClass({
/>
<title>{title}</title>
<TypographyStyle typography={typography} />
<GoogleFont typography={typography} />
{css}
</head>
<body className="landing-page">

View file

@ -23,6 +23,7 @@
"safe-access": "^0.1.0",
"typography": "^0.10.2",
"typography-react": "^0.10.3",
"typography-theme-wordpress-2016": "^0.10.0",
"underscore.string": "^3.2.3"
},
"devDependencies": {

View file

@ -5,8 +5,6 @@ import { prefixLink } from 'gatsby-helpers'
import { rhythm, fontSizeToMS } from 'utils/typography'
import { config } from 'config'
import '../css/styles.css'
class Template extends React.Component {
render () {
const { location, children } = this.props
@ -18,10 +16,12 @@ class Template extends React.Component {
fontSize: fontSizeToMS(1.5).fontSize,
lineHeight: fontSizeToMS(1.5).lineHeight,
marginBottom: rhythm(1.5),
marginTop: 0,
}}
>
<Link
style={{
boxShadow: 'none',
textDecoration: 'none',
color: 'inherit',
}}
@ -33,9 +33,15 @@ class Template extends React.Component {
)
} else {
header = (
<h3>
<h3
style={{
fontFamily: 'Montserrat, sans-serif',
marginTop: 0,
}}
>
<Link
style={{
boxShadow: 'none',
textDecoration: 'none',
color: 'inherit',
}}

View file

@ -26,7 +26,7 @@ class BlogIndex extends React.Component {
marginBottom: rhythm(1/4),
}}
>
<Link to={prefixLink(page.path)}>{title}</Link>
<Link style={{boxShadow: 'none'}} to={prefixLink(page.path)}>{title}</Link>
</li>
)
}

View file

@ -1,11 +1,7 @@
import Typography from 'typography'
import Wordpress2016 from 'typography-theme-wordpress-2016'
const options = {
baseFontSize: '18px',
baseLineHeight: '27px',
}
const typography = new Typography(options)
const typography = new Typography(Wordpress2016)
// Hot reload typography in development.
if (process.env.NODE_ENV !== 'production') {

View file

@ -16,7 +16,7 @@ class MarkdownWrapper extends React.Component {
return (
<DocumentTitle title={`${post.title} | ${config.blogTitle}`}>
<div className="markdown">
<h1>{post.title}</h1>
<h1 style={{marginTop: 0}}>{post.title}</h1>
<div dangerouslySetInnerHTML={{ __html: post.body }} />
<em
style={{