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

docs(demos): add a variety of button demos #5628

Merged
merged 3 commits into from
Jul 13, 2017
Merged

docs(demos): add a variety of button demos #5628

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dcd8f14
docs(demos): add a variety of button demos
amcdnl Jul 9, 2017
9e53b60
docs(demos): button pr feedback updates
amcdnl Jul 10, 2017
0f544f9
docs(demos): update pr feedback
amcdnl Jul 11, 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
4 changes: 0 additions & 4 deletions src/material-examples/button-types/button-types-example.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
.example-container {
width: 500px;
}

.example-button-row {
display: flex;
align-items: center;
Expand Down
63 changes: 48 additions & 15 deletions src/material-examples/button-types/button-types-example.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,50 @@
<div class="example-container">
<h3>Normal Buttons</h3>
<div class="button-row">
<button md-button>Flat button</button>
<button md-raised-button>Raised button</button>
<button md-fab><md-icon>check</md-icon></button>
<button md-mini-fab><md-icon>check</md-icon></button>
</div>
<h3>Basic Buttons</h3>
<div class="button-row">
<button md-button>Basic</button>
<button md-button color="primary">Primary</button>
<button md-button color="accent">Accent</button>
<button md-button color="warn">Warn</button>
<button md-button disabled>Disabled</button>
<a md-button routerLink=".">Link</a>
</div>

<h3>Raised Buttons</h3>
<div class="button-row">
<button md-raised-button>Basic</button>
<button md-raised-button color="primary">Primary</button>
<button md-raised-button color="accent">Accent</button>
<button md-raised-button color="warn">Warn</button>
<button md-raised-button disabled>Disabled</button>
<a md-raised-button routerLink=".">Link</a>
</div>

<h3>Icon Buttons</h3>
<div class="button-row">
<button md-icon-button><md-icon class="md-24" aria-label="favorite">favorite</md-icon></button>
<button md-icon-button color="primary"><md-icon class="md-24" aria-label="favorite">favorite</md-icon></button>
Copy link
Member

Choose a reason for hiding this comment

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

Should be a bit more specific w/ the aria-label:
"Example icon-button with a heart icon"

<button md-icon-button color="accent"><md-icon class="md-24" aria-label="favorite">favorite</md-icon></button>
<button md-icon-button color="warn"><md-icon class="md-24" aria-label="favorite">favorite</md-icon></button>
<button md-icon-button disabled><md-icon class="md-24" aria-label="favorite">favorite</md-icon></button>
</div>

<h3>Fab Buttons</h3>
<div class="button-row">
<button md-fab>Basic</button>
<button md-fab color="primary">Primary</button>
<button md-fab color="accent">Accent</button>
<button md-fab color="warn">Warn</button>
<button md-fab disabled>Disabled</button>
<button md-fab><md-icon class="md-24" aria-label="favorite">favorite</md-icon></button>
<a md-fab routerLink=".">Link</a>
</div>

<h3>Link Buttons</h3>
<div class="example-button-row">
<a md-button routerLink=".">Flat button</a>
<a md-raised-button routerLink=".">Raised button</a>
<a md-fab routerLink="."><md-icon>check</md-icon></a>
<a md-mini-fab routerLink="."><md-icon>check</md-icon></a>
</div>
<h3>Mini Fab Buttons</h3>
<div class="button-row">
<button md-mini-fab>Basic</button>
<button md-mini-fab color="primary">Primary</button>
<button md-mini-fab color="accent">Accent</button>
<button md-mini-fab color="warn">Warn</button>
<button md-mini-fab disabled>Disabled</button>
<button md-mini-fab><md-icon class="md-24" aria-label="favorite">favorite</md-icon></button>
<a md-mini-fab routerLink=".">Link</a>
</div>