summaryrefslogtreecommitdiffstats
path: root/third_party/polymer/components-chromium/core-item
diff options
context:
space:
mode:
authorPavel Sergeev <dzhioev@chromium.org>2014-12-24 12:57:12 +0300
committerPavel Sergeev <dzhioev@chromium.org>2014-12-24 09:58:59 +0000
commit735d920a272b044b8c44ce495c018b039bd96e4c (patch)
tree3b1f6594a9458271ce4c67f296824ebc6cf205ad /third_party/polymer/components-chromium/core-item
parentfa20d4c4ceaa68c1a45529ebc34375934afbd434 (diff)
downloadchromium_src-735d920a272b044b8c44ce495c018b039bd96e4c.zip
chromium_src-735d920a272b044b8c44ce495c018b039bd96e4c.tar.gz
chromium_src-735d920a272b044b8c44ce495c018b039bd96e4c.tar.bz2
Polymer updated to the latest stable version 0.5.2.
The biggest change is that platform.js is not needed in Chromium anymore. See https://github.com/polymer/polymer/releases for more details on what has been changed since 0.3.5. BUG=440039 TEST=existing tests R=dbeam@chromium.org, mtomasz@chromium.org, raymes@chromium.org, ygorshenin@chromium.org Review URL: https://codereview.chromium.org/798783004 Cr-Commit-Position: refs/heads/master@{#309628}
Diffstat (limited to 'third_party/polymer/components-chromium/core-item')
-rw-r--r--third_party/polymer/components-chromium/core-item/.bower.json14
-rw-r--r--third_party/polymer/components-chromium/core-item/bower.json7
-rw-r--r--third_party/polymer/components-chromium/core-item/core-item.css16
-rw-r--r--third_party/polymer/components-chromium/core-item/core-item.html21
-rw-r--r--third_party/polymer/components-chromium/core-item/demo.html11
-rw-r--r--third_party/polymer/components-chromium/core-item/index.html2
-rw-r--r--third_party/polymer/components-chromium/core-item/metadata.html11
7 files changed, 50 insertions, 32 deletions
diff --git a/third_party/polymer/components-chromium/core-item/.bower.json b/third_party/polymer/components-chromium/core-item/.bower.json
index a498db0..3cccf24 100644
--- a/third_party/polymer/components-chromium/core-item/.bower.json
+++ b/third_party/polymer/components-chromium/core-item/.bower.json
@@ -2,18 +2,18 @@
"name": "core-item",
"private": true,
"dependencies": {
- "core-icon": "Polymer/core-icon#>=0.3.0 <1.0.0",
- "core-icons": "Polymer/core-icons#>=0.3.0 <1.0.0"
+ "core-icon": "Polymer/core-icon#^0.5.0",
+ "core-icons": "Polymer/core-icons#^0.5.0"
},
+ "version": "0.5.2",
"homepage": "https://github.com/Polymer/core-item",
- "version": "0.3.5",
- "_release": "0.3.5",
+ "_release": "0.5.2",
"_resolution": {
"type": "version",
- "tag": "0.3.5",
- "commit": "9d4c6a97a7e70ebfb62bd9266892cfe13de7b70b"
+ "tag": "0.5.2",
+ "commit": "029c112752103e03377a0ab3d79b64e982703ddf"
},
"_source": "git://github.com/Polymer/core-item.git",
- "_target": "0.3.5",
+ "_target": "0.5.2",
"_originalSource": "Polymer/core-item"
} \ No newline at end of file
diff --git a/third_party/polymer/components-chromium/core-item/bower.json b/third_party/polymer/components-chromium/core-item/bower.json
index 4b46e03..941f6a9 100644
--- a/third_party/polymer/components-chromium/core-item/bower.json
+++ b/third_party/polymer/components-chromium/core-item/bower.json
@@ -2,7 +2,8 @@
"name": "core-item",
"private": true,
"dependencies": {
- "core-icon": "Polymer/core-icon#>=0.3.0 <1.0.0",
- "core-icons": "Polymer/core-icons#>=0.3.0 <1.0.0"
- }
+ "core-icon": "Polymer/core-icon#^0.5.0",
+ "core-icons": "Polymer/core-icons#^0.5.0"
+ },
+ "version": "0.5.2"
} \ No newline at end of file
diff --git a/third_party/polymer/components-chromium/core-item/core-item.css b/third_party/polymer/components-chromium/core-item/core-item.css
index fa13705..31f8ed1 100644
--- a/third_party/polymer/components-chromium/core-item/core-item.css
+++ b/third_party/polymer/components-chromium/core-item/core-item.css
@@ -7,35 +7,39 @@ 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
*/
-html /deep/ core-item {
+:host {
display: block;
position: relative;
min-height: 40px;
white-space: nowrap;
}
-html /deep/ core-item.font-scalable {
+:host(.font-scalable) {
min-height: 2.5em;
}
-html /deep/ core-item.core-selected {
+:host(.core-selected) {
font-weight: bold;
}
-html /deep/ core-item::shadow core-icon {
+#icon {
margin: 0 16px 0 4px;
}
-html /deep/ core-item.font-scalable::shadow core-icon {
+:host(.font-scalable) #icon {
margin: 0 1em 0 0.25em;
height: 1.5em;
width: 1.5em;
}
-html /deep/ core-item::shadow ::content > a {
+polyfill-next-selector { content: ':host > a'; }
+::content > a {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
+ /* IE10 styling to ensure link is clickable. Cannot be completely
+ transparent or minifiers change it to `transparent` which does not work. */
+ background-color: rgba(0, 0, 0, 0.000001);
}
diff --git a/third_party/polymer/components-chromium/core-item/core-item.html b/third_party/polymer/components-chromium/core-item/core-item.html
index 8937dc6..bbc97f0 100644
--- a/third_party/polymer/components-chromium/core-item/core-item.html
+++ b/third_party/polymer/components-chromium/core-item/core-item.html
@@ -5,9 +5,7 @@ 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
--->
-
-<!--
+--><!--
`core-item` is a simple line-item object: a label and/or an icon that can also
act as a link.
@@ -26,20 +24,17 @@ Example:
@group Polymer Core Elements
@element core-item
@homepage github.io
--->
-
-<link rel="import" href="../core-icon/core-icon.html">
+--><html><head><link rel="import" href="../core-icon/core-icon.html">
-<link rel="stylesheet" href="core-item.css" shim-shadowdom="">
-
-<polymer-element name="core-item" attributes="label icon src" horizontal="" center="" layout="" assetpath="">
+</head><body><polymer-element name="core-item" attributes="label icon src" horizontal="" center="" layout="" assetpath="">
<template>
-
- <core-icon src="{{src}}" icon="{{icon}}" hidden?="{{!src &amp;&amp; !icon}}"></core-icon>
+ <link rel="stylesheet" href="core-item.css">
+ <template if="{{icon || src}}">
+ <core-icon src="{{src}}" id="icon" icon="{{icon}}" hidden?="{{!src &amp;&amp; !icon}}"></core-icon>
+ </template>
<div id="label">{{label}}</div>
<content></content>
-
</template>
</polymer-element>
-<script src="core-item-extracted.js"></script> \ No newline at end of file
+<script src="core-item-extracted.js"></script></body></html> \ No newline at end of file
diff --git a/third_party/polymer/components-chromium/core-item/demo.html b/third_party/polymer/components-chromium/core-item/demo.html
index 9f1b6f4..d0ad68b 100644
--- a/third_party/polymer/components-chromium/core-item/demo.html
+++ b/third_party/polymer/components-chromium/core-item/demo.html
@@ -1,10 +1,19 @@
+<!--
+ @license
+ Copyright (c) 2014 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>
<title>core-item</title>
- <script src="../platform/platform.js"></script>
+ <script src="../webcomponentsjs/webcomponents.js"></script>
<link rel="import" href="../core-icons/core-icons.html">
<link rel="import" href="core-item.html">
diff --git a/third_party/polymer/components-chromium/core-item/index.html b/third_party/polymer/components-chromium/core-item/index.html
index 58856f3..294215a 100644
--- a/third_party/polymer/components-chromium/core-item/index.html
+++ b/third_party/polymer/components-chromium/core-item/index.html
@@ -10,7 +10,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<html>
<head>
- <script src="../platform/platform.js"></script>
+ <script src="../webcomponentsjs/webcomponents.js"></script>
<link rel="import" href="../core-component-page/core-component-page.html">
</head>
diff --git a/third_party/polymer/components-chromium/core-item/metadata.html b/third_party/polymer/components-chromium/core-item/metadata.html
index 63e7979..334d59d 100644
--- a/third_party/polymer/components-chromium/core-item/metadata.html
+++ b/third_party/polymer/components-chromium/core-item/metadata.html
@@ -1,3 +1,12 @@
+<!--
+ @license
+ Copyright (c) 2014 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
+-->
<x-meta id="core-item" label="Item" group="Core">
<template>
@@ -12,4 +21,4 @@
</template>
-</x-meta> \ No newline at end of file
+</x-meta>