Skip to content

Commit

Permalink
Merge pull request #23 from dmtrKovalenko/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
dmtrKovalenko authored Oct 31, 2017
2 parents ba38975 + 35fcb58 commit e6d0102
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "material-ui-pickers",
"version": "1.0.0-alpha.9",
"version": "1.0.0-alpha.10",
"description": "React components, that implements material design pickers for material-ui v1",
"main": "dist/material-ui-pickers.cjs.js",
"module": "dist/material-ui-pickers.es.js",
Expand Down Expand Up @@ -33,7 +33,7 @@
"react": "^15.6.2 || ^16.0.0",
"react-dom": "^15.6.2 || ^16.0.0",
"prop-types": "^15.6.0",
"material-ui": "^1.0.0-beta.19",
"material-ui": "^1.0.0-beta.18",
"classnames": "^2.2.5"
},
"dependencies": {
Expand Down Expand Up @@ -62,23 +62,23 @@
"babel-preset-es2015": "^6.24.1",
"babel-preset-latest": "^6.24.1",
"classnames": "^2.2.5",
"cross-env": "^5.1.1",
"cross-env": "^5.1.0",
"enzyme": "^3.1.0",
"enzyme-adapter-react-16": "^1.0.2",
"eslint": "^4.10.0",
"eslint": "^4.8.0",
"eslint-config-airbnb": "^16.0.0",
"eslint-plugin-import": "^2.7.0",
"eslint-plugin-jsx-a11y": "^6.0.2",
"eslint-plugin-react": "^7.4.0",
"jest": "^21.2.1",
"material-ui": "^1.0.0-beta.19",
"material-ui": "^1.0.0-beta.18",
"peer-deps-externals-webpack-plugin": "^1.0.2",
"prop-types": "^15.6.0",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"rollup": "^0.50.0",
"rollup-plugin-babel": "^3.0.2",
"rollup-plugin-commonjs": "^8.2.6",
"rollup-plugin-commonjs": "^8.2.4",
"rollup-plugin-filesize": "^1.4.2",
"rollup-plugin-node-resolve": "^3.0.0",
"webpack": "^3.5.1",
Expand Down
2 changes: 2 additions & 0 deletions src/DateTimePicker/DateTimePickerView.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ const styles = {
pointerEvents: 'none',
visibility: 'hidden', // required for saving scrolls state
position: 'absolute', // remove relation for layout
left: '-9999px',
top: '-9999px',
},
};

Expand Down
5 changes: 4 additions & 1 deletion src/_shared/ModalDialog.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import classnames from 'classnames';
import { Dialog, DialogActions, DialogContent, Button, withStyles } from 'material-ui';

const styles = {
dialogRoot: {

},
dialog: {
width: 300,
height: 420,
Expand All @@ -20,7 +23,7 @@ const ModalDialog = (props) => {
} = props;

return (
<Dialog {...other}>
<Dialog classes={{ paper: classes.dialogRoot }} {...other}>
<DialogContent className={classnames(classes.dialog, dialogContentClassName)}>
{ children }
</DialogContent>
Expand Down

0 comments on commit e6d0102

Please sign in to comment.