Skip to content

Commit

Permalink
Merge pull request #10 from JSBros/v0.1.3
Browse files Browse the repository at this point in the history
v0.1.3 Release
  • Loading branch information
AriTheElk authored Nov 11, 2016
2 parents 888af46 + 0af23c2 commit de24826
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 10 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
language: node_js
node_js:
- "6"
script: npm run lint

16 changes: 13 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p

### Changed

## [v0.1.3] - 2016-11-11

### Added

- Integrated with `travis-ci` for easier community contributions.

### Changed

- Fixed syntax errors in the README example.
- Cleared all linting errors.

## [v0.1.2] - 2016-11-10
## [v0.1.2] - 2016-11-09

### Added

Expand All @@ -24,7 +33,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p

- Made the example in the README more elaborate.

## [v0.1.1] - 2016-11-10
## [v0.1.1] - 2016-11-09

### Added

Expand All @@ -35,7 +44,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
- Made progress on code comments
- Various linting

[Unreleased]: https://github.com/JSBros/hedron/compare/v0.1.2...master
[Unreleased]: https://github.com/JSBros/hedron/compare/v0.1.3...master
[v0.1.3]: https://github.com/JSBros/hedron/compare/v0.1.2...v0.1.3
[v0.1.2]: https://github.com/JSBros/hedron/compare/v0.1.1...v0.1.2
[v0.1.1]: https://github.com/JSBros/hedron/compare/v0.1.0...v0.1.1

11 changes: 8 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
{
"name": "hedron",
"version": "0.1.2",
"description": "A no-frills flex-box grid system for React.",
"version": "0.1.3",
"description": "A no-frills flexbox grid system for React.",
"main": "dist/hedron.js",
"author": {
"name": "Garet McKinley",
"email": "[email protected]",
"url": "https://github.com/garetmckinley"
},
"scripts": {
"build": "npm run build:lib && npm run build:dist",
"build:lib": "babel src --out-dir lib",
Expand All @@ -14,7 +19,7 @@
"bugs": {
"url": "https://github.com/garetmckinley/hedron/issues"
},
"homepage": "https://garetmckinley.github.io/hedron",
"homepage": "http://jsb.ro/hedron",
"repository": {
"type": "git",
"url": "git+https://github.com/garetmckinley/hedron.git"
Expand Down
5 changes: 3 additions & 2 deletions src/components/Row.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ function RowContainer(props) {
const { children, divisions, ...rest } = props;
const scaledChildren = React.Children.map(children,
child => React.cloneElement(child, {
divisions: divisions
divisions
})
);
return <section {...rest} children={scaledChildren} />;
return <section {...rest}>{scaledChildren}</section>;
}

RowContainer.propTypes = {
children: React.PropTypes.element,
className: React.PropTypes.string,
divisions: React.PropTypes.number
};
Expand Down
4 changes: 2 additions & 2 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import Row from './components/Row';
import { divvy, media } from './utils';

const utils = {
[divvy]: divvy,
[media]: media
divvy,
media
};

export { Column, Row, utils };
Expand Down

0 comments on commit de24826

Please sign in to comment.