Merge pull request #82 from Semigradsky/master

Moved `normalize.css` to dependencies
This commit is contained in:
Simon Bailey
2015-04-02 12:02:46 +01:00
6 changed files with 3 additions and 431 deletions
+2 -1
View File
@@ -11,7 +11,8 @@
"mainOutput": "main",
"dependencies": {<% if (reactRouter) { %>
"react-router": "^0.11.6",<% } %>
"react": "~0.12.2"
"react": "~0.12.2",
"normalize.css": "~3.0.3"
},
"devDependencies": {
"grunt": "~0.4.5",
+1 -1
View File
@@ -4,7 +4,7 @@ var React = require('react/addons');
var ReactTransitionGroup = React.addons.TransitionGroup;
// CSS
require('../../styles/normalize.css');
require('normalize.css');
require('../../styles/main.css');
var imageURL = require('../../images/yeoman.png');