remove core-layout

googlearchive · Jul 8, 2014 · ab49c4b · ab49c4b
1 parent 3a0689f
commit ab49c4b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 34 deletions.
diff --git a/elements/pi-accounts.html b/elements/pi-accounts.html
@@ -12,33 +12,32 @@
 <polymer-element name="pi-accounts" attributes="accounts">
   <template>
     <link rel="stylesheet" href="css/pi-accounts.css" />
-    <link rel="stylesheet" href="../components/core-layout/core-layout.css">
-    <div class="core-h core-align-center item">
-      <div class="core-flex"></div>
+    <div center horizontal layout class="item">
+      <div flex></div>
       <button class="button" on-tap="{{reset}}">Restore Defaults</button>
     </div>
-    <div class="header core-h core-align-center item">Finance</div>
+    <div center horizontal layout class="header item">Finance</div>
     <div>
       <template repeat="{{accounts.stocks}}">
-        <div class="core-h core-align-center item">
-          <div class="core-flex">{{}}</div>
+        <div center horizontal layout class="item">
+          <div flex>{{}}</div>
           <core-icon-button icon="close" on-tap="{{removeStock}}"></core-icon-button>
         </div>
       </template>
     </div>
-    <div class="core-h core-align-center item">
+    <div center horizontal layout class="item">
       <div class="item-input-label">Symbol: </div>
       <input id="symbol" autocorrect="off" operation="addStock" on-keyup="{{keyupHandler}}" />
       <core-icon-button icon="plus" on-tap="{{addStock}}"></core-icon-button>
     </div>
-    <div class="header core-h core-align-center item">Topics</div>
-    <div class="core-h core-align-center item accounts-title">Add New Feed</div>
-    <div class="core-h core-align-center item no-border">
+    <div center horizontal layout class="header item">Topics</div>
+    <div center horizontal layout class="item accounts-title">Add New Feed</div>
+    <div center horizontal layout class="item no-border">
       <div class="item-input-label">Url: </div>
-      <input id="feed" type="url" class="core-flex" operation="addFeed" on-keyup="{{keyupHandler}}" />
+      <input id="feed" type="url" flex operation="addFeed" on-keyup="{{keyupHandler}}" />
       <core-icon-button icon="plus" on-tap="{{addFeed}}"></core-icon-button>
     </div>
-    <div class="core-h core-align-center item">
+    <div center horizontal layout class="item">
       <div class="item-input-label">Category: </div>
       <span class="category-select-value">{{selectedCategory}}</span>
       <core-menu-button id="categorySelect" selected="{{selectedCategory}}" icon="more-vert">
@@ -47,22 +46,22 @@
         </template>
       </core-menu-button>
     </div>
-    <div class="core-h core-align-center item accounts-title">Add New Category</div>
-    <div class="core-h core-align-center item">
+    <div center horizontal layout class="item accounts-title">Add New Category</div>
+    <div center horizontal layout class="item">
       <div class="item-input-label">Name: </div>
-      <input id="category" class="core-flex" operation='addCategory' on-keyup="{{keyupHandler}}" />
+      <input id="category" flex operation='addCategory' on-keyup="{{keyupHandler}}" />
       <core-icon-button icon="plus" on-tap="{{addCategory}}"></core-icon-button>
     </div>
     <div>
       <template repeat="{{accounts.topics}}">
-        <div class="core-h core-align-center item accounts-title">
+        <div center horizontal layout class="item accounts-title">
           <core-icon class="accounts-title-icon" icon="favorite"></core-icon>
-          <div class="core-flex">{{title}}</div>
+          <div flex>{{title}}</div>
           <core-icon-button icon="close" on-tap="{{removeTopic}}"></core-icon-button>
         </div>
         <template repeat="{{feed}}">
-          <div class="core-h core-align-center item">
-            <div class="core-flex accounts-feed-title">{{title}}</div>
+          <div center horizontal layout class="item">
+            <div flex class="accounts-feed-title">{{title}}</div>
             <core-icon-button icon="close" on-tap="{{removeFeed}}"></core-icon-button>
           </div>
         </template>

diff --git a/elements/pi-app.html b/elements/pi-app.html
@@ -5,7 +5,6 @@
  * license that can be found in the LICENSE file.
  */
 -->
-<link rel="import" href="../components/core-layout/core-layout.html">
 <link rel="import" href="../components/core-drawer-panel/core-drawer-panel.html">
 <link rel="import" href="../components/core-header-panel/core-header-panel.html">
 <link rel="import" href="../components/core-toolbar/core-toolbar.html">
@@ -25,7 +24,6 @@
 <polymer-element name="pi-app" on-keyup="{{keyupHandler}}">
   <template>
     <link rel="stylesheet" href="css/pi-app.css">
-    <link rel="stylesheet" href="../components/core-layout/core-layout.css">
 
     <core-drawer-panel id="panels" responsiveWidth="1280px">
 
@@ -42,12 +40,12 @@
 
       </core-header-panel>
 
-      <div main mode="waterfall" class="core-v core-fit">
+      <div main mode="waterfall" vertical layout fit>
 
         <core-toolbar id="appToolbar" class="medium-tall">
 
           <core-icon-button icon="{{nav}}" on-tap="{{navAction}}"></core-icon-button>
-          <div core-flex class="toolbar-label">{{toolbarLabel}}</div>
+          <div flex class="toolbar-label">{{toolbarLabel}}</div>
           <core-toolbar id="actionbar" hidden?="{{hideActionbar}}" responsive>
             <pi-link-button id="linkButton" link="{{story.link}}" hidden?="{{hideLinkButton}}"></pi-link-button>
             <pi-view-button id="viewButton" layout="{{layout}}" halign="right" hidden?="{{hideViewButton}}"></pi-view-button>
@@ -57,7 +55,7 @@
 
         </core-toolbar>
 
-        <core-animated-pages class="core-flex" id="contentPanels" selected="{{selectedView}}" valueattr="id" 
+        <core-animated-pages flex id="contentPanels" selected="{{selectedView}}" valueattr="id" 
             on-core-select="{{panelSelectAction}}" transitions="slide-from-bottom slide-from-right">
 
           <div id="Home"><template if="{{activatedPanels.Home}}">

diff --git a/elements/pi-explore.html b/elements/pi-explore.html
@@ -11,11 +11,10 @@
 <link rel="import" href="pi-feed-viewer.html"/>
 <polymer-element name="pi-explore" attributes="panel topic">
   <template>
-    <link rel="stylesheet" href="../components/core-layout/core-layout.css">
     <link rel="stylesheet" href="css/pi-explore.css" />
-    <div id="searchBox" class="core-h core-align-center">
+    <div id="searchBox" center horizontal layout>
       <core-icon icon="search"></core-icon>
-      <input id="searchInput" class="core-flex" on-input="{{inputChange}}"/>
+      <input id="searchInput" flex on-input="{{inputChange}}"/>
       <speech-mic id="speech" on-result="{{speechResult}}"></speech-mic>
     </div>
     <pi-feed-viewer id="viewer" topics="{{topics}}" topic="{{topic}}" panel="{{panel}}"

diff --git a/elements/pi-items-view.html b/elements/pi-items-view.html
@@ -8,24 +8,22 @@
 <link rel="import" href="../components/core-icon/core-icon.html"/>
 <polymer-element name="pi-items-view" attributes="layout view items selected">
   <template>
-    <link rel="stylesheet" href="../components/core-layout/core-layout.css">
     <link rel="stylesheet" href="css/pi-items-view.css">
-    <!-- <div fit class="bg" cross-fade></div> -->
     <div id="container" loaded="{{loaded}}" class="{{layout}} {{view}}">
       <div fit class="bg" cross-fade></div>
       <div id="containerInner" tile-cascade?="{{!selected || view != 'stories'}}" cross-fade?="{{!selected || view != 'stories'}}">
         <template repeat="{{item in viewItems}}">
           <div class="tile" on-tap="{{selectItem}}">
             <div fit class="tile-fit" hero?="{{view == 'stories' && selected.title == item.title}}" hero-id="tile"></div>
             <div class="image" style="background-image: url({{item.imgSrc}});" hero?="{{view == 'stories' && selected.title == item.title}}" hero-id="image"></div>
-            <div class="info core-flex core-v" hero?="{{view == 'stories' && selected.title == item.title}}" cross-fade-delayed?="{{view == 'stories' && selected.title == item.title}}">
-              <div class="title core-h core-flex">
-                <span class="core-flex">{{item.title}}</span>
+            <div flex vertical layout class="info" hero?="{{view == 'stories' && selected.title == item.title}}" cross-fade-delayed?="{{view == 'stories' && selected.title == item.title}}">
+              <div flex horizontal layout class="title">
+                <span flex>{{item.title}}</span>
                 <span class="unread-count">{{item.unread}}</span>
               </div>
-              <div class="source core-h core-align-center">
+              <div center horizontal layout class="source">
                 <span class="source-icon" style="background-image: url({{item.sourceIcon}});"></span>
-                <span class="source-title core-flex">{{item.source}}</span>
+                <span flex class="source-title">{{item.source}}</span>
                 <span class="source-time">{{item.since}}</span>
               </div>
             </div>