depend on core-icons to provide an iconset, update demo for core-icons

googlearchive · May 5, 2014 · 6c24531 · 6c24531
1 parent d574de2
commit 6c24531
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 34 deletions.
diff --git a/bower.json b/bower.json
@@ -2,6 +2,6 @@
   "name": "core-icon-button",
   "private": true,
   "dependencies": {
-    "core-icon": "Polymer/core-icon#master"
+    "core-icons": "Polymer/core-icons#master"
   }
-}
+}
diff --git a/core-icon-button.css b/core-icon-button.css
@@ -59,7 +59,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   box-shadow: inset 0 1px 0 0 rgba(200, 200, 200, 0.1), 0 0 0 1px rgba(200, 200, 200, 0.12);
 }
 
-core-icon {
-  display: block;
+core-icon {
+  display: block;
   vertical-align: middle;
+  pointer-events: none;
 }
diff --git a/core-icon-button.html b/core-icon-button.html
@@ -26,6 +26,7 @@
 -->
 
 <link rel="import" href="../core-icon/core-icon.html">
+<link rel="import" href="../core-icons/core-icons.html">
 
 <polymer-element name="core-icon-button" extends="core-theme-aware" attributes="src icon active">
 

diff --git a/demo.html b/demo.html
@@ -19,41 +19,33 @@
 
   <body unresolved>
 
+
+    <polymer-element name="x-buttons">
+      <template>
+        <core-iconset id="meta"></core-iconset>
+        <template repeat="{{icon in iconNames}}">
+          <core-icon-button icon="{{icon}}"></core-icon-button>
+        </template>
+      </template>
+      <script>
+        Polymer('x-buttons', {
+          ready: function() {
+            this.iconNames = this.$.meta.byId('icons').iconNames;
+          }
+        });
+      </script>
+    </polymer-element>
+
     <div>
-      <core-icon-button icon="drawer"></core-icon-button>
-      <core-icon-button icon="menu"></core-icon-button>
-      <core-icon-button icon="search"></core-icon-button>
-      <core-icon-button icon="dropdown"></core-icon-button>
-      <core-icon-button icon="close"></core-icon-button>
-      <core-icon-button icon="add"></core-icon-button>
-      <core-icon-button icon="trash"></core-icon-button>
-      <core-icon-button icon="settings"></core-icon-button>
-      <core-icon-button icon="dialog"></core-icon-button>
+      <x-buttons></x-buttons>
     </div>
-
+    <br>
     <div theme="core-light-theme">
-      <core-icon-button icon="drawer"></core-icon-button>
-      <core-icon-button icon="menu"></core-icon-button>
-      <core-icon-button icon="search"></core-icon-button>
-      <core-icon-button icon="dropdown"></core-icon-button>
-      <core-icon-button icon="close"></core-icon-button>
-      <core-icon-button icon="add"></core-icon-button>
-      <core-icon-button icon="trash"></core-icon-button>
-      <core-icon-button icon="settings"></core-icon-button>
-      <core-icon-button icon="dialog"></core-icon-button>
+      <x-buttons></x-buttons>
     </div>
-
+    <br>
     <div theme="core-dark-theme" style="background: #333;">
-      <core-icon-button icon="drawer"></core-icon-button>
-      <core-icon-button icon="menu"></core-icon-button>
-      <core-icon-button icon="search"></core-icon-button>
-      <core-icon-button icon="dropdown"></core-icon-button>
-      <core-icon-button icon="close"></core-icon-button>
-      <core-icon-button icon="add"></core-icon-button>
-      <core-icon-button icon="trash"></core-icon-button>
-      <core-icon-button icon="settings"></core-icon-button>
-      <core-icon-button icon="dialog"></core-icon-button>
+      <x-buttons></x-buttons>
     </div>
-
   </body>
 </html>