Merge pull request #2812 from zachguo/master

[TableRow] fix row height in IE
mui · Jan 7, 2016 · 6986325 · 6986325
2 parents 0d1dab9 + 1059996
commit 6986325
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/styles/getMuiTheme.js b/src/styles/getMuiTheme.js
@@ -172,6 +172,7 @@ export default function getMuiTheme(baseTheme, muiTheme) {
       selectedColor: palette.borderColor,
       textColor: palette.textColor,
       borderColor: palette.borderColor,
+      height: 48,
     },
     tableRowColumn: {
       height: 48,

diff --git a/src/table/table-row.jsx b/src/table/table-row.jsx
@@ -94,8 +94,9 @@ const TableRow = React.createClass({
 
     let styles = {
       root: {
-        borderBottom: '1px solid ' + this.getTheme().borderColor,
-        color: this.getTheme().textColor,
+        borderBottom: '1px solid ' + theme.borderColor,
+        color: theme.textColor,
+        height: theme.height,
       },
       cell: {
         backgroundColor: cellBgColor,