Skip to content

Commit

Permalink
feat(button): rebase branch with #1156 and revert the modifier class …
Browse files Browse the repository at this point in the history
…change
  • Loading branch information
yeelan0319 committed Aug 19, 2017
1 parent 7704cfb commit f3a98a1
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions demos/button.html
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ <h1 class="mdc-typography--display2">Ripple Enabled</h1>
<button class="mdc-button mdc-button--primary">
Primary
</button>
<button class="mdc-button mdc-button--secondary">
<button class="mdc-button mdc-button--accent">
Secondary
</button>
</div>
Expand All @@ -155,7 +155,7 @@ <h1 class="mdc-typography--display2">Ripple Enabled</h1>
<button class="mdc-button mdc-button--raised mdc-button--primary">
Primary
</button>
<button class="mdc-button mdc-button--raised mdc-button--secondary">
<button class="mdc-button mdc-button--raised mdc-button--accent">
Secondary
</button>
</div>
Expand All @@ -182,7 +182,7 @@ <h1 class="mdc-typography--display2">Ripple Enabled</h1>
<button class="mdc-button mdc-button--unelevated mdc-button--primary">
Primary
</button>
<button class="mdc-button mdc-button--unelevated mdc-button--secondary">
<button class="mdc-button mdc-button--unelevated mdc-button--accent">
Secondary
</button>
</div>
Expand Down Expand Up @@ -210,7 +210,7 @@ <h1 class="mdc-typography--display2">CSS Only</h1>
<button class="mdc-button mdc-button--primary" data-demo-no-js>
Primary
</button>
<button class="mdc-button mdc-button--secondary" data-demo-no-js>
<button class="mdc-button mdc-button--accent" data-demo-no-js>
Secondary
</button>
</div>
Expand All @@ -237,7 +237,7 @@ <h1 class="mdc-typography--display2">CSS Only</h1>
<button class="mdc-button mdc-button--raised mdc-button--primary" data-demo-no-js>
Primary
</button>
<button class="mdc-button mdc-button--raised mdc-button--secondary" data-demo-no-js>
<button class="mdc-button mdc-button--raised mdc-button--accent" data-demo-no-js>
Secondary
</button>
</div>
Expand All @@ -264,7 +264,7 @@ <h1 class="mdc-typography--display2">CSS Only</h1>
<button class="mdc-button mdc-button--unelevated mdc-button--primary" data-demo-no-js>
Primary
</button>
<button class="mdc-button mdc-button--unelevated mdc-button--secondary" data-demo-no-js>
<button class="mdc-button mdc-button--unelevated mdc-button--accent" data-demo-no-js>
Secondary
</button>
</div>
Expand Down
6 changes: 3 additions & 3 deletions packages/mdc-button/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,10 @@ with and have no visual interaction effect.

MDC Buttons have a default baseline color, but it is also possible to adopt the
application's primary or secondary color by adding the `mdc-button--primary` or
`mdc-button--secondary` modifier.
`mdc-button--accent` modifier.

```html
<button class="mdc-button mdc-button--secondary">
<button class="mdc-button mdc-button--accent">
Colored button
</button>
```
Expand Down Expand Up @@ -137,4 +137,4 @@ The provided modifiers are:
| `mdc-button--dense` | Compresses the button text to make it slightly smaller. |
| `mdc-button--compact` | Reduces the amount of horizontal padding in the button. |
| `mdc-button--primary` | Colors the button with the primary color. |
| `mdc-button--secondary` | Colors the button with the secondary color. |
| `mdc-button--accent` | Colors the button with the secondary color. |

0 comments on commit f3a98a1

Please sign in to comment.