| Index: polymer_1.2.3/bower_components/iron-icon/iron-icon.html
|
| diff --git a/polymer_1.0.4/bower_components/iron-icon/iron-icon.html b/polymer_1.2.3/bower_components/iron-icon/iron-icon.html
|
| similarity index 76%
|
| copy from polymer_1.0.4/bower_components/iron-icon/iron-icon.html
|
| copy to polymer_1.2.3/bower_components/iron-icon/iron-icon.html
|
| index bdb55c7dbb8aead00af6f64dae9acdf527055131..ff4951d4db39eb0b6f8ad0e633fb071fc9e957d6 100644
|
| --- a/polymer_1.0.4/bower_components/iron-icon/iron-icon.html
|
| +++ b/polymer_1.2.3/bower_components/iron-icon/iron-icon.html
|
| @@ -32,17 +32,16 @@ Example setting size to 32px x 32px:
|
| </style>
|
|
|
| The iron elements include several sets of icons.
|
| -To use the default set of icons, import `iron-icons.html` and use the `icon` attribute to specify an icon:
|
| +To use the default set of icons, import `iron-icons.html` and use the `icon` attribute to specify an icon:
|
|
|
| - <!-- import default iconset and iron-icon -->
|
| <link rel="import" href="/components/iron-icons/iron-icons.html">
|
|
|
| <iron-icon icon="menu"></iron-icon>
|
|
|
| -To use a different built-in set of icons, import `iron-icons/<iconset>-icons.html`, and
|
| -specify the icon as `<iconset>:<icon>`. For example:
|
| +To use a different built-in set of icons, import the specific `iron-icons/<iconset>-icons.html`, and
|
| +specify the icon as `<iconset>:<icon>`. For example, to use a communication icon, you would
|
| +use:
|
|
|
| - <!-- import communication iconset and iron-icon -->
|
| <link rel="import" href="/components/iron-icons/communication-icons.html">
|
|
|
| <iron-icon icon="communication:email"></iron-icon>
|
| @@ -53,10 +52,11 @@ Example of using an icon named `cherry` from a custom iconset with the ID `fruit
|
|
|
| <iron-icon icon="fruit:cherry"></iron-icon>
|
|
|
| -See [iron-iconset](#iron-iconset) and [iron-iconset-svg](#iron-iconset-svg) for more information about
|
| +See [iron-iconset](iron-iconset) and [iron-iconset-svg](iron-iconset-svg) for more information about
|
| how to create a custom iconset.
|
|
|
| -See [iron-icons](https://elements.polymer-project.org/elements/iron-icons?view=demo:demo/index.html) for the default set of icons.
|
| +See the [iron-icons demo](iron-icons?view=demo:demo/index.html) to see the icons available
|
| +in the various iconsets.
|
|
|
|
|
| ### Styling
|
| @@ -67,6 +67,8 @@ Custom property | Description | Default
|
| ----------------|-------------|----------
|
| `--iron-icon-width` | Width of the icon | `24px`
|
| `--iron-icon-height` | Height of the icon | `24px`
|
| +`--iron-icon-fill-color` | Fill color of the svg icon | `currentcolor`
|
| +`--iron-icon-stroke-color` | Stroke color of the svg icon | none
|
|
|
| @group Iron Elements
|
| @element iron-icon
|
| @@ -85,7 +87,8 @@ Custom property | Description | Default
|
|
|
| vertical-align: middle;
|
|
|
| - fill: currentcolor;
|
| + fill: var(--iron-icon-fill-color, currentcolor);
|
| + stroke: var(--iron-icon-stroke-color, none);
|
|
|
| width: var(--iron-icon-width, 24px);
|
| height: var(--iron-icon-height, 24px);
|
| @@ -93,7 +96,6 @@ Custom property | Description | Default
|
| </style>
|
|
|
| <template>
|
| - <iron-meta id="meta" type="iconset"></iron-meta>
|
| </template>
|
|
|
| <script>
|
| @@ -130,7 +132,15 @@ Custom property | Description | Default
|
| src: {
|
| type: String,
|
| observer: '_srcChanged'
|
| + },
|
| +
|
| + /**
|
| + * @type {!Polymer.IronMeta}
|
| + */
|
| + _meta: {
|
| + value: Polymer.Base.create('iron-meta', {type: 'iconset'})
|
| }
|
| +
|
| },
|
|
|
| _DEFAULT_ICONSET: 'icons',
|
| @@ -150,15 +160,17 @@ Custom property | Description | Default
|
| return this.icon || !this.src;
|
| },
|
|
|
| + /** @suppress {visibility} */
|
| _updateIcon: function() {
|
| if (this._usesIconset()) {
|
| if (this._iconsetName) {
|
| - this._iconset = this.$.meta.byKey(this._iconsetName);
|
| + this._iconset = /** @type {?Polymer.Iconset} */ (
|
| + this._meta.byKey(this._iconsetName));
|
| if (this._iconset) {
|
| this._iconset.applyIcon(this, this._iconName, this.theme);
|
| + this.unlisten(window, 'iron-iconset-added', '_updateIcon');
|
| } else {
|
| - this._warn(this._logf('_updateIcon', 'could not find iconset `'
|
| - + this._iconsetName + '`, did you import the iconset?'));
|
| + this.listen(window, 'iron-iconset-added', '_updateIcon');
|
| }
|
| }
|
| } else {
|
| @@ -166,6 +178,7 @@ Custom property | Description | Default
|
| this._img = document.createElement('img');
|
| this._img.style.width = '100%';
|
| this._img.style.height = '100%';
|
| + this._img.draggable = false;
|
| }
|
| this._img.src = this.src;
|
| Polymer.dom(this.root).appendChild(this._img);
|
|
|