Skip to content
This repository has been archived by the owner on Dec 15, 2024. It is now read-only.

Commit

Permalink
Merge pull request #53 from JSBros/0.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Garet McKinley authored Jan 24, 2017
2 parents fd1bfb2 + 45e1034 commit a0bb57f
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 4 deletions.
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p

### Changed

## [v0.5.0] - 2017-01-24

### Added

- Flowtype support
- `Hidden` component

### Changed

- Fixed the unnecessary inheritance of the `theme` prop to standard elements

## [v0.4.0] - 2016-12-05

### Added
Expand Down Expand Up @@ -82,7 +93,8 @@ Added Support for the following CSS flex props on the `Row` component:
- Made progress on code comments
- Various linting

[Unreleased]: https://github.com/JSBros/hedron/compare/v0.4.0...master
[Unreleased]: https://github.com/JSBros/hedron/compare/v0.5.0...master
[v0.5.0]: https://github.com/JSBros/hedron/compare/v0.4.0...v0.5.0
[v0.4.0]: https://github.com/JSBros/hedron/compare/v0.3.0...v0.4.0
[v0.3.0]: https://github.com/JSBros/hedron/compare/v0.2.0...v0.3.0
[v0.2.0]: https://github.com/JSBros/hedron/compare/v0.1.3...v0.2.0
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hedron",
"version": "0.4.0",
"version": "0.5.0",
"description": "A no-frills flexbox grid system for React.",
"main": "dist/hedron.js",
"author": {
Expand Down
3 changes: 2 additions & 1 deletion src/components/Column.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ type Props = {
children?: Array<React.Element<>>,
className?: string,
tagName?: string,
theme?: Object,
debug?: boolean,
divisions?: number,
fluid?: boolean,
Expand All @@ -23,7 +24,7 @@ type Props = {
}

function ColumnContainer(props: Props) {
const { children, tagName, debug, divisions, fluid, xs, sm, md, lg,
const { children, tagName, debug, divisions, fluid, xs, sm, md, lg, theme,
xsShift, smShift, mdShift, lgShift,
...rest } = props;
const newChildren = passOn(children, [Row], (child) => {
Expand Down
3 changes: 2 additions & 1 deletion src/components/Row.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ type Props = {
className?: string,
debug?: boolean,
tagName?: string,
theme?: Object,
// grid props
divisions?: number,
// flex props
Expand All @@ -22,7 +23,7 @@ type Props = {
}

function RowContainer(props: Props) {
const { children, tagName, debug, divisions,
const { children, tagName, debug, divisions, theme,
alignContent, alignItems, alignSelf, justifyContent, order,
...rest } = props;
const newChildren = passOn(children, [Column, Hidden], (child) => {
Expand Down

0 comments on commit a0bb57f

Please sign in to comment.