Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(437)

Unified Diff: polymer_0.5.0/bower_components/paper-icon-button/paper-icon-button.html

Issue 786953007: npm_modules: Fork bower_components into Polymer 0.4.0 and 0.5.0 versions (Closed) Base URL: https://chromium.googlesource.com/infra/third_party/npm_modules.git@master
Patch Set: Created 5 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: polymer_0.5.0/bower_components/paper-icon-button/paper-icon-button.html
diff --git a/bower_components/paper-icon-button/paper-icon-button.html b/polymer_0.5.0/bower_components/paper-icon-button/paper-icon-button.html
similarity index 83%
rename from bower_components/paper-icon-button/paper-icon-button.html
rename to polymer_0.5.0/bower_components/paper-icon-button/paper-icon-button.html
index cefe7597299b195f3d4c850e6c70cb28996a65b0..512281b05caf455999626fc74decb11964d6ac3f 100644
--- a/bower_components/paper-icon-button/paper-icon-button.html
+++ b/polymer_0.5.0/bower_components/paper-icon-button/paper-icon-button.html
@@ -10,13 +10,18 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<!--
@group Paper Elements
-Material Design: <a href="https://spec.googleplex.com/quantum/components/buttons.html">Buttons</a>
+Material Design: <a href="http://www.google.com/design/spec/components/buttons.html">Buttons</a>
`paper-icon-button` is a button with an image placed at the center. When the user touches
the button, a ripple effect emanates from the center of the button.
-You may import `core-icons` to use with this element, or provide an URL to a custom icon.
-See `core-iconset` for more information about how to use a custom icon set.
+`paper-icon-button` includes a default icon set. Use `icon` to specify which icon
+from the icon set to use.
+
+ <paper-icon-button icon="menu"></paper-icon-button>
+
+See [`core-iconset`](#core-iconset) for more information about
+how to use a custom icon set.
Example:
@@ -60,6 +65,7 @@ you should ensure that the `aria-label` attribute is set.
<link href="../polymer/polymer.html" rel="import">
<link href="../core-icon/core-icon.html" rel="import">
+<link href="../core-icons/core-icons.html" rel="import">
<link href="../paper-button/paper-button-base.html" rel="import">
<link href="../paper-ripple/paper-ripple.html" rel="import">
@@ -74,6 +80,8 @@ you should ensure that the `aria-label` attribute is set.
padding: 8px;
outline: none;
-webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
user-select: none;
cursor: pointer;
z-index: 0;
@@ -89,6 +97,11 @@ you should ensure that the `aria-label` attribute is set.
pointer-events: none;
z-index: -1;
}
+
+ #icon {
+ display: block;
+ pointer-events: none;
+ }
</style>
<!-- to position to ripple behind the icon -->
@@ -128,7 +141,10 @@ you should ensure that the `aria-label` attribute is set.
},
iconChanged: function(oldIcon) {
- this.setAttribute('aria-label', this.icon);
+ var label = this.getAttribute('aria-label');
+ if (!label || label === oldIcon) {
+ this.setAttribute('aria-label', this.icon);
+ }
}
});

Powered by Google App Engine
This is Rietveld 408576698