Commit 7e494d14 authored by Andrew Hrdy's avatar Andrew Hrdy
Browse files

Fixed styling issues by only using a specific material-ui version.

parent 0cb4c4c8
...@@ -287,31 +287,6 @@ ...@@ -287,31 +287,6 @@
"resolved": "https://registry.npmjs.org/@turf/meta/-/meta-4.7.4.tgz", "resolved": "https://registry.npmjs.org/@turf/meta/-/meta-4.7.4.tgz",
"integrity": "sha1-beLx6YkLj2S2aeS0fAmyCJMGOXc=" "integrity": "sha1-beLx6YkLj2S2aeS0fAmyCJMGOXc="
}, },
"@types/jss": {
"version": "9.5.3",
"resolved": "https://registry.npmjs.org/@types/jss/-/jss-9.5.3.tgz",
"integrity": "sha512-RQWhcpOVyIhGryKpnUyZARwsgmp+tB82O7c75lC4Tjbmr3hPiCnM1wc+pJipVEOsikYXW0IHgeiQzmxQXbnAIA==",
"requires": {
"csstype": "^2.0.0",
"indefinite-observable": "^1.0.1"
}
},
"@types/react": {
"version": "16.3.16",
"resolved": "https://registry.npmjs.org/@types/react/-/react-16.3.16.tgz",
"integrity": "sha512-fM7YX3Q9a915DXi8T06F8906bWv19sbkVO+k5PUYRIWXU2PINLEHbMMGgySem2phwF6En0+HGI6MOrobp+Ya1g==",
"requires": {
"csstype": "^2.2.0"
}
},
"@types/react-transition-group": {
"version": "2.0.11",
"resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-2.0.11.tgz",
"integrity": "sha512-ZLShHPYsjehQBQq1wD9EQBU1BngZOJZMTuUEipENbYPvZMt4bbLcVUaohZTilKLu0viZouadQ6mANHYynNcUOQ==",
"requires": {
"@types/react": "*"
}
},
"@webassemblyjs/ast": { "@webassemblyjs/ast": {
"version": "1.5.9", "version": "1.5.9",
"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.5.9.tgz", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.5.9.tgz",
...@@ -3555,11 +3530,6 @@ ...@@ -3555,11 +3530,6 @@
} }
} }
}, },
"csstype": {
"version": "2.5.3",
"resolved": "https://registry.npmjs.org/csstype/-/csstype-2.5.3.tgz",
"integrity": "sha512-G5HnoK8nOiAq3DXIEoY2n/8Vb7Lgrms+jGJl8E4EJpQEeVONEnPFJSl8IK505wPBoxxtrtHhrRm4WX2GgdqarA=="
},
"currently-unhandled": { "currently-unhandled": {
"version": "0.4.1", "version": "0.4.1",
"resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
...@@ -7016,14 +6986,6 @@ ...@@ -7016,14 +6986,6 @@
"integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=", "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
"dev": true "dev": true
}, },
"indefinite-observable": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/indefinite-observable/-/indefinite-observable-1.0.1.tgz",
"integrity": "sha1-CZFUI8yNb36xy3iCrRNGM8mm7cM=",
"requires": {
"symbol-observable": "1.0.4"
}
},
"indent-string": { "indent-string": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
...@@ -8657,56 +8619,53 @@ ...@@ -8657,56 +8619,53 @@
"integrity": "sha1-y9NN+JQgbK3amjPI2aRgnya7GYk=" "integrity": "sha1-y9NN+JQgbK3amjPI2aRgnya7GYk="
}, },
"material-ui": { "material-ui": {
"version": "1.0.0-beta.46", "version": "1.0.0-beta.25",
"resolved": "https://registry.npmjs.org/material-ui/-/material-ui-1.0.0-beta.46.tgz", "resolved": "https://registry.npmjs.org/material-ui/-/material-ui-1.0.0-beta.25.tgz",
"integrity": "sha512-hg4dtIyUvbAu2lCXIRjzz3fR9YchFo8gLuJyj7rFhA6NQPiXVAhaYM/dCp+dtQelZymBE1MfctjDTCbborDC9Q==", "integrity": "sha512-c31uPg4h9VP1Udn//wSqSRwrWryCT9kaUlOdpVvHCL0i5dNqD1eU9dYQNUihwO3P//DXEzOYwmbEHFR8ZeYjbw==",
"requires": { "requires": {
"@types/jss": "^9.3.0",
"@types/react-transition-group": "^2.0.8",
"babel-runtime": "^6.26.0", "babel-runtime": "^6.26.0",
"brcast": "^3.0.1", "brcast": "^3.0.1",
"classnames": "^2.2.5", "classnames": "^2.2.5",
"deepmerge": "^2.0.1", "deepmerge": "^2.0.1",
"dom-helpers": "^3.2.1", "dom-helpers": "^3.2.1",
"hoist-non-react-statics": "^2.5.0", "hoist-non-react-statics": "^2.3.1",
"jss": "^9.3.3", "jss": "^9.3.3",
"jss-camel-case": "^6.0.0", "jss-preset-default": "^4.0.1",
"jss-default-unit": "^8.0.2",
"jss-global": "^3.0.0",
"jss-nested": "^6.0.1",
"jss-props-sort": "^6.0.0",
"jss-vendor-prefixer": "^7.0.0",
"keycode": "^2.1.9", "keycode": "^2.1.9",
"lodash": "^4.2.0", "lodash": "^4.17.4",
"normalize-scroll-left": "^0.1.2", "normalize-scroll-left": "^0.1.2",
"prop-types": "^15.6.0", "prop-types": "^15.6.0",
"react-event-listener": "^0.5.1", "react-event-listener": "^0.5.1",
"react-jss": "^8.1.0", "react-jss": "^8.1.0",
"react-lifecycles-compat": "^3.0.0", "react-popper": "^0.7.4",
"react-popper": "^0.10.0",
"react-scrollbar-size": "^2.0.2", "react-scrollbar-size": "^2.0.2",
"react-transition-group": "^2.2.1", "react-transition-group": "^2.2.1",
"recompose": "^0.26.0 || ^0.27.0", "recompose": "^0.26.0",
"scroll": "^2.0.3", "scroll": "^2.0.1",
"warning": "^3.0.0" "warning": "^3.0.0"
} }
}, },
"material-ui-icons": { "material-ui-icons": {
"version": "1.0.0-beta.36", "version": "1.0.0-alpha.19",
"resolved": "https://registry.npmjs.org/material-ui-icons/-/material-ui-icons-1.0.0-beta.36.tgz", "resolved": "https://registry.npmjs.org/material-ui-icons/-/material-ui-icons-1.0.0-alpha.19.tgz",
"integrity": "sha512-7rS6b2EV5QXCB/gTi/Ac9Wbxd+h9EZv1Td3rLLJe4IER8mVHRgdqZccB3EsjW2DrJ7opdY1+8X3/vyrS7CQNpg==", "integrity": "sha1-psXbh74zW7xIMYnFaATWgbfqa1Q=",
"requires": { "requires": {
"recompose": "^0.26.0" "recompose": "^0.23.5"
}, },
"dependencies": { "dependencies": {
"hoist-non-react-statics": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz",
"integrity": "sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs="
},
"recompose": { "recompose": {
"version": "0.26.0", "version": "0.23.5",
"resolved": "https://registry.npmjs.org/recompose/-/recompose-0.26.0.tgz", "resolved": "https://registry.npmjs.org/recompose/-/recompose-0.23.5.tgz",
"integrity": "sha512-KwOu6ztO0mN5vy3+zDcc45lgnaUoaQse/a5yLVqtzTK13czSWnFGmXbQVmnoMgDkI5POd1EwIKSbjU1V7xdZog==", "integrity": "sha1-cqyCYSRr7DeCNdGHRn0CpyHosd4=",
"requires": { "requires": {
"change-emitter": "^0.1.2", "change-emitter": "^0.1.2",
"fbjs": "^0.8.1", "fbjs": "^0.8.1",
"hoist-non-react-statics": "^2.3.1", "hoist-non-react-statics": "^1.0.0",
"symbol-observable": "^1.0.4" "symbol-observable": "^1.0.4"
} }
} }
...@@ -11826,11 +11785,6 @@ ...@@ -11826,11 +11785,6 @@
"theming": "^1.3.0" "theming": "^1.3.0"
} }
}, },
"react-lifecycles-compat": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
"integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
},
"react-mapbox-gl": { "react-mapbox-gl": {
"version": "2.8.0", "version": "2.8.0",
"resolved": "https://registry.npmjs.org/react-mapbox-gl/-/react-mapbox-gl-2.8.0.tgz", "resolved": "https://registry.npmjs.org/react-mapbox-gl/-/react-mapbox-gl-2.8.0.tgz",
...@@ -11853,12 +11807,12 @@ ...@@ -11853,12 +11807,12 @@
} }
}, },
"react-popper": { "react-popper": {
"version": "0.10.4", "version": "0.7.4",
"resolved": "https://registry.npmjs.org/react-popper/-/react-popper-0.10.4.tgz", "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-0.7.4.tgz",
"integrity": "sha1-rypBXqIike3VBGeNev2opu4ylao=", "integrity": "sha512-dx1fcKYYkidq7f71I1g+YX7g3QBLZ9taqiSRdJ7wbP7v/o7F6JsrUaNWGbVNul+TqdDDIZ5/k0xPUol9baqQJQ==",
"requires": { "requires": {
"popper.js": "^1.14.1", "popper.js": "^1.12.5",
"prop-types": "^15.6.1" "prop-types": "^15.5.10"
} }
}, },
"react-redux": { "react-redux": {
...@@ -12055,15 +12009,13 @@ ...@@ -12055,15 +12009,13 @@
} }
}, },
"recompose": { "recompose": {
"version": "0.27.1", "version": "0.26.0",
"resolved": "https://registry.npmjs.org/recompose/-/recompose-0.27.1.tgz", "resolved": "https://registry.npmjs.org/recompose/-/recompose-0.26.0.tgz",
"integrity": "sha512-p7xsyi/rfNjHfdP7vPU02uSFa+Q1eHhjKrvO+3+kRP4Ortj+MxEmpmd+UQtBGM2D2iNAjzNI5rCyBKp9Ob5McA==", "integrity": "sha512-KwOu6ztO0mN5vy3+zDcc45lgnaUoaQse/a5yLVqtzTK13czSWnFGmXbQVmnoMgDkI5POd1EwIKSbjU1V7xdZog==",
"requires": { "requires": {
"babel-runtime": "^6.26.0",
"change-emitter": "^0.1.2", "change-emitter": "^0.1.2",
"fbjs": "^0.8.1", "fbjs": "^0.8.1",
"hoist-non-react-statics": "^2.3.1", "hoist-non-react-statics": "^2.3.1",
"react-lifecycles-compat": "^3.0.2",
"symbol-observable": "^1.0.4" "symbol-observable": "^1.0.4"
} }
}, },
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
"classnames": "^2.2.5", "classnames": "^2.2.5",
"mapbox": "^1.0.0-beta9", "mapbox": "^1.0.0-beta9",
"mapbox-gl": "^0.40.1", "mapbox-gl": "^0.40.1",
"material-ui": "^1.0.0-beta.25", "material-ui": "1.0.0-beta.25",
"material-ui-icons": "^1.0.0-alpha.19", "material-ui-icons": "1.0.0-alpha.19",
"phone-formatter": "^0.0.2", "phone-formatter": "^0.0.2",
"promise": "7.1.1", "promise": "7.1.1",
"prop-types": "^15.5.10", "prop-types": "^15.5.10",
...@@ -31,14 +31,14 @@ ...@@ -31,14 +31,14 @@
"babel": "^6.23.0", "babel": "^6.23.0",
"babel-cli": "^6.26.0", "babel-cli": "^6.26.0",
"babel-core": "^6.26.3", "babel-core": "^6.26.3",
"babel-eslint": "^8.2.3",
"babel-loader": "^7.1.4", "babel-loader": "^7.1.4",
"babel-plugin-transform-class-properties": "^6.24.1", "babel-plugin-transform-class-properties": "^6.24.1",
"babel-preset-env": "^1.7.0", "babel-preset-env": "^1.7.0",
"babel-preset-react": "^6.24.1", "babel-preset-react": "^6.24.1",
"eslint": "4.19.1",
"babel-eslint": "^8.2.3",
"clean-webpack-plugin": "^0.1.19", "clean-webpack-plugin": "^0.1.19",
"css-loader": "^0.28.4", "css-loader": "^0.28.4",
"eslint": "4.19.1",
"eslint-loader": "^2.0.0", "eslint-loader": "^2.0.0",
"eslint-plugin-react": "^7.8.2", "eslint-plugin-react": "^7.8.2",
"file-loader": "^1.1.11", "file-loader": "^1.1.11",
...@@ -46,14 +46,14 @@ ...@@ -46,14 +46,14 @@
"mini-css-extract-plugin": "^0.4.0", "mini-css-extract-plugin": "^0.4.0",
"node-sass": "^4.9.0", "node-sass": "^4.9.0",
"optimize-css-assets-webpack-plugin": "^4.0.2", "optimize-css-assets-webpack-plugin": "^4.0.2",
"postcss-loader": "2.0.6",
"sass-loader": "^7.0.2", "sass-loader": "^7.0.2",
"style-loader": "^0.18.2", "style-loader": "^0.18.2",
"sw-precache-webpack-plugin": "0.11.3",
"uglifyjs-webpack-plugin": "^1.2.5", "uglifyjs-webpack-plugin": "^1.2.5",
"webpack": "^4.4.1", "webpack": "^4.4.1",
"webpack-cli": "^2.1.5", "webpack-cli": "^2.1.5",
"webpack-dev-server": "^3.1.4", "webpack-dev-server": "^3.1.4"
"postcss-loader": "2.0.6",
"sw-precache-webpack-plugin": "0.11.3"
}, },
"proxy": "http://localhost:3001", "proxy": "http://localhost:3001",
"scripts": { "scripts": {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment