From 34e6ddb750161aa495e9e645adaaa5359e9656de Mon Sep 17 00:00:00 2001 From: Yury Orlov Date: Tue, 11 Jul 2017 17:54:15 +0300 Subject: [PATCH] fix(react-grid-material-ui): pin material-ui version (#197) --- packages/dx-react-demos/package.json | 4 ++-- .../src/material-ui/featured/theming-grid.jsx | 2 +- packages/dx-react-demos/src/material-ui/index.jsx | 2 +- packages/dx-react-grid-material-ui/package.json | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/dx-react-demos/package.json b/packages/dx-react-demos/package.json index c4e96991a9..544dce60aa 100644 --- a/packages/dx-react-demos/package.json +++ b/packages/dx-react-demos/package.json @@ -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", diff --git a/packages/dx-react-demos/src/material-ui/featured/theming-grid.jsx b/packages/dx-react-demos/src/material-ui/featured/theming-grid.jsx index 56d00fbc08..9c468ec8a5 100644 --- a/packages/dx-react-demos/src/material-ui/featured/theming-grid.jsx +++ b/packages/dx-react-demos/src/material-ui/featured/theming-grid.jsx @@ -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, diff --git a/packages/dx-react-demos/src/material-ui/index.jsx b/packages/dx-react-demos/src/material-ui/index.jsx index f5fe797090..ef3f224675 100644 --- a/packages/dx-react-demos/src/material-ui/index.jsx +++ b/packages/dx-react-demos/src/material-ui/index.jsx @@ -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, diff --git a/packages/dx-react-grid-material-ui/package.json b/packages/dx-react-grid-material-ui/package.json index 31381ced38..dfc96b4916 100644 --- a/packages/dx-react-grid-material-ui/package.json +++ b/packages/dx-react-grid-material-ui/package.json @@ -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", @@ -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" } }