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

Merge pull request #11 from gatsbyjs/0.11

Browse source 
0.11
This commit is contained in:
Kyle Mathews 2016-05-11 10:47:37 -07:00
commit c13679f8d1
4 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.eslintrc
View file

@ -11,6 +11,8 @@
"space-infix-ops": [0], "space-infix-ops": [0],
"react/prefer-es6-class": [0], "react/prefer-es6-class": [0],
"react/prefer-stateless-function": [0], "react/prefer-stateless-function": [0],
"import/no-unresolved": [0],
"global-require": [0],
}, },
"globals": { "globals": {
"__PREFIX_LINKS__": true, "__PREFIX_LINKS__": true,

1
components/Bio.js
View file

@ -13,6 +13,7 @@ class Bio extends React.Component {
> >
<img <img
src={prefixLink('/kyle-round-small-pantheon.jpg')} src={prefixLink('/kyle-round-small-pantheon.jpg')}
alt={`author ${config.authorName}`}
style={{ style={{
float: 'left', float: 'left',
marginRight: rhythm(1/4), marginRight: rhythm(1/4),

6
html.js
View file

@ -14,9 +14,9 @@ module.exports = React.createClass({
const { body } = this.props const { body } = this.props
const title = DocumentTitle.rewind() const title = DocumentTitle.rewind()
let cssLink let css
if (process.env.NODE_ENV === 'production') { if (process.env.NODE_ENV === 'production') {
cssLink = <link rel="stylesheet" href={prefixLink('/styles.css')} /> css = <style dangerouslySetInnerHTML={{ __html: require('!raw!./public/styles.css') }} />
} }
return ( return (
@ -30,7 +30,7 @@ module.exports = React.createClass({
/> />
<title>{title}</title> <title>{title}</title>
<TypographyStyle /> <TypographyStyle />
{cssLink} {css}
</head> </head>
<body className="landing-page"> <body className="landing-page">
<div id="react-mount" dangerouslySetInnerHTML={{ __html: body }} /> <div id="react-mount" dangerouslySetInnerHTML={{ __html: body }} />

18
package.json
View file

@ -7,26 +7,28 @@
"url": "https://github.com/gatsbyjs/gatsby-starter-blog/issues" "url": "https://github.com/gatsbyjs/gatsby-starter-blog/issues"
}, },
"dependencies": { "dependencies": {
"babel-plugin-add-module-exports": "^0.1.2", "babel-plugin-add-module-exports": "^0.2.0",
"babel-preset-es2015": "^6.6.0", "babel-preset-es2015": "^6.6.0",
"babel-preset-react": "^6.5.0", "babel-preset-react": "^6.5.0",
"babel-preset-stage-0": "^6.5.0", "babel-preset-stage-0": "^6.5.0",
"gatsby": "^0.10.0", "gatsby": "^0.11.0",
"history": "^2.0.1", "history": "^2.1.1",
"lodash": "^4.5.0", "lodash": "^4.12.0",
"moment": "^2.11.2", "moment": "^2.11.2",
"react-document-title": "^2.0.1", "react-document-title": "^2.0.1",
"react-responsive-grid": "^0.3.3", "react-responsive-grid": "^0.3.3",
"react-router": "^2.0.1", "react-router": "^2.4.0",
"safe-access": "^0.1.0", "safe-access": "^0.1.0",
"typography": "^0.7.0", "typography": "^0.7.0",
"underscore.string": "^3.2.3" "underscore.string": "^3.2.3"
}, },
"devDependencies": { "devDependencies": {
"babel-preset-react-hmre": "^1.1.1", "babel-preset-react-hmre": "^1.1.1",
"eslint": "^2.4.0", "eslint": "^2.9.0",
"eslint-config-airbnb": "^6.1.0", "eslint-config-airbnb": "^9.0.1",
"eslint-plugin-react": "^4.2.1", "eslint-plugin-import": "^1.8.0",
"eslint-plugin-jsx-a11y": "^1.2.0",
"eslint-plugin-react": "^5.1.1",
"gh-pages": "^0.11.0" "gh-pages": "^0.11.0"
}, },
"homepage": "https://github.com/gatsbyjs/gatsby-starter-blog#readme", "homepage": "https://github.com/gatsbyjs/gatsby-starter-blog#readme",