Skip to content
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

Button documentation fix #7726

Merged
merged 3 commits into from
Aug 10, 2017
Merged

Button documentation fix #7726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
beae85c
Button doc fix
the-noob Aug 10, 2017
f5ef315
The true fix
the-noob Aug 10, 2017
cdf0933
Merge remote-tracking branch 'origin/v1-beta' into v1-beta
the-noob Aug 10, 2017
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
2 changes: 1 addition & 1 deletion docs/src/pages/component-api/Button/Button.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
| color | union:&nbsp;'default', 'inherit', 'primary', 'accent', 'contrast'<br> | 'default' | The color of the component. It's using the theme palette when that makes sense. |
| component | union:&nbsp;string<br>&nbsp;Function<br> | | The component used for the root node. Either a string to use a DOM element or a component. The default value is a `button`. |
| dense | boolean | false | Uses a smaller minWidth, ideal for things like card actions. |
| disableFocusRipple | boolean | false | If `true`, the keyboard focus ripple will be disabled. `ripple` must also be true. |
| disableFocusRipple | boolean | false | If `true`, the keyboard focus ripple will be disabled. `disableRipple` must also be true. |
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<!--- This documentation is automatically generated, do not try to edit it. -->.

| disableRipple | boolean | false | If `true`, the ripple effect will be disabled. |
| disabled | boolean | false | If `true`, the button will be disabled. |
| fab | boolean | false | If `true`, well use floating action button styling. |
Expand Down
2 changes: 1 addition & 1 deletion src/Button/Button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ export type Props = {
disabled?: boolean,
/**
* If `true`, the keyboard focus ripple will be disabled.
* `ripple` must also be true.
* `disableRipple` must also be true.
*/
disableFocusRipple?: boolean,
/**
Expand Down