merge master

Author: geekingreen

react_media_queryable.js

@@ -62,8 +62,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	  displayName: 'MediaQueryable',
 	  mediaListener: null,
 	  propTypes: {
+	    className: React.PropTypes.string,
 	    defaultMediaQuery: React.PropTypes.string.isRequired,
 	    mediaQueries: React.PropTypes.object.isRequired,
+	    style: React.PropTypes.object,
 	  },
 
 	  getInitialState: function() {
@@ -93,7 +95,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        return React.cloneElement(child, { mediaQuery: this._currentMediaQuery() } );
 	      }
 	    }, this);
-	    return React.DOM.div(assign({}, {}, {children: renderedChildren}));
+	    return React.DOM.div(assign({}, {children: renderedChildren, className: this.props.className, style: this.props.style}));
 	  },
 
 	  _currentMediaQuery: function() {

react_media_queryable.min.js

@@ -6,8 +6,10 @@ module.exports = React.createClass({
   displayName: 'MediaQueryable',
   mediaListener: null,
   propTypes: {
+    className: React.PropTypes.string,
     defaultMediaQuery: React.PropTypes.string.isRequired,
     mediaQueries: React.PropTypes.object.isRequired,
+    style: React.PropTypes.object,
   },
 
   getInitialState: function() {
@@ -37,7 +39,7 @@ module.exports = React.createClass({
         return React.cloneElement(child, { mediaQuery: this._currentMediaQuery() } );
       }
     }, this);
-    return React.DOM.div(assign({}, {}, {children: renderedChildren}));
+    return React.DOM.div(assign({}, {children: renderedChildren, className: this.props.className, style: this.props.style}));
   },
 
   _currentMediaQuery: function() {