Skip to content

Commit

Permalink
Merge pull request #472 from jxnblk/update-components
Browse files Browse the repository at this point in the history
Upgrade to @rebass/components, @rebass/grid, and styled-system 3
  • Loading branch information
jxnblk committed Sep 8, 2018
2 parents f33e2ec + b4e260e commit 06fe3ce
Show file tree
Hide file tree
Showing 150 changed files with 1,270 additions and 4,850 deletions.
8 changes: 4 additions & 4 deletions .babelrc
Expand Up @@ -12,16 +12,16 @@
{
"replacements": [
{
"original": "^system-components$",
"replacement": "system-components/emotion"
"original": "^@rebass/components$",
"replacement": "@rebass/components/emotion"
},
{
"original": "^styled-components$",
"replacement": "emotion-theming"
},
{
"original": "^grid-styled$",
"replacement": "grid-styled/emotion"
"original": "^@rebass/grid$",
"replacement": "@rebass/grid/emotion"
}
]
}
Expand Down
18 changes: 18 additions & 0 deletions CHANGELOG.md
@@ -1,6 +1,24 @@

# Changelog

## [2.2.0] 2018-09-08

- Use `polished` for color manipulation instead of `chroma-js`

## [2.1.1] 2018-09-08

- Support `width` prop on Card
- Update docs

## [2.1.0] 2018-08-14

- Add Hide component

## [2.0.1] 2018-06-30

- Add `fontFamily` to Heading and Text components
- Update docs

## [2.0.0] 2018-06-24

### Added
Expand Down
6 changes: 3 additions & 3 deletions README.md
Expand Up @@ -58,7 +58,7 @@ import * as Rebass from 'rebass/emotion'

- Kickstart your own React component library
- Responsive style props from [styled-system][system]
- Flexbox grid with [grid-styled][gs]
- Flexbox grid with [Rebass Grid][]
- Support for [styled-components][sc] & [emotion][emotion]
- Functional stateless UI components
- Configurable theming
Expand Down Expand Up @@ -115,12 +115,12 @@ for more on some of the thought behind Rebass.
### Related

- [styled-system][system]
- [grid-styled][gs]
- [Rebass Grid][]
- [styled-components][sc]
- [emotion][emotion]

[system]: https://github.com/jxnblk/styled-system
[gs]: https://github.com/jxnblk/grid-styled
[Rebass Grid]: https://github.com/rebassjs/grid
[sc]: https://github.com/styled-components/styled-components
[emotion]: https://github.com/emotion-js/emotion

Expand Down
23 changes: 0 additions & 23 deletions create-rebass/README.md

This file was deleted.

29 changes: 0 additions & 29 deletions create-rebass/init.js

This file was deleted.

19 changes: 0 additions & 19 deletions create-rebass/package.json

This file was deleted.

4 changes: 1 addition & 3 deletions docs/components/Absolute.md
Expand Up @@ -6,6 +6,4 @@
Hello
</Absolute>
</Relative>
```

Extends: [Position](/components/Position)
```
6 changes: 3 additions & 3 deletions docs/components/Avatar.md
Expand Up @@ -9,8 +9,7 @@

prop | default | theme key | style type
---|---|---|---
size | 48 | N/A | responsive
borderRadius | 99999px | radii | default
borderRadius | 99999px | radii | responsive
m | | space | responsive
mt | | space | responsive
mr | | space | responsive
Expand All @@ -26,4 +25,5 @@ pl | | space | responsive
px | | space | responsive
py | | space | responsive
color | | colors | responsive
bg | | colors | responsive
bg | | colors | responsive
size | 48 | N/A | responsive
7 changes: 4 additions & 3 deletions docs/components/BackgroundImage.md
Expand Up @@ -9,10 +9,11 @@

prop | default | theme key | style type
---|---|---|---
image | | N/A | responsive
width | 1 | N/A | responsive
ratio | 0.75 | N/A | default
backgroundSize | cover | N/A | default
backgroundPosition | center | N/A | default
ratio | 0.75 | N/A | responsive
backgroundSize | cover | N/A | responsive
backgroundPosition | center | N/A | responsive
m | | space | responsive
mt | | space | responsive
mr | | space | responsive
Expand Down
6 changes: 3 additions & 3 deletions docs/components/Badge.md
Expand Up @@ -11,7 +11,6 @@

prop | default | theme key | style type
---|---|---|---
fontSize | | fontSizes | responsive
m | | space | responsive
mt | | space | responsive
mr | | space | responsive
Expand All @@ -28,5 +27,6 @@ px | 2 | space | responsive
py | 1 | space | responsive
color | white | colors | responsive
bg | blue | colors | responsive
fontWeight | bold | fontWeights | default
borderRadius | 2 | radii | default
fontSize | | fontSizes | responsive
fontWeight | bold | fontWeights | responsive
borderRadius | 2 | radii | responsive
27 changes: 3 additions & 24 deletions docs/components/Banner.md
Expand Up @@ -12,30 +12,9 @@
</Banner>
```

Extends: [Flex](/components/Flex) > [Box](/components/Box)

prop | default | theme key | style type
---|---|---|---
m | | space | responsive
mt | | space | responsive
mr | | space | responsive
mb | | space | responsive
ml | | space | responsive
mx | | space | responsive
my | | space | responsive
p | 3,4 | space | responsive
pt | | space | responsive
pr | | space | responsive
pb | | space | responsive
pl | | space | responsive
px | | space | responsive
py | | space | responsive
flexDirection | column | N/A | responsive
alignItems | center | N/A | responsive
justifyContent | center | N/A | responsive
backgroundSize | cover | N/A | default
backgroundPosition | center | N/A | default
minHeight | 80vh | minHeights | responsive
color | white | colors | responsive
bg | black | colors | responsive
backgroundImage | | N/A | default
backgroundSize | cover | N/A | responsive
backgroundPosition | center | N/A | responsive
backgroundImage | | N/A | responsive
4 changes: 2 additions & 2 deletions docs/components/BlockLink.md
Expand Up @@ -9,8 +9,6 @@

prop | default | theme key | style type
---|---|---|---
color | inherit | colors | responsive
bg | | colors | responsive
m | | space | responsive
mt | | space | responsive
mr | | space | responsive
Expand All @@ -25,4 +23,6 @@ pb | | space | responsive
pl | | space | responsive
px | | space | responsive
py | | space | responsive
color | inherit | colors | responsive
bg | | colors | responsive
width | | N/A | responsive
22 changes: 1 addition & 21 deletions docs/components/Blockquote.md
Expand Up @@ -4,24 +4,4 @@
<Blockquote>
“The simplest scale is a single note, and sticking with a single note draws more attention to other parameters, such as rhythm and inflection.”
</Blockquote>
```

Extends: [Base](/components/Base)

prop | default | theme key | style type
---|---|---|---
fontSize | 3 | fontSizes | responsive
m | | space | responsive
mt | | space | responsive
mr | | space | responsive
mb | | space | responsive
ml | | space | responsive
mx | | space | responsive
my | | space | responsive
p | | space | responsive
pt | | space | responsive
pr | | space | responsive
pb | | space | responsive
pl | | space | responsive
px | | space | responsive
py | | space | responsive
```
14 changes: 7 additions & 7 deletions docs/components/Border.md
Expand Up @@ -11,12 +11,6 @@

prop | default | theme key | style type
---|---|---|---
border | 1 | borders | responsive
borderTop | | borders | responsive
borderRight | | borders | responsive
borderBottom | | borders | responsive
borderLeft | | borders | responsive
borderColor | gray | colors | default
m | | space | responsive
mt | | space | responsive
mr | | space | responsive
Expand All @@ -33,4 +27,10 @@ px | | space | responsive
py | | space | responsive
width | | N/A | responsive
color | | colors | responsive
bg | | colors | responsive
bg | | colors | responsive
border | 1 | borders | responsive
borderTop | | borders | responsive
borderRight | | borders | responsive
borderBottom | | borders | responsive
borderLeft | | borders | responsive
borderColor | gray | colors | responsive
4 changes: 2 additions & 2 deletions docs/components/Button.md
Expand Up @@ -9,7 +9,7 @@
prop | default | theme key | style type
---|---|---|---
fontSize | 1 | fontSizes | responsive
fontWeight | bold | fontWeights | default
fontWeight | bold | fontWeights | responsive
lineHeight | 1.1428571428571428 | lineHeights | responsive
m | | space | responsive
mt | | space | responsive
Expand All @@ -27,7 +27,7 @@ px | 3 | space | responsive
py | 2 | space | responsive
color | white | colors | responsive
bg | blue | colors | responsive
borderRadius | 2 | radii | default
borderRadius | 2 | radii | responsive
border | | borders | responsive
borderTop | | borders | responsive
borderRight | | borders | responsive
Expand Down
22 changes: 1 addition & 21 deletions docs/components/ButtonCircle.md
Expand Up @@ -4,24 +4,4 @@
<ButtonCircle
children='Hello'
/>
```

Extends: [Button](/components/Button)

prop | default | theme key | style type
---|---|---|---
m | | space | responsive
mt | | space | responsive
mr | | space | responsive
mb | | space | responsive
ml | | space | responsive
mx | | space | responsive
my | | space | responsive
p | | space | responsive
pt | | space | responsive
pr | | space | responsive
pb | | space | responsive
pl | | space | responsive
px | 3 | space | responsive
py | 2 | space | responsive
borderRadius | 9999 | radii | default
```
10 changes: 1 addition & 9 deletions docs/components/ButtonOutline.md
Expand Up @@ -4,12 +4,4 @@
<ButtonOutline
children='Hello'
/>
```

Extends: [Button](/components/Button)

prop | default | theme key | style type
---|---|---|---
color | blue | colors | responsive
bg | transparent | colors | responsive
hover | [object Object] | N/A | pseudo
```
10 changes: 1 addition & 9 deletions docs/components/ButtonTransparent.md
Expand Up @@ -4,12 +4,4 @@
<ButtonTransparent>
Hello
</ButtonTransparent>
```

Extends: [Button](/components/Button)

prop | default | theme key | style type
---|---|---|---
color | inherit | colors | responsive
bg | transparent | colors | responsive
focus | [object Object] | N/A | pseudo
```

0 comments on commit 06fe3ce

Please sign in to comment.