merge from dev

This commit is contained in:
Luke Pulverenti 2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions

View file

@ -42,6 +42,10 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
fill: navy;
}
iron-icon:nth-of-type(4) {
fill: red;
}
iron-icon {
transition: all 0.5s;
-webkit-transition: all 0.5s;
@ -59,6 +63,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<iron-icon icon="svg-sample-icons:codepen"></iron-icon>
<iron-icon icon="svg-sample-icons:twitter"></iron-icon>
<iron-icon icon="svg-sample-icons:youtube"></iron-icon>
<iron-icon icon="inline:shape"></iron-icon>
</div>
</body>

View file

@ -65,5 +65,17 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
</g>
</defs>
</svg>
</iron-iconset-svg>
<iron-iconset-svg name="inline" size="24">
<svg>
<defs>
<g id="shape">
<rect x="12" y="0" width="12" height="24" />
<circle cx="12" cy="12" r="12" />
</g>
</defs>
</svg>
</iron-iconset-svg>