Skip to content

Commit 28520e8

Browse files
author
Emily
authored
Merge pull request #113 from primer/release-0.0.9-beta
Release tracking v0.0.10-beta
2 parents 52dd875 + 7e72ce8 commit 28520e8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+961
-174
lines changed

.eslintrc.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
"plugin:jsx-a11y/recommended"
66
],
77
"rules": {
8-
"jsx-a11y/no-autofocus": "warn",
9-
"react/prop-types": "warn",
10-
"react/sort-prop-types": "warn"
8+
"jsx-a11y/no-autofocus": "warn"
119
}
1210
}

docs/bundle.js

Lines changed: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/components/index.html

Lines changed: 6 additions & 1 deletion
Large diffs are not rendered by default.

docs/demos/index.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/index.html

Lines changed: 6 additions & 1 deletion
Large diffs are not rendered by default.

docs/sandbox/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
margin: 0;
1010
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
1111
line-height: 1.5;
12-
}</style><div class="text-dark-gray"><nav class="UnderlineNav"><div class="UnderlineNav-body"><a class="UnderlineNav-item no-underline" href="/primer-react/components">primer-react</a><a class="UnderlineNav-item no-underline" href="/primer-react/demos">Demos</a><a class="UnderlineNav-item no-underline selected" aria-current="page" href="/primer-react/sandbox">Sandbox</a></div></nav><div class="react-live"><div class="nano13x0vfn"><div class="react-live-preview"><div><div class="p-4"><h1 class="m-0 f1">Hello World!</h1><span class="">To get started with the Sandbox, start adding some primer-react components</span></div></div></div><div mt="2" class="nano1c0guhj"><pre class="prism-code nano11r6mrt" spellcheck="false" contenteditable="true">
12+
}</style><div class="text-dark-gray"><nav class="UnderlineNav"><div class="UnderlineNav-body"><a class="UnderlineNav-item no-underline px-3" href="/primer-react/components">Components</a><a class="UnderlineNav-item no-underline px-3" href="/primer-react/demos">Demos</a><a class="UnderlineNav-item no-underline px-3 selected" aria-current="page" href="/primer-react/sandbox">Sandbox</a></div><div class="UnderlineNav-actions"><span class="px-4 text-gray-light text-mono"><svg aria-hidden="true" class="mr-2" height="16" role="img" viewBox="0 0 16 16" width="16" style="display:inline-block;fill:currentColor;user-select:none;vertical-align:text-bottom"><path fill-rule="evenodd" d="M1 4.732v7.47c0 .45.3.84.75.97l6.5 1.73c.16.05.34.05.5 0l6.5-1.73c.45-.13.75-.52.75-.97v-7.47c0-.45-.3-.84-.75-.97l-6.5-1.74a1.4 1.4 0 0 0-.5 0l-6.5 1.74c-.45.13-.75.52-.75.97zm7 9.09l-6-1.59v-6.77l6 1.61v6.75zm-6-9.36l2.5-.67 6.5 1.73-2.5.67L2 4.463zm13 7.77l-6 1.59v-6.75l2-.55v2.44l2-.53v-2.44l2-.53v6.77zm-2-7.24l-6.5-1.73 2-.53 6.5 1.73-2 .53z"></path></svg><a class="text-blue" href="https://github.com/primer/primer-react/releases/v0.0.9-beta">[email protected]</a></span></div></nav><div class="react-live"><div class="nano13x0vfn"><div class="react-live-preview"><div><div class="p-4"><h1 class="m-0 f1">Hello World!</h1><span class="">To get started with the Sandbox, start adding some primer-react components</span></div></div></div><div mt="2" class="nano1c0guhj"><pre class="prism-code nano11r6mrt" spellcheck="false" contenteditable="true">
1313

1414
<span class="token tag"><span class="token tag"><span class="token punctuation">&lt;</span>Block</span> <span class="token attr-name">p</span><span class="token script language-javascript"><span class="token script-punctuation punctuation">=</span><span class="token punctuation">{</span><span class="token number">4</span><span class="token punctuation">}</span></span><span class="token punctuation">></span></span>
1515
<span class="token tag"><span class="token tag"><span class="token punctuation">&lt;</span>Heading</span><span class="token punctuation">></span></span>Hello World<span class="token operator">!</span><span class="token tag"><span class="token tag"><span class="token punctuation">&lt;/</span>Heading</span><span class="token punctuation">></span></span>

examples/_app.js

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,42 @@ import React from 'react'
22
import PropTypes from 'prop-types'
33
import {NavLink} from 'react-router-dom'
44
import Styles from './doc-components/Styles'
5+
import Octicon, {Package} from '@githubprimer/octicons-react'
6+
import {Link, Text, UnderlineNav} from '../src'
7+
import {name, repository, version} from '../package.json'
58

6-
const Page = ({render}) => (
7-
<React.Fragment>
8-
<Styles />
9-
<div className="text-dark-gray">
10-
<nav className="UnderlineNav">
11-
<div className="UnderlineNav-body">
12-
<NavLink to="/components" className="UnderlineNav-item no-underline" activeClassName="selected">
13-
primer-react
9+
const pkg = `${name}@${version}`
10+
const releaseURL = `https://github.com/${repository}/releases/v${version}`
11+
12+
export default function Page({render}) {
13+
return (
14+
<React.Fragment>
15+
<Styles />
16+
<div className="text-dark-gray">
17+
<UnderlineNav
18+
actions={
19+
<Text color="gray-light" mono px={4}>
20+
<Octicon icon={Package} className="mr-2" />
21+
<Link href={releaseURL}>{pkg}</Link>
22+
</Text>
23+
}
24+
>
25+
<NavLink to="/components" className="px-3">
26+
Components
1427
</NavLink>
15-
<NavLink to="/demos" className="UnderlineNav-item no-underline" activeClassName="selected">
28+
<NavLink to="/demos" className="px-3">
1629
Demos
1730
</NavLink>
18-
<NavLink to="/sandbox" className="UnderlineNav-item no-underline" activeClassName="selected">
31+
<NavLink to="/sandbox" className="px-3">
1932
Sandbox
2033
</NavLink>
21-
</div>
22-
</nav>
23-
{render()}
24-
</div>
25-
</React.Fragment>
26-
)
34+
</UnderlineNav>
35+
{render()}
36+
</div>
37+
</React.Fragment>
38+
)
39+
}
2740

2841
Page.propTypes = {
2942
render: PropTypes.func
3043
}
31-
32-
export default Page

examples/component-examples/Buttons.js

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import React from 'react'
2-
import {Block, Button, ButtonLink, ButtonDanger, ButtonPrimary, ButtonOutline} from '../../src'
2+
import ExampleHeading from '../doc-components/ExampleHeading'
3+
import {Block, Button, ButtonLink, ButtonDanger, ButtonPrimary, ButtonOutline, OcticonButton, Text} from '../../src'
4+
import {Hubot, Pencil, X} from '@githubprimer/octicons-react'
35

46
const ButtonExample = {
57
name: 'Buttons',
68
element: (
7-
<div>
9+
<Block p={4}>
810
<Block mb={2}>
911
<Button> Button </Button>
1012
</Block>
@@ -32,7 +34,17 @@ const ButtonExample = {
3234
<Block mb={2}>
3335
<ButtonLink href="https://www.goatslive.com/">This is an {'<a>'} styled as a button</ButtonLink>
3436
</Block>
35-
</div>
37+
<Block mb={2}>
38+
<ExampleHeading>Octicon Buttons</ExampleHeading>
39+
<OcticonButton icon={Pencil} label="Edit" onClick={() => alert('edit')} mr={3} />
40+
<Text color="red">
41+
<OcticonButton icon={X} label="Close" onClick={() => alert('close')} mr={3} />
42+
</Text>
43+
<Block>
44+
<OcticonButton icon={Hubot} size="large" label="ROBOT" onClick={() => alert('beep boop')} />
45+
</Block>
46+
</Block>
47+
</Block>
3648
)
3749
}
3850

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
import React from 'react'
2+
import Octicon, {Zap} from '@githubprimer/octicons-react'
3+
import {LiveEditor} from '@compositor/kit'
4+
import {Block, CircleBadge, Heading} from '../../src'
5+
6+
const octicon = `<CircleBadge size="medium">
7+
<Octicon icon={Zap}/>
8+
</CircleBadge>`
9+
10+
const image = `<CircleBadge bg="blue" size="small"><img src="https://avatars0.githubusercontent.com/t/1929972?s=280&v=4"/></CircleBadge>
11+
`
12+
13+
const sizes = `<CircleBadge bg="blue" size="small"><img src="https://avatars0.githubusercontent.com/t/1929972?s=280&v=4"/></CircleBadge>
14+
<CircleBadge bg="blue" size="medium"><img src="https://avatars0.githubusercontent.com/t/1929972?s=280&v=4"/></CircleBadge>
15+
<CircleBadge bg="blue" size="large"><img src="https://avatars0.githubusercontent.com/t/1929972?s=280&v=4"/></CircleBadge>`
16+
17+
const CircleBadgeExample = {
18+
name: 'CircleBadge',
19+
element: (
20+
<div>
21+
<Block mb={2} pt={2}>
22+
<Heading fontSize={3}>Small, medium & large</Heading>
23+
<LiveEditor code={sizes} scope={{CircleBadge, Octicon, Zap}} />
24+
</Block>
25+
<Block mb={2}>
26+
<Heading fontSize={3}>With Octicon as child</Heading>
27+
<LiveEditor code={octicon} scope={{CircleBadge, Octicon, Zap}} />
28+
</Block>
29+
<Block mb={2} pt={2}>
30+
<Heading fontSize={3}>{`With <img> as a child & bg prop`}</Heading>
31+
<LiveEditor code={image} scope={{CircleBadge, Octicon, Zap}} />
32+
</Block>
33+
</div>
34+
)
35+
}
36+
37+
export default CircleBadgeExample

examples/component-examples/Flash.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ const FlashExample = {
99
<Flash> Flash </Flash>
1010
</Block>
1111
<Block mb={3}>
12-
<Flash yellow> Flash yellow </Flash>
12+
<Flash scheme="yellow"> Flash yellow </Flash>
1313
</Block>
1414
<Block mb={3}>
15-
<Flash red> Flash red </Flash>
15+
<Flash scheme="red"> Flash red </Flash>
1616
</Block>
1717
<Block mb={3}>
18-
<Flash green> Flash green </Flash>
18+
<Flash scheme="green"> Flash green </Flash>
1919
</Block>
2020
<Block mb={3}>
2121
<Flash full> Flash full </Flash>

0 commit comments

Comments
 (0)