Merge pull request #1936 from vinzscam/master

[Grid] Fix GridList style broken in Safari
mui · Oct 21, 2015 · 806732f · 806732f
2 parents b63a94f + 0a2d21b
commit 806732f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/grid-list/grid-list.jsx b/src/grid-list/grid-list.jsx
@@ -32,7 +32,7 @@ const GridList = React.createClass({
     return {
       cols: 2,
       padding: 4,
-      cellHeight: '180px',
+      cellHeight: 180,
     };
   },
 
@@ -53,7 +53,7 @@ const GridList = React.createClass({
   {
     return {
       root: {
-        display: 'flex',
+        display: '-webkit-box; display: -moz-box; display: -ms-flexbox; display: -webkit-flex; display: flex',
         flexWrap: 'wrap',
         margin: `-${this.props.padding/2}px`,
       },

diff --git a/src/grid-list/grid-tile.jsx b/src/grid-list/grid-tile.jsx
@@ -83,7 +83,7 @@ const GridTile = React.createClass({
         [this.props.titlePosition]: 0,
         height: this.props.subtitle ? 68 : 48,
         background: this.props.titleBackground,
-        display: 'flex',
+        display: '-webkit-box; display: -moz-box; display: -ms-flexbox; display: -webkit-flex; display: flex',
         alignItems: 'center',
       },
       titleWrap: {