Merge pull request #6 from PolymerElements/0.9

update to polymer 0.9.0-rc.1
PolymerElements · May 7, 2015 · 839331e · 839331e
2 parents 9895b27 + bcc931a
commit 839331e
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 71 deletions.
diff --git a/bower.json b/bower.json
@@ -2,14 +2,18 @@
   "name": "paper-item",
   "version": "0.8.0",
   "authors": [
-    "Yvonne Yip <[email protected]>"
+    "The Polymer Authors"
   ],
   "keywords": [
     "web-components",
     "web-component",
     "polymer"
   ],
-  "main": "index.html",
+  "main": [
+    "paper-item.html",
+    "paper-icon-item.html",
+    "paper-item-body.html"
+  ],
   "private": true,
   "repository": {
     "type": "git",
@@ -20,18 +24,17 @@
   "ignore": [
   ],
   "dependencies": {
-    "polymer": "Polymer/polymer#v0.8.0-rc.7",
-    "paper-styles": "PolymerElements/paper-styles#^0.8.0"
+    "polymer": "Polymer/polymer#v0.9.0-rc.1",
+    "paper-styles": "PolymerElements/paper-styles#^0.9.0"
   },
   "devDependencies": {
-    "iron-icon": "PolymerElements/iron-icon#^0.8.0",
-    "iron-icons": "PolymerElements/iron-icons#^0.8.0",
-    "paper-checkbox": "PolymerElements/paper-checkbox#^0.8.0",
-    "paper-toggle-button": "PolymerElements/paper-toggle-button#^0.8.0",
-    "paper-styles": "PolymerElements/paper-styles#^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",
+    "iron-icon": "PolymerElements/iron-icon#^0.9.0",
+    "iron-icons": "PolymerElements/iron-icons#^0.9.0",
+    "paper-checkbox": "PolymerElements/paper-checkbox#^0.9.0",
+    "paper-toggle-button": "PolymerElements/paper-toggle-button#^0.9.0",
+    "iron-component-page": "PolymerElements/iron-component-page#^0.9.0",
+    "test-fixture": "PolymerElements/test-fixture#^0.9.0",
+    "web-component-tester": "*",
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.6.0"
   }
 }
diff --git a/index.html b/index.html
@@ -19,20 +19,12 @@
   <script src="../webcomponentsjs/webcomponents-lite.js"></script>
 
   <link rel="import" href="../polymer/polymer.html">
-  <link rel="import" href="../iron-doc-viewer/iron-doc-viewer.html">
-
-  <style>
-
-    body {
-      margin: 16px;
-    }
-
-  </style>
+  <link rel="import" href="../iron-component-page/iron-component-page.html">
 
 </head>
 <body>
 
-  <iron-doc-viewer src="paper-item.html"></iron-doc-viewer>
+  <iron-component-page></iron-component-page>
 
 </body>
 </html>
diff --git a/paper-icon-item.html b/paper-icon-item.html
@@ -1,20 +1,18 @@
 <!--
-    @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
 -->
 
 <link rel="import" href="../polymer/polymer.html">
 <link rel="import" href="../paper-styles/paper-styles.html">
 
 <!--
 `paper-icon-item` is a list item with a fixed-width icon area.
-
-@element paper-icon-item
 -->
 
 <dom-module id="paper-icon-item">
@@ -24,12 +22,12 @@
   <style>
 
     :host {
-      mixin(--layout-horizontal);
-      mixin(--layout-center);
-      mixin(--paper-font-subhead);
+      @apply(--layout-horizontal);
+      @apply(--layout-center);
+      @apply(--paper-font-subhead);
 
-      mixin(--paper-item);
-      mixin(--paper-icon-item);
+      @apply(--paper-item);
+      @apply(--paper-icon-item);
     }
 
   </style>
@@ -51,8 +49,6 @@
 
     is: 'paper-icon-item',
 
-    enableCustomStyleProperties: true,
-
     hostAttributes: {
       'role': 'listitem'
     },

diff --git a/paper-item-body.html b/paper-item-body.html
@@ -12,18 +12,18 @@
 <link rel="import" href="../paper-styles/paper-styles.html">
 
 <!--
-
-@element paper-item-body
+Use `<paper-item-body>` in a `<paper-item>` or `<paper-icon-item>` to make two- or
+three- line items.
 -->
 
 <dom-module id="paper-item-body">
 
   <style>
 
     :host {
-      --mixin(--layout-vertical);
-      --mixin(--layout-center-justified);
-      --mixin(--layout-flex);
+      @apply(--layout-vertical);
+      @apply(--layout-center-justified);
+      @apply(--layout-flex);
     }
 
     :host([two-line]) {
@@ -41,10 +41,10 @@
     }
 
     :host > ::content [secondary] {
-      color: var(--secondary-text-color);
-      mixin(--paper-font-body1);
+      color: var(--paper-item-body-secondary-color, --secondary-text-color);
+      @apply(--paper-font-body1);
 
-      mixin(--paper-item-body-secondary);
+      @apply(--paper-item-body-secondary);
     }
 
 
@@ -62,9 +62,7 @@
 
   Polymer({
 
-    is: 'paper-item-body',
-
-    enableCustomStyleProperties: true
+    is: 'paper-item-body'
 
   });
 

diff --git a/paper-item.html b/paper-item.html
@@ -9,6 +9,7 @@
 -->
 
 <link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../iron-flex-layout/iron-flex-layout.html">
 <link rel="import" href="../paper-styles/paper-styles.html">
 
 <!--
@@ -24,11 +25,11 @@
   <style>
 
     :host {
-      mixin(--layout-horizontal);
-      mixin(--layout-center);
-      mixin(--paper-font-subhead);
+      @apply(--layout-horizontal);
+      @apply(--layout-center);
+      @apply(--paper-font-subhead);
 
-      mixin(--paper-item);
+      @apply(--paper-item);
     }
 
   </style>
@@ -47,8 +48,6 @@
 
     is: 'paper-item',
 
-    enableCustomStyleProperties: true,
-
     hostAttributes: {
       role: 'listitem'
     }

diff --git a/test/index.html b/test/index.html
@@ -1,13 +1,13 @@
+<!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>
 

diff --git a/test/paper-item.html b/test/paper-item.html
@@ -1,13 +1,13 @@
 <!--
-    @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>
+<!doctype html>
 <html>
   <head>