fixed style issues with Safari

tyfoo · Oct 20, 2015 · e967763 · e967763
1 parent 35d7e93
commit e967763
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
@@ -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`,
       },
@@ -84,7 +84,7 @@ const GridList = React.createClass({
       const childRows = currentChild.props.rows || 1;
       const itemStyle = this.mergeStyles(styles.item, {
         width: (100 / cols * childCols) + '%',
-        height: cellHeight * childRows + padding,
+        height: parseInt(cellHeight) * childRows + padding,
       });
 
       return <div style={this.prepareStyles(itemStyle)}>{currentChild}</div>;

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: {