Spearhead/joyent-portal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix merge issue

Browse Source
This commit is contained in:
Tom Gallacher 2016-12-09 15:09:54 +00:00 committed by Sérgio Ramos
parent fbe77515f4
commit 90346fd7b4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/stories/index.js
View File

@ -16,8 +16,8 @@ const {
Tabs, Tabs,
Tab, Tab,
Toggle, Toggle,
Widget Widget,
Radio, Radio
} = require('../src/'); } = require('../src/');
const styles = { const styles = {
@ -129,7 +129,6 @@ storiesOf('Checkbox', module)
<Checkbox disabled /> <Checkbox disabled />
)); ));
<<<<<<< HEAD
storiesOf('Tabs', module) storiesOf('Tabs', module)
.add('Default', () => ( .add('Default', () => (
<Tabs name='my-tab-group'> <Tabs name='my-tab-group'>
@ -163,10 +162,12 @@ storiesOf('Widget', module)
<p>Some text</p> <p>Some text</p>
</Widget> </Widget>
)) ))
=======
storiesOf('Radio', module) storiesOf('Radio', module)
.add('Default', () => ( .add('Default', () => (
<Radio /> <Radio>
Video killed the radio star
</Radio>
)) ))
.add('Checked', () => ( .add('Checked', () => (
<Radio checked onChange={function noop() {}} /> <Radio checked onChange={function noop() {}} />
@ -174,4 +175,3 @@ storiesOf('Radio', module)
.add('Disabled', () => ( .add('Disabled', () => (
<Radio disabled /> <Radio disabled />
)); ));
>>>>>>> Add Radio Button