Merge pull request #4 from PolymerElements/iron

use iron-* elements, fix bower.json, update paper-styles
PolymerElements · Apr 17, 2015 · 0efc1e1 · 0efc1e1
2 parents d80c26e + 9c46c1b
commit 0efc1e1
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 353 deletions.
diff --git a/bower.json b/bower.json
@@ -20,16 +20,15 @@
   "ignore": [
   ],
   "dependencies": {
-    "polymer": "Polymer/polymer#0.8-preview",
-    "layout": "Polymer/layout",
-    "paper-styles": "PolymerLabs/paper-styles"
+    "polymer": "Polymer/polymer#v0.8.0-rc.4",
+    "paper-styles": "PolymerElements/paper-styles#^0.8.0"
   },
   "devDependencies": {
-    "webcomponentsjs": "Polymer/webcomponentsjs",
-    "core-doc-viewer": "Polymer/core-doc-viewer#0.8-preview",
-    "core-icon": "Polymer/core-icon#0.8-preview",
-    "core-icons": "Polymer/core-icons#0.8-preview",
-    "test-fixture": "Polymer/test-fixture#master",
-    "web-component-tester": "Polymer/web-component-tester#^2.2.0"
+    "iron-icon": "PolymerElements/iron-icon#^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.8.0",
+    "web-component-tester": "Polymer/web-component-tester#^2.2.0",
+    "webcomponentsjs": "webcomponents/webcomponentsjs#^0.6.0"
   }
 }
diff --git a/demo/index.html b/demo/index.html
@@ -1,28 +1,27 @@
+<!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
-    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
+@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
 -->
-
-<!doctype html>
 <html>
 <head>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1, user-scalable=yes">
 
-  <title>paper-item</title>
+  <title>paper-item demo</title>
 
   <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
 
-  <link rel="import" href="../../core-icon/core-icon.html">
-  <link rel="import" href="../../core-icons/core-icons.html">
-  <link rel="import" href="../../core-icons/communication-icons.html">
+  <link rel="import" href="../../iron-icon/iron-icon.html">
+  <link rel="import" href="../../iron-icons/core-icons.html">
+  <link rel="import" href="../../iron-icons/communication-icons.html">
   <link rel="import" href="../paper-icon-item.html">
   <link rel="import" href="../paper-item.html">
   <link rel="import" href="../paper-item-body.html">
@@ -81,16 +80,16 @@
 
     <div class="list">
       <paper-icon-item>
-        <core-icon icon="inbox" item-icon></core-icon> Inbox
+        <iron-icon icon="inbox" item-icon></iron-icon> Inbox
       </paper-icon-item>
       <paper-icon-item>
-        <core-icon icon="send" item-icon></core-icon> Outbox
+        <iron-icon icon="send" item-icon></iron-icon> Outbox
       </paper-icon-item>
       <paper-icon-item>
-        <core-icon icon="delete" item-icon></core-icon> Trash
+        <iron-icon icon="delete" item-icon></iron-icon> Trash
       </paper-icon-item>
       <paper-icon-item>
-        <core-icon icon="report" item-icon></core-icon> Spam
+        <iron-icon icon="report" item-icon></iron-icon> Spam
       </paper-icon-item>
     </div>
 
@@ -122,17 +121,17 @@
       <paper-icon-item>
         <div class="avatar" item-icon></div>
         <div class="flex">Alphonso Engelking</div>
-        <core-icon icon="communication:messenger"></core-icon>
+        <iron-icon icon="communication:messenger"></iron-icon>
       </paper-icon-item>
       <paper-icon-item>
         <div class="avatar" item-icon></div>
         <div class="flex">Andrews Boyd</div>
-        <core-icon icon="communication:messenger"></core-icon>
+        <iron-icon icon="communication:messenger"></iron-icon>
       </paper-icon-item>
       <paper-icon-item>
         <div class="avatar" item-icon></div>
         <div class="flex">Angela Decker</div>
-        <core-icon icon="communication:messenger"></core-icon>
+        <iron-icon icon="communication:messenger"></iron-icon>
       </paper-icon-item>
     </div>
 
@@ -165,7 +164,7 @@
 
     <div class="list">
       <paper-icon-item>
-        <core-icon icon="communication:phone" item-icon></core-icon>
+        <iron-icon icon="communication:phone" item-icon></iron-icon>
         <paper-item-body two-line>
           <div>(650) 555-1234</div>
           <div secondary>Mobile</div>
@@ -179,7 +178,7 @@
         </paper-item-boody>
       </paper-icon-item>
       <paper-icon-item>
-        <core-icon icon="communication:email" item-icon></core-icon>
+        <iron-icon icon="communication:email" item-icon></iron-icon>
         <paper-item-body two-line>
           <div>aliconnors@example.com</div>
           <div secondary>Personal</div>
@@ -230,23 +229,23 @@
           <div>Photos</div>
           <div secondary>Jan 9, 2014</div>
         </paper-item-body>
-        <core-icon icon="error"></core-icon>
+        <iron-icon icon="error"></iron-icon>
       </paper-icon-item>
       <paper-icon-item>
         <div class="avatar" item-icon></div>
         <paper-item-body two-line>
           <div>Recipes</div>
           <div secondary>Jan 17, 2014</div>
         </paper-item-body>
-        <core-icon icon="error"></core-icon>
+        <iron-icon icon="error"></iron-icon>
       </paper-icon-item>
       <paper-icon-item>
         <div class="avatar" item-icon></div>
         <paper-item-body two-line>
           <div>Work</div>
           <div secondary>Jan 28, 2014</div>
         </paper-item-body>
-        <core-icon icon="error"></core-icon>
+        <iron-icon icon="error"></iron-icon>
       </paper-icon-item>
     </div>