Skip to content

Commit

Permalink
docs(storybook): Remove extra wrappers
Browse files Browse the repository at this point in the history
- Replace additional (unnecessary) wrappers for `Grid`, `Col` and `Layout`
- Replace by applying styles directly
- This makes the documentation reflect more accurately reflex's behavior

Closes #339
  • Loading branch information
Oscar Bartra committed Dec 30, 2017
1 parent cc80fbe commit 7d228c7
Show file tree
Hide file tree
Showing 42 changed files with 960 additions and 914 deletions.
71 changes: 71 additions & 0 deletions storybook/shared/box.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
// @flow
import * as React from 'react'
import { Grid, Col } from 'gymnast'
import type { Spacing } from '../../src/types'
import {
axonBlack,
axonGold,
nomuraGray,
bolt,
white,
} from '../../src/dev/colors'

const typeMap = {
A: 1,
B: 2,
C: 3,
D: 4,
E: 5,
}

export const colors = {
colors1: {
color: axonGold,
backgroundColor: axonBlack,
},
colors2: {
color: bolt,
backgroundColor: nomuraGray,
},
colors3: {
color: axonBlack,
backgroundColor: axonGold,
},
colors4: {
color: nomuraGray,
backgroundColor: bolt,
},
colors5: {
color: axonBlack,
backgroundColor: white,
},
}

type BoxProps = {
type: $Keys<typeof typeMap>,
style?: Object,
children?: React.Node,
value?: string,
margin?: Spacing,
}

export function Box({
children,
style = {},
type,
value = type,
...props
}: BoxProps) {
return (
<Col {...props}>
<Grid
padding={['L', 0]}
align="center"
justify="center"
style={{ ...style, ...colors[`colors${String(typeMap[type])}`] }}
>
{children || value}
</Grid>
</Col>
)
}
112 changes: 0 additions & 112 deletions storybook/shared/components.js

This file was deleted.

2 changes: 1 addition & 1 deletion storybook/shared/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ import loremIpsumTxt from './loremIpsum.txt'

export { default as getMarginSelect } from './margin'
export { default as getPositionSelect } from './position'
export * from './components'
export * from './box'
export const loremIpsum = loremIpsumTxt
111 changes: 57 additions & 54 deletions storybook/stories/components/card/base.js
Original file line number Diff line number Diff line change
@@ -1,66 +1,69 @@
// @flow
import * as React from 'react'
import { Grid, Col, RootLayout } from '../../../shared'
import { Root, Layout, Grid, Col } from 'gymnast'
import { colors } from '../../../shared'

export default () => (
<RootLayout>
<Grid>
<Col>
<h1>Consistent Padding</h1>
</Col>
<Layout height="parent">
<Root>
<Grid>
<Col>
<h1>Consistent Padding</h1>
</Col>

<Grid size={3} margin="0 L/2">
<Grid dev={2} padding="L L/2 0" margin="0 L/2">
<Col dev={4}>All around padding</Col>
<Grid size={3} margin="0 L/2">
<Grid style={colors.colors2} padding="L L/2 0" margin="0 L/2">
<Col style={colors.colors4}>All around padding</Col>
</Grid>
</Grid>
</Grid>
<Grid size={3} margin="0 L/2">
<Grid>
<Grid dev={2}>Full Bleed</Grid>
<Grid size={3} margin="0 L/2">
<Grid>
<Grid style={colors.colors2}>Full Bleed</Grid>
</Grid>
</Grid>
</Grid>

<Grid margin="L L/2">
<h1>Mixed Padding</h1>
</Grid>

<Col size={6}>
<Grid size={8} dev={2} padding="L L/2 0">
<Col>Padding</Col>
<Grid margin="L L/2">
<h1>Mixed Padding</h1>
</Grid>
<Grid size={4} dev={4}>
<Grid>No padding</Grid>
</Grid>
</Col>

<Col size={6}>
<Grid size={4} dev={4}>
<Grid>No padding</Grid>
</Grid>
<Grid size={4} dev={2} padding="L L/2 0">
<Col>Padding</Col>
</Grid>
<Grid size={4} dev={4}>
<Grid>No padding</Grid>
</Grid>
</Col>
<Col size={6}>
<Grid size={8} style={colors.colors2} padding="L L/2 0">
<Col>Padding</Col>
</Grid>
<Grid size={4} style={colors.colors4}>
<Grid>No padding</Grid>
</Grid>
</Col>

<Col size={6}>
<Grid size={4} dev={4}>
<Grid>No padding</Grid>
</Grid>
<Grid size={8} dev={2} padding="L L/2 0">
<Col>Padding</Col>
</Grid>
</Col>
<Col size={6}>
<Grid dev={2} padding="L L/2 0">
<Col>Padding</Col>
</Grid>
<Grid dev={4}>
<Grid>No padding</Grid>
</Grid>
</Col>
</Grid>
</RootLayout>
<Col size={6}>
<Grid size={4} style={colors.colors4}>
<Grid>No padding</Grid>
</Grid>
<Grid size={4} style={colors.colors2} padding="L L/2 0">
<Col>Padding</Col>
</Grid>
<Grid size={4} style={colors.colors4}>
<Grid>No padding</Grid>
</Grid>
</Col>

<Col size={6}>
<Grid size={4} style={colors.colors4}>
<Grid>No padding</Grid>
</Grid>
<Grid size={8} style={colors.colors2} padding="L L/2 0">
<Col>Padding</Col>
</Grid>
</Col>
<Col size={6}>
<Grid style={colors.colors2} padding="L L/2 0">
<Col>Padding</Col>
</Grid>
<Grid style={colors.colors4}>
<Grid>No padding</Grid>
</Grid>
</Col>
</Grid>
</Root>
</Layout>
)
Loading

0 comments on commit 7d228c7

Please sign in to comment.