Skip to content

Commit

Permalink
Final cleanup before v0.3.0 Release (#32)
Browse files Browse the repository at this point in the history
* Consolidated propTypes in ColumnContainer
* Made component imports relative
* pop off the fluid prop in the `PageContainer` spread.
* Silenced `no-unused-vars` eslint rule in `Page` component.
  • Loading branch information
AriTheElk authored Nov 16, 2016
1 parent eb9b711 commit 343f3c6
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/components/Column.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable no-unused-vars */
import React from 'react';
import styled from 'styled-components';
import { Row } from '../';
import Row from './Row';
import { divvy, media, passOn } from '../utils';


Expand Down
14 changes: 6 additions & 8 deletions src/components/Page.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
/* eslint-disable no-unused-vars */
import React from 'react';
import styled from 'styled-components';
import { Row } from '../';
import Row from './Row';
import { passOn } from '../utils';


function PageContainer(props) {
const { children, tagName, debug, ...rest } = props;
const { children, tagName, debug, fluid, ...rest } = props;
const newChildren = passOn(children, [Row], (child) => {
return {
debug: typeof child.props.debug === 'undefined'
Expand All @@ -20,7 +21,9 @@ PageContainer.propTypes = {
children: React.PropTypes.node,
tagName: React.PropTypes.string,
className: React.PropTypes.string,
debug: React.PropTypes.bool
debug: React.PropTypes.bool,
fluid: React.PropTypes.bool,
width: React.PropTypes.string
};


Expand All @@ -39,10 +42,5 @@ const Page = styled(PageContainer)`
}
`;

Page.propTypes = {
fluid: React.PropTypes.bool,
width: React.PropTypes.string
};

export default Page;

2 changes: 1 addition & 1 deletion src/components/Row.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable no-unused-vars */
import React from 'react';
import styled from 'styled-components';
import { Column } from '../';
import Column from './Column';
import { divvy, passOn } from '../utils';


Expand Down

0 comments on commit 343f3c6

Please sign in to comment.