Merge pull request #7 from PolymerElements/hamster

polymer++
PolymerElements · May 6, 2015 · 8af2e0e · 8af2e0e
2 parents c1aa025 + 8acd393
commit 8af2e0e
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-core-icon
+iron-icon
 =========
 
-See the [component page](http://polymer-project.org/docs/elements/core-elements.html#core-icon) for more information.
+See the [component page](http://polymer-project.org/docs/elements/iron-elements.html#iron-icon) for more information.
diff --git a/bower.json b/bower.json
@@ -1,21 +1,21 @@
 {
   "name": "iron-icon",
   "private": true,
-  "version": "0.8.3",
+  "version": "0.9.0",
   "main": "iron-icon.html",
   "author": [
     "The Polymer Authors"
   ],
   "dependencies": {
-    "iron-flex-layout": "polymerelements/iron-flex-layout#^0.8.0",
-    "iron-meta": "polymerelements/iron-meta#^0.8.0",
-    "polymer": "polymer/polymer#v0.8.0-rc.7"
+    "iron-flex-layout": "polymerelements/iron-flex-layout#^0.9.0",
+    "iron-meta": "polymerelements/iron-meta#^0.9.0",
+    "polymer": "polymer/polymer#v0.9.0-rc.1"
   },
   "devDependencies": {
-    "test-fixture": "polymerelements/test-fixture#^0.8.0",
-    "iron-iconset": "polymerelements/iron-iconset#^0.8.0",
-    "iron-icons": "polymerelements/iron-icons#^0.8.0",
-    "iron-doc-viewer": "polymerelements/iron-doc-viewer#^0.8.0",
+    "test-fixture": "polymerelements/test-fixture#^0.9.0",
+    "iron-iconset": "polymerelements/iron-iconset#^0.9.0",
+    "iron-icons": "polymerelements/iron-icons#^0.9.0",
+    "iron-doc-viewer": "polymerelements/iron-doc-viewer#^0.9.0",
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.6.0",
     "web-component-tester": "*"
   }

diff --git a/demo/index.html b/demo/index.html
@@ -1,6 +1,7 @@
 <!doctype html>
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
 This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
 The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
 The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
@@ -9,7 +10,7 @@
 -->
 <html>
 <head>
-  <title>iron-icon</title>
+  <title>iron-icon demo</title>
   <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
   <link rel="import" href="../iron-icon.html">
   <link rel="import" href="../../iron-iconset/iron-iconset.html">

diff --git a/index.html b/index.html
@@ -1,5 +1,6 @@
 <!doctype html>
 <!--
+@license
 Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
 This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE
 The complete set of authors may be found at http://polymer.github.io/AUTHORS

diff --git a/iron-icon.html b/iron-icon.html
@@ -1,11 +1,17 @@
 <!--
+@license
 Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
 This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
 The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
 The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
 Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../iron-meta/iron-meta.html">
+<link rel="import" href="../iron-flex-layout/iron-flex-layout.html">
+
 <!--
 
 The `iron-icon` element displays an icon. By default an icon renders as a 24px square.
@@ -57,11 +63,7 @@
 @homepage polymer.github.io
 -->
 
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../iron-meta/iron-meta.html">
-<link rel="import" href="../iron-flex-layout/iron-flex-layout.html">
-
-<style is="x-style">
+<style is="custom-style">
   * {
     --iron-icon-size: 24px;
   }
@@ -71,7 +73,7 @@
 
   <style>
     :host {
-      mixin(--layout-inline --layout-center-center);
+      @apply(--layout-inline --layout-center-center);
       position: relative;
 
       vertical-align: middle;
@@ -95,8 +97,6 @@
 
     is: 'iron-icon',
 
-    enableCustomStyleProperties: true,
-
     properties: {
 
       icon: {

diff --git a/test/index.html b/test/index.html
@@ -1,5 +1,6 @@
 <!doctype html>
 <!--
+@license
 Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
 This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
 The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt

diff --git a/test/iron-icon.html b/test/iron-icon.html
@@ -1,5 +1,6 @@
 <!doctype html>
 <!--
+@license
 Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
 This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
 The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt