Skip to content

Button #20

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.

Sign up for GitHub

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

Jump to bottom
Merged
ivanbogdanov merged 3 commits into from
Oct 14, 2015
Merged

Button #20

ivanbogdanov merged 3 commits into from
Oct 14, 2015

Conversation

@donnieberg
Copy link
Contributor

@donnieberg donnieberg commented Oct 13, 2015

@madpotato
Modified Button component to take in the following props:

  • Inverse (bool)
  • Disabled (bool)
  • Destructive (string - variant prop)

NEXT: create stateful variant

@ivanbogdanov
Copy link

ivanbogdanov commented Oct 13, 2015

Looks like there is a merge conflict there now. Can you look into it? Or cancel , update and resubmit?

@donnieberg
Copy link
Contributor Author

donnieberg commented Oct 14, 2015

Just fixed the merge conflict. @madpotato

ivanbogdanov pushed a commit that referenced this pull request Oct 14, 2015
@ivansfdc
Merge pull request #20 from salesforce-ux/button
487ef3f 
Button
@ivanbogdanov ivanbogdanov merged commit 487ef3f into master Oct 14, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@donnieberg @ivanbogdanov