This repository was archived by the owner on Mar 4, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 51
feat(Button): add text variant #177
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
7bcea62
-added text prop for the text variation of a button
fafd969
-updated the CHANGELOG
1f224bd
-changed button example text to match the shorthand example
76ca8f3
Merge branch 'master' into feat/button-text
03a5217
Merge branch 'master' into feat/button-text
5cd3005
-small grammar fix
d55e9c1
tweak text button examples in docs
kuzhelov-ms 2e6678b
Merge branch 'feat/button-text' of https://github.com/stardust-ui/rea…
kuzhelov-ms 985b8b3
Merge branch 'master' into feat/button-text
fb02d3c
-merge conflicts
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
docs/src/examples/components/Button/Variations/ButtonExampleText.shorthand.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| import React from 'react' | ||
| import { Button } from '@stardust-ui/react' | ||
|
|
||
| const ButtonExampleTextShorthand = () => ( | ||
| <div> | ||
| <Button text icon="book" content="Default" iconPosition="before" /> | ||
| <Button text type="primary" content="Primary" /> | ||
| <Button text type="secondary" content="Secondary" /> | ||
| <Button text iconOnly icon="compass outline" /> | ||
| </div> | ||
| ) | ||
|
|
||
| export default ButtonExampleTextShorthand |
22 changes: 22 additions & 0 deletions
22
docs/src/examples/components/Button/Variations/ButtonExampleText.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| import React from 'react' | ||
| import { Button, Icon, Text } from '@stardust-ui/react' | ||
|
|
||
| const ButtonExampleText = () => ( | ||
| <div> | ||
| <Button text> | ||
| <Icon name="book" xSpacing="after" /> | ||
| <Text content="Default" /> | ||
| </Button> | ||
| <Button text type="primary"> | ||
| Primary | ||
| </Button> | ||
| <Button text type="secondary"> | ||
| Secondary | ||
| </Button> | ||
| <Button text circular> | ||
| <Icon name="compass outline" xSpacing="none" /> | ||
| </Button> | ||
| </div> | ||
| ) | ||
|
|
||
| export default ButtonExampleText |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍