Skip to content

Commit 3cdb491

Browse files
author
Marco Marche
committed
Merge branch 'master' of https://github.com/trik/material2
2 parents 6082d2f + 7323e89 commit 3cdb491

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

src/components/icon/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ mdIconRegistry.addSvgIconInNamespace('animals', 'cat', '/assets/cat.svg');
5454
```
5555

5656
```html
57-
<md-icon svgIcon="moon"></svg-icon>
58-
<md-icon svgIcon="animals:cat"></svg-icon>
57+
<md-icon svgIcon="moon"></md-icon>
58+
<md-icon svgIcon="animals:cat"></md-icon>
5959
```
6060

6161
### Icon sets

src/demo-app/demo-app.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
<div>
2424

2525
<md-toolbar color="primary">
26-
<md-icon (click)="start.open()">menu</md-icon>
26+
<button md-icon-button (click)="start.open()">
27+
<md-icon class="md-24" >menu</md-icon>
28+
</button>
2729
<div class="demo-toolbar">
2830
<h1>Angular Material 2 Demos</h1>
2931
<button md-button (click)="root.dir = (root.dir == 'rtl' ? 'ltr' : 'rtl')" title="Toggle between RTL and LTR">

src/demo-app/demo-app.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
md-toolbar {
2727
md-icon {
28-
padding: 20px;
2928
cursor: pointer;
3029
}
3130

0 commit comments

Comments
 (0)