Skip to content

Final preparations for release #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions src/components/Grid/Grid.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,14 @@ import React from 'react'
import { Story, Meta } from '@storybook/react'
import { Grid } from '.'
import { Box, Row } from '../'
import { randomColor } from '../../docs/util'
import type { CSS } from '../../stitches.config'

export default {
title: 'Components/Grid',
component: Grid,
} as Meta

const keys = ['primary', 'info', 'success', 'error', 'warning']
const randomColor = (): CSS['backgroundColor'] => {
const color = keys[Math.floor(Math.random() * keys.length)]
return `$${color}6`
}

const border = '1px solid $grey3'

type BoxProps = React.ComponentProps<typeof Box>
Expand Down
12 changes: 6 additions & 6 deletions src/docs/colours.stories.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { SemanticColors, Swatch, Colors, Surfaces } from './util'

### Light

<ThemeProvider choice="light">
<ThemeProvider local light={lightTheme} choice="light">
<Grid
css={{
gridTemplateColumns: '1fr 1fr 1fr',
Expand All @@ -43,7 +43,7 @@ import { SemanticColors, Swatch, Colors, Surfaces } from './util'

### Dark

<ThemeProvider choice="dark">
<ThemeProvider local darkTheme={darkTheme} choice="dark">
<Grid
css={{
gridTemplateColumns: '1fr 1fr 1fr',
Expand Down Expand Up @@ -75,7 +75,7 @@ These are themed and rand from 1-12, with 9 being the pure color from which the

### Light

<ThemeProvider choice="light">
<ThemeProvider local light={lightTheme} choice="light">
<Column css={{ p: '$3', py: '$6', backgroundColor: '$paper' }}>
<Colors key="primary" theme={lightTheme} name="primary" />
<Colors key="grey" theme={lightTheme} name="grey" />
Expand All @@ -89,7 +89,7 @@ These are themed and rand from 1-12, with 9 being the pure color from which the

### Dark

<ThemeProvider choice="dark">
<ThemeProvider local dark={darkTheme} choice="dark">
<Column css={{ p: '$3', py: '$6', backgroundColor: '$paper' }}>
<Colors key="primary" theme={darkTheme} name="primary" />
<Colors key="grey" theme={darkTheme} name="grey" />
Expand All @@ -107,13 +107,13 @@ We use the brand colours within our main color sets differently for light and da
themes.

<>
<ThemeProvider choice="light">
<ThemeProvider local light={lightTheme} choice="light">
<Column css={{ p: '$3', py: '$6', backgroundColor: '$paper' }}>
<Colors key="brandYellow" theme={lightTheme} name="brandYellow" />
<Colors key="brandGrey" theme={lightTheme} name="brandGrey" />
</Column>
</ThemeProvider>
<ThemeProvider choice="dark">
<ThemeProvider local dark={darkTheme} choice="dark">
<Column css={{ p: '$3', py: '$6', backgroundColor: '$paper' }}>
<Colors key="brandYellow" theme={darkTheme} name="brandYellow" />
<Colors key="brandGrey" theme={darkTheme} name="brandGrey" />
Expand Down
Loading