Merge branch 'redux' into universal-redux

diegohaz · Nov 22, 2016 · cdacb25 · cdacb25
2 parents df5aed6 + 8f2895e
commit cdacb25
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/src-clean/components/App.js b/src-clean/components/App.js
@@ -1,19 +1,17 @@
 import React, { Component, PropTypes } from 'react'
 import { injectGlobal } from 'styled-components'
 
+injectGlobal`
+  body {
+    margin: 0;
+  }
+`
+
 class App extends Component {
   static propTypes = {
     children: PropTypes.any
   }
 
-  componentWillMount () {
-    injectGlobal`
-      body {
-        margin: 0;
-      }
-    `
-  }
-
   render () {
     const { children } = this.props
     return (

diff --git a/src/components/App.js b/src/components/App.js
@@ -2,19 +2,17 @@ import React, { Component, PropTypes } from 'react'
 import { injectGlobal } from 'styled-components'
 import Helmet from 'react-helmet'
 
+injectGlobal`
+  body {
+    margin: 0;
+  }
+`
+
 class App extends Component {
   static propTypes = {
     children: PropTypes.any
   }
 
-  componentWillMount () {
-    injectGlobal`
-      body {
-        margin: 0;
-      }
-    `
-  }
-
   render () {
     const { children } = this.props
     return (