Skip to content
This repository has been archived by the owner on Dec 19, 2024. It is now read-only.

update to polymer 0.9.0-rc.1 #6

Merged
merged 1 commit into from
May 7, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
12 changes: 2 additions & 10 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
28 changes: 12 additions & 16 deletions paper-icon-item.html
Original file line number Diff line number Diff line change
@@ -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">
Expand All @@ -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>
Expand All @@ -51,8 +49,6 @@

is: 'paper-icon-item',

enableCustomStyleProperties: true,

hostAttributes: {
'role': 'listitem'
},
Expand Down
20 changes: 9 additions & 11 deletions paper-item-body.html
Original file line number Diff line number Diff line change
Expand Up @@ -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]) {
Expand All @@ -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);
}


Expand All @@ -62,9 +62,7 @@

Polymer({

is: 'paper-item-body',

enableCustomStyleProperties: true
is: 'paper-item-body'

});

Expand Down
11 changes: 5 additions & 6 deletions paper-item.html
Original file line number Diff line number Diff line change
Expand Up @@ -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">

<!--
Expand All @@ -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>
Expand All @@ -47,8 +48,6 @@

is: 'paper-item',

enableCustomStyleProperties: true,

hostAttributes: {
role: 'listitem'
}
Expand Down
16 changes: 8 additions & 8 deletions test/index.html
Original file line number Diff line number Diff line change
@@ -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>

Expand Down
16 changes: 8 additions & 8 deletions test/paper-item.html
Original file line number Diff line number Diff line change
@@ -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>

Expand Down