Skip to content

Commit e42c30d

Browse files
authored
Merge pull request #10 from Zetoff/develop
release 0.0.3
2 parents eb3f4c0 + 91845fa commit e42c30d

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
#WIP
2+
13
material-ui-layout

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "material-ui-layout",
3-
"version": "0.0.2",
3+
"version": "0.0.3",
44
"description": "Layout components for material-ui",
55
"main": "./lib/index.js",
66
"scripts": {

src/components/Layout/Layout.jsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import Footer from '../Footer';
1414

1515
class Layout extends React.PureComponent {
1616
static propTypes = {
17-
title: PropTypes.string,
1817
classes: PropTypes.shape({}),
1918
children: PropTypes.element.isRequired,
2019
navbarPostion: PropTypes.string,
@@ -50,8 +49,6 @@ class Layout extends React.PureComponent {
5049

5150
render() {
5251
const {
53-
title,
54-
logo, // TODO what kind of logo can we expect?.....
5552
classes,
5653
children,
5754
navbarPostion,
@@ -73,7 +70,7 @@ class Layout extends React.PureComponent {
7370

7471
return (
7572
<div className={classes.layout}>
76-
<NavBar {...navBarProps} title={title} logo={logo} onIconClick={this.toggleDrawer}>
73+
<NavBar {...navBarProps} onIconClick={this.toggleDrawer}>
7774
{navBarContent}
7875
</NavBar>
7976
{drawerContent ? (

src/components/NavBar/NavBar.jsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ class NavBar extends React.PureComponent {
1212
classes: PropTypes.shape({}),
1313
children: PropTypes.element,
1414
navbarPostion: PropTypes.string,
15+
color: PropTypes.string,
1516
};
1617

1718
render() {
18-
const { children, navbarPostion, classes, ...other } = this.props;
19+
const { children, navbarPostion, classes, color, ...other } = this.props;
1920
return (
20-
<AppBar position={navbarPostion} color="default">
21+
<AppBar position={navbarPostion} color={color}>
2122
{React.cloneElement(children, { ...other })}
2223
</AppBar>
2324
);

yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ babel-plugin-transform-flow-strip-types@^6.22.0:
740740
babel-plugin-syntax-flow "^6.18.0"
741741
babel-runtime "^6.22.0"
742742

743-
babel-plugin-transform-object-rest-spread@^6.22.0, babel-plugin-transform-object-rest-spread@^6.26.0:
743+
babel-plugin-transform-object-rest-spread@^6.22.0:
744744
version "6.26.0"
745745
resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
746746
dependencies:

0 commit comments

Comments
 (0)