From e96776323e49f4ddc72c7cc0b90f8c6b195455ca Mon Sep 17 00:00:00 2001
From: Vincenzo Scamporlino <vinz.scamporlino@gmail.com>
Date: Tue, 20 Oct 2015 15:32:30 +0200
Subject: [PATCH] fixed style issues with Safari

---
 src/grid-list/grid-list.jsx | 4 ++--
 src/grid-list/grid-tile.jsx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/grid-list/grid-list.jsx b/src/grid-list/grid-list.jsx
index 21513c1bda46b0..ce938572284e44 100644
--- 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
index 7b640ab27fcca6..4f59fdbebca6a3 100644
--- 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: {