Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

material-ui-icons moved to @material-ui/icons #897

Closed
wants to merge 7 commits into from
Closed

material-ui-icons moved to @material-ui/icons #897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
127198b
Update toggle-button.jsx
henkvhest Apr 8, 2018
a239855
Update pagination.jsx
henkvhest Apr 8, 2018
7c021f1
Update grouping-control.jsx
henkvhest Apr 8, 2018
b9d523c
Update search-panel-input.jsx
henkvhest Apr 8, 2018
772ffa4
Update table-detail-toggle-cell.jsx
henkvhest Apr 8, 2018
f920d71
Update table-group-row-cell.jsx
henkvhest Apr 8, 2018
a21f35a
Update package.json
henkvhest Apr 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/dx-react-grid-material-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"@devexpress/dx-react-core": "1.1.0",
"@devexpress/dx-react-grid": "1.1.0",
"@devexpress/dx-testing": "1.1.0",
"@material-ui/icons": "^1.0.0-beta.42",
"babel-core": "^6.26.0",
"babel-jest": "^22.4.1",
"babel-plugin-external-helpers": "^6.22.0",
Expand All @@ -70,7 +71,6 @@
"jss-preset-default": "^4.3.0",
"jss-theme-reactor": "^0.11.1",
"material-ui": "1.0.0-beta.37",
"material-ui-icons": "1.0.0-beta.36",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react-test-renderer": "^16.2.0",
Expand All @@ -87,8 +87,8 @@
"@devexpress/dx-grid-core": "1.1.0",
"@devexpress/dx-react-core": "1.1.0",
"@devexpress/dx-react-grid": "1.1.0",
"@material-ui/icons": "^1.0.0-beta.42",
"material-ui": "1.0.0-beta.37",
"material-ui-icons": "1.0.0-beta.36",
"react": "^16.2.0"
}
}
2 changes: 1 addition & 1 deletion packages/dx-react-grid-material-ui/src/templates/column-chooser/toggle-button.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react';
import * as PropTypes from 'prop-types';
import IconButton from 'material-ui/IconButton';
import Tooltip from 'material-ui/Tooltip';
import VisibilityOff from 'material-ui-icons/VisibilityOff';
import VisibilityOff from '@material-ui/icons/VisibilityOff';

export const ToggleButton = ({
onToggle, getMessage,
Expand Down
4 changes: 2 additions & 2 deletions packages/dx-react-grid-material-ui/src/templates/paging-panel/pagination.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import classNames from 'classnames';
import Button from 'material-ui/Button';
import IconButton from 'material-ui/IconButton';
import { withStyles } from 'material-ui/styles';
import ChevronLeft from 'material-ui-icons/ChevronLeft';
import ChevronRight from 'material-ui-icons/ChevronRight';
import ChevronLeft from '@material-ui/icons/ChevronLeft';
import ChevronRight from '@material-ui/icons/ChevronRight';
import { firstRowOnPage, lastRowOnPage } from '@devexpress/dx-grid-core';

const styles = theme => ({
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-grid-material-ui/src/templates/search-panel-input.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react';
import * as PropTypes from 'prop-types';
import { withStyles } from 'material-ui/styles';
import Input, { InputAdornment } from 'material-ui/Input';
import Search from 'material-ui-icons/Search';
import Search from '@material-ui/icons/Search';

const styles = theme => ({
root: {
Expand Down
4 changes: 2 additions & 2 deletions packages/dx-react-grid-material-ui/src/templates/table-detail-toggle-cell.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import classNames from 'classnames';
import { TableCell } from 'material-ui/Table';
import { withStyles } from 'material-ui/styles';

import ChevronRight from 'material-ui-icons/ChevronRight';
import ExpandMore from 'material-ui-icons/ExpandMore';
import ChevronRight from '@material-ui/icons/ChevronRight';
import ExpandMore from '@material-ui/icons/ExpandMore';
import IconButton from 'material-ui/IconButton';

const styles = theme => ({
Expand Down
4 changes: 2 additions & 2 deletions packages/dx-react-grid-material-ui/src/templates/table-group-row-cell.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as React from 'react';
import * as PropTypes from 'prop-types';
import classNames from 'classnames';
import ChevronRight from 'material-ui-icons/ChevronRight';
import ExpandMore from 'material-ui-icons/ExpandMore';
import ChevronRight from '@material-ui/icons/ChevronRight';
import ExpandMore from '@material-ui/icons/ExpandMore';
import IconButton from 'material-ui/IconButton';
import { TableCell } from 'material-ui/Table';
import { withStyles } from 'material-ui/styles';
Expand Down
2 changes: 1 addition & 1 deletion packages/dx-react-grid-material-ui/src/templates/table-header-cell/grouping-control.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import * as PropTypes from 'prop-types';
import classNames from 'classnames';
import List from 'material-ui-icons/List';
import List from '@material-ui/icons/List';
import { withStyles } from 'material-ui/styles';

const styles = theme => ({
Expand Down