Skip to content

feat(Button): support all features, update to v1 API #295

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 20 commits into from
Sep 9, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
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
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ node_modules/
bower_components/
coverage/
dist/
docs/build
docs/build/
docs/app/docgenInfo.json
dll
dll/

.DS_Store
.idea/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class FormOnSubmitExample extends Component {
</Form.Group>
<Form.TextArea name='details' label='Details' placeholder='Anything else we should know?' rows='3' />
<Form.Checkbox name='terms' label='I agree to the Terms and Conditions' />
<Button className='primary' type='submit'>Submit</Button>
<Button primary type='submit'>Submit</Button>

<Message>
<pre>serializedForm: {JSON.stringify(serializedForm, null, 2)}</pre>
Expand Down
4 changes: 1 addition & 3 deletions docs/app/Examples/collections/Menu/Content/Buttons.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import React from 'react'
import { Button, Menu } from 'stardust'

// TODO: Update <Button> usage after its update to v1 API

const Buttons = () => {
return (
<Menu>
<Menu.Item>
<Button className='primary'>Sign up</Button>
<Button primary>Sign up</Button>
</Menu.Item>

<Menu.Item>
Expand Down
4 changes: 1 addition & 3 deletions docs/app/Examples/collections/Menu/Variations/SizeHuge.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import React, { Component } from 'react'
import { Button, Dropdown, Menu } from 'stardust'

// TODO: Update <Button> usage after its update to v1 API

export default class SizeHuge extends Component {
state = { activeItem: 'home' }

Expand All @@ -26,7 +24,7 @@ export default class SizeHuge extends Component {
</Dropdown>

<Menu.Item>
<Button className='primary'>Sign Up</Button>
<Button primary>Sign Up</Button>
</Menu.Item>
</Menu.Menu>
</Menu>
Expand Down
4 changes: 1 addition & 3 deletions docs/app/Examples/collections/Menu/Variations/SizeLarge.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import React, { Component } from 'react'
import { Button, Dropdown, Menu } from 'stardust'

// TODO: Update <Button> usage after its update to v1 API

export default class SizeLarge extends Component {
state = { activeItem: 'home' }

Expand All @@ -26,7 +24,7 @@ export default class SizeLarge extends Component {
</Dropdown>

<Menu.Item>
<Button className='primary'>Sign Up</Button>
<Button primary>Sign Up</Button>
</Menu.Item>
</Menu.Menu>
</Menu>
Expand Down
4 changes: 1 addition & 3 deletions docs/app/Examples/collections/Menu/Variations/SizeMassive.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import React, { Component } from 'react'
import { Button, Dropdown, Menu } from 'stardust'

// TODO: Update <Button> usage after its update to v1 API

export default class SizeMassive extends Component {
state = { activeItem: 'home' }

Expand All @@ -26,7 +24,7 @@ export default class SizeMassive extends Component {
</Dropdown>

<Menu.Item>
<Button className='primary'>Sign Up</Button>
<Button primary>Sign Up</Button>
</Menu.Item>
</Menu.Menu>
</Menu>
Expand Down
4 changes: 1 addition & 3 deletions docs/app/Examples/collections/Menu/Variations/SizeMini.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import React, { Component } from 'react'
import { Button, Dropdown, Menu } from 'stardust'

// TODO: Update <Button> usage after its update to v1 API

export default class SizeMini extends Component {
state = { activeItem: 'home' }

Expand All @@ -26,7 +24,7 @@ export default class SizeMini extends Component {
</Dropdown>

<Menu.Item>
<Button className='primary'>Sign Up</Button>
<Button primary>Sign Up</Button>
</Menu.Item>
</Menu.Menu>
</Menu>
Expand Down
4 changes: 1 addition & 3 deletions docs/app/Examples/collections/Menu/Variations/SizeSmall.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import React, { Component } from 'react'
import { Button, Dropdown, Menu } from 'stardust'

// TODO: Update <Button> usage after its update to v1 API

export default class SizeSmall extends Component {
state = { activeItem: 'home' }

Expand All @@ -26,7 +24,7 @@ export default class SizeSmall extends Component {
</Dropdown>

<Menu.Item>
<Button className='primary'>Sign Up</Button>
<Button primary>Sign Up</Button>
</Menu.Item>
</Menu.Menu>
</Menu>
Expand Down
4 changes: 1 addition & 3 deletions docs/app/Examples/collections/Menu/Variations/SizeTiny.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import React, { Component } from 'react'
import { Button, Dropdown, Menu } from 'stardust'

// TODO: Update <Button> usage after its update to v1 API

export default class SizeTiny extends Component {
state = { activeItem: 'home' }

Expand All @@ -26,7 +24,7 @@ export default class SizeTiny extends Component {
</Dropdown>

<Menu.Item>
<Button className='primary'>Sign Up</Button>
<Button primary>Sign Up</Button>
</Menu.Item>
</Menu.Menu>
</Menu>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import React from 'react'
import { Button, Checkbox, Form, Icon, Message } from 'stardust'

// TODO update Button usage after they're updated to v1 API

const MessageAttachedExample = () => (
<div>
<Message
Expand All @@ -18,7 +16,7 @@ const MessageAttachedExample = () => (
<Form.Input label='Username' placeholder='Username' type='text' />
<Form.Input label='Password' type='password' />
<Form.Checkbox inline label='I agree to the terms and conditions' />
<Button className='blue submit button'>Submit</Button>
<Button color='blue'>Submit</Button>
</Form>
<Message attached='bottom' warning>
<Icon name='help' />
Expand Down
20 changes: 0 additions & 20 deletions docs/app/Examples/elements/Button/ButtonExamples.js

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import React, { Component } from 'react'
import { Buttons, Button } from 'stardust'
import React from 'react'
import { Button } from 'stardust'

export default class ButtonConditionalsExample extends Component {
render() {
return (
<Buttons>
<Button>Cancel</Button>
<div className='or' />
<Button className='positive'>Save</Button>
</Buttons>
)
}
}
const ButtonConditionalsExample = () => (
<Button.Group>
<Button>Cancel</Button>
<Button.Or />
<Button positive>Save</Button>
</Button.Group>
)

export default ButtonConditionalsExample
23 changes: 0 additions & 23 deletions docs/app/Examples/elements/Button/Content/ButtonContentExamples.js

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import React from 'react'
import { Button } from 'stardust'

const ButtonMultipleConditionalsExample = () => (
<Button.Group>
<Button>One</Button>
<Button.Or />
<Button>Two</Button>
<Button.Or />
<Button>Three</Button>
</Button.Group>
)

export default ButtonMultipleConditionalsExample
18 changes: 18 additions & 0 deletions docs/app/Examples/elements/Button/Content/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import React from 'react'
import ComponentExample from 'docs/app/Components/ComponentDoc/ComponentExample'
import ExampleSection from 'docs/app/Components/ComponentDoc/ExampleSection'

const ButtonContentExamples = () => (
<ExampleSection title='Content'>
<ComponentExample
title='Conditionals'
description='Button groups can contain conditionals'
examplePath='elements/Button/Content/ButtonConditionalsExample'
/>
<ComponentExample
examplePath='elements/Button/Content/ButtonMultipleConditionalsExample'
/>
</ExampleSection>
)

export default ButtonContentExamples
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react'
import { Button } from 'stardust'

const ButtonGroupBasicColoredExample = () => (
<Button.Group>
<Button basic color='red'>One</Button>
<Button basic color='green'>Two</Button>
<Button basic color='blue'>Three</Button>
</Button.Group>
)

export default ButtonGroupBasicColoredExample
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import React from 'react'
import { Button, Divider } from 'stardust'

const ButtonGroupBasicExample = () => (
<div>
<Button.Group basic>
<Button>One</Button>
<Button>Two</Button>
<Button>Three</Button>
</Button.Group>
<Divider />
<Button.Group basic vertical>
<Button>One</Button>
<Button>Two</Button>
<Button>Three</Button>
</Button.Group>
</div>
)

export default ButtonGroupBasicExample
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react'
import { Button } from 'stardust'

const ButtonGroupColoredExample = () => (
<Button.Group color='blue'>
<Button>One</Button>
<Button>Two</Button>
<Button>Three</Button>
</Button.Group>
)

export default ButtonGroupColoredExample
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import React from 'react'
import { Button, Divider } from 'stardust'

const ButtonGroupEqualWidthExample = () => (
<div>
<Button.Group widths='5'>
<Button>Overview</Button>
<Button>Specs</Button>
<Button>Warranty</Button>
<Button>Reviews</Button>
<Button>Support</Button>
</Button.Group>
<Divider />
<Button.Group widths='3'>
<Button>Overview</Button>
<Button>Specs</Button>
<Button>Support</Button>
</Button.Group>
</div>
)

export default ButtonGroupEqualWidthExample
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import React from 'react'
import { Button, Icon } from 'stardust'

const ButtonGroupIconExample = () => (
<Button.Group icon>
<Button>
<Icon name='play' />
</Button>
<Button>
<Icon name='pause' />
</Button>
<Button>
<Icon name='shuffle' />
</Button>
</Button.Group>
)

export default ButtonGroupIconExample
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react'
import { Button } from 'stardust'

const ButtonGroupIconShorthandExample = () => (
<Button.Group>
<Button icon='play' />
<Button icon='pause' />
<Button icon='shuffle' />
</Button.Group>
)

export default ButtonGroupIconShorthandExample
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import React from 'react'
import { Button } from 'stardust'

const ButtonGroupIconSizeExample = () => (
<Button.Group basic size='small'>
<Button icon='file' />
<Button icon='save' />
<Button icon='upload' />
<Button icon='download' />
</Button.Group>
)

export default ButtonGroupIconSizeExample
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react'
import { Button } from 'stardust'

const ButtonGroupLabeledIconExample = () => (
<Button.Group labeled>
<Button icon='play' content='Play' />
<Button icon='pause' content='Pause' />
<Button icon='shuffle' content='Shuffle' />
</Button.Group>
)

export default ButtonGroupLabeledIconExample
Loading