Skip to content

Commit 4390171

Browse files
authored
Merge pull request #75 from OrigenStudio/develop
ready for another update
2 parents 4105b0c + 794ef00 commit 4390171

File tree

4 files changed

+2769
-1323
lines changed

4 files changed

+2769
-1323
lines changed

.eslintrc.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ module.exports = {
66
graphql: true,
77
},
88
rules: {
9-
'react/prefer-stateless-function': 'warning',
9+
'react/prefer-stateless-function': 1,
10+
'react/default-props-match-prop-types': ['error', { allowRequiredDefaults: true }],
1011
},
1112
};

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "material-ui-layout",
3-
"version": "0.1.0-rc.8",
3+
"version": "0.1.0-rc.9-beta",
44
"description": "Layout components for material-ui",
55
"main": "./lib/index.js",
66
"scripts": {
@@ -55,8 +55,8 @@
5555
"react-dom": "^16.3.0"
5656
},
5757
"dependencies": {
58-
"@material-ui/core": "^1.0.0",
59-
"@material-ui/icons": "^2.0.1",
58+
"@material-ui/core": "^3.9.1",
59+
"@material-ui/icons": "^3.0.2",
6060
"classnames": "^2.2.5",
6161
"lodash": "^4.17.4",
6262
"prop-types": "^15.5.10",

src/components/Layout/Layout.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import Footer from '../Footer';
1818
import LayoutActions from './LayoutActions';
1919

2020
type Props = {
21+
title: String,
2122
classes: Classes,
2223
overrideClasses: Classes,
2324
children: React.Node,

0 commit comments

Comments
 (0)