pica: remove pi-toolbar

googlearchive · Oct 9, 2013 · 10b73d6 · 10b73d6
1 parent c740526
commit 10b73d6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 62 deletions.
diff --git a/pica/components/css/pi-toolbar.css b/pica/components/css/pi-toolbar.css
diff --git a/pica/components/pi-app.html b/pica/components/pi-app.html
@@ -9,7 +9,7 @@
 <link rel="import" href="../../../polymer-ui-elements/polymer-ui-pages/polymer-ui-pages.html">
 <link rel="import" href="../../../polymer-ui-elements/polymer-ui-menu-item/polymer-ui-menu-item.html">
 <link rel="import" href="../../../polymer-ui-elements/polymer-ui-sidebar-menu/polymer-ui-sidebar-menu.html">
-<link rel="import" href="pi-toolbar.html">
+<link rel="import" href="../../../polymer-ui-elements/polymer-ui-toolbar/polymer-ui-toolbar.html">
 <link rel="import" href="pi-toolbar-buttons.html">
 <link rel="import" href="pi-feed-viewer.html">
 <link rel="import" href="pi-explore.html">

diff --git a/pica/components/pi-toolbar.html b/pica/components/pi-toolbar.html
diff --git a/pica/workbench/toolbar.html b/pica/workbench/toolbar.html
@@ -11,7 +11,7 @@
   <title>toolbar</title>
   <script src="../../../polymer/polymer.js"></script>
   <link rel="import" href="../components/pi-toolbar-buttons.html"/>
-  <link rel="import" href="../components/pi-toolbar.html"/>
+  <link rel="import" href="../../../polymer-ui-elements/polymer-ui-toolbar/polymer-ui-toolbar.html"/>
   <style>
     html, body {
       height: 100%;
@@ -23,11 +23,15 @@
   </style>
 </head>
 <body>
-  <pi-toolbar label="Topics" theme="polymer-ui-light-theme">
-    <pi-link-button id="linkButton" link="http://www.google.com"></pi-link-button>
-    <pi-view-button id="viewButton" layout="grid" halign="right"></pi-view-button>
-    <pi-action-button halign="right"></pi-action-button>
-    <polymer-ui-icon-button icon="refresh"></polymer-ui-icon-button>
-  </pi-toolbar>
+  <polymer-ui-toolbar theme="polymer-ui-light-theme">
+    <polymer-ui-icon-button icon="menu"></polymer-ui-icon-button>
+    <div flex>Topics</div>
+    <polymer-ui-toolbar responsive>
+      <pi-link-button id="linkButton" link="http://www.google.com"></pi-link-button>
+      <pi-view-button id="viewButton" layout="grid" halign="right"></pi-view-button>
+      <pi-action-button halign="right"></pi-action-button>
+      <polymer-ui-icon-button icon="refresh"></polymer-ui-icon-button>
+    </polymer-ui-toolbar>
+  </polymer-ui-toolbar>
 </body>
 </html>