Skip to content

Commit

Permalink
fix(react-grid-material-ui): pin material-ui version (#197)
Browse files Browse the repository at this point in the history
  • Loading branch information
kvet committed Jul 11, 2017
1 parent 8abde20 commit 34e6ddb
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions packages/dx-react-demos/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
"@devexpress/dx-react-grid-bootstrap3": "1.0.0-alpha.5",
"@devexpress/dx-react-grid-material-ui": "1.0.0-alpha.5",
"core-js": "^2.4.1",
"material-ui": "^1.0.0-alpha.19",
"material-ui-icons": "1.0.0-alpha.3",
"material-ui": "1.0.0-alpha.21",
"material-ui-icons": "1.0.0-alpha.19",
"prop-types": "^15.5.8",
"react": "^15.6.1",
"react-bootstrap": "^0.31.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import LoopIcon from 'material-ui-icons/Loop';
import HelpIcon from 'material-ui-icons/HelpOutline';
import { MuiThemeProvider, withStyles, createStyleSheet, createMuiTheme } from 'material-ui/styles';
import createPalette from 'material-ui/styles/palette';
import { blue } from 'material-ui/styles/colors';
import { blue } from 'material-ui/colors';

import {
generateRows,
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-demos/src/material-ui/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import injectTapEventPlugin from 'react-tap-event-plugin';

import { MuiThemeProvider, createMuiTheme } from 'material-ui/styles';
import createPalette from 'material-ui/styles/palette';
import { blue } from 'material-ui/styles/colors';
import { blue } from 'material-ui/colors';

import {
Route,
Expand Down
8 changes: 4 additions & 4 deletions packages/dx-react-grid-material-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@
"jss": "^8.0.0",
"jss-preset-default": "^3.0.0",
"jss-theme-reactor": "^0.11.1",
"material-ui": "^1.0.0-alpha.19",
"material-ui-icons": "1.0.0-alpha.3",
"material-ui": "1.0.0-alpha.21",
"material-ui-icons": "1.0.0-alpha.19",
"react": "^15.6.1",
"react-bootstrap": "^0.31.0",
"react-dom": "^15.6.1",
Expand All @@ -103,8 +103,8 @@
"@devexpress/dx-grid-core": "1.0.0-alpha.5",
"@devexpress/dx-react-core": "1.0.0-alpha.5",
"@devexpress/dx-react-grid": "1.0.0-alpha.5",
"material-ui": "^1.0.0-alpha.19",
"material-ui-icons": "1.0.0-alpha.3",
"material-ui": "1.0.0-alpha.21",
"material-ui-icons": "1.0.0-alpha.19",
"react": "^15.5.4"
}
}

0 comments on commit 34e6ddb

Please sign in to comment.