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

Commit 0d3c28e

Browse files
committed
Merge branch '2.0-preview' into 2.0-preview
2 parents f0db02b + 4434596 commit 0d3c28e

File tree

7 files changed

+69
-40
lines changed

7 files changed

+69
-40
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
bower_components
1+
bower_components*
2+
bower-*.json

.travis.yml

+11-5
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,26 @@ sudo: required
33
before_script:
44
- npm install -g bower polymer-cli@next
55
- polymer install --variants
6+
- sudo mv /usr/bin/google-chrome /usr/bin/google-chrome-old
7+
- sudo mv /usr/bin/google-chrome-beta /usr/bin/google-chrome
68
env:
79
global:
8-
- secure: n1GTikMyHiZ8pFwPNIo2E26rcJ4qsXsWgoN9QvuhKEOikqZD9XHyLb4tuy1IkFgeAldnbSmX+erfjgM8ZQyrpJD52WjTFV/HFJiEmrMly23HQEPueQ8xykYWIusEOfOjEHyVH4EKM+lidQIw7Ac7BLBPNWxOb85DAeeCorVPN20=
9-
- secure: X2osrH6z2xoMz1AHz3vsU4LXqZqMZggUfGDLNUZLeXzY7jwearGdRGSdXS+UFvnZ5a1s7QlWQcbOHfbZm9wVfjHRSFkl3nccVZiTz0PQ+hYoDyAPC6f4L6rC+1IabE3B/fbNbjYePfJMKI/Pwuxl8xeS+ZzIGrNWjkPlFV4MZR4=
10+
- secure: >-
11+
n1GTikMyHiZ8pFwPNIo2E26rcJ4qsXsWgoN9QvuhKEOikqZD9XHyLb4tuy1IkFgeAldnbSmX+erfjgM8ZQyrpJD52WjTFV/HFJiEmrMly23HQEPueQ8xykYWIusEOfOjEHyVH4EKM+lidQIw7Ac7BLBPNWxOb85DAeeCorVPN20=
12+
- secure: >-
13+
X2osrH6z2xoMz1AHz3vsU4LXqZqMZggUfGDLNUZLeXzY7jwearGdRGSdXS+UFvnZ5a1s7QlWQcbOHfbZm9wVfjHRSFkl3nccVZiTz0PQ+hYoDyAPC6f4L6rC+1IabE3B/fbNbjYePfJMKI/Pwuxl8xeS+ZzIGrNWjkPlFV4MZR4=
1014
node_js: stable
1115
addons:
12-
firefox: '46.0'
16+
firefox: latest
1317
apt:
1418
sources:
1519
- google-chrome
1620
packages:
17-
- google-chrome-stable
21+
- google-chrome-beta
1822
sauce_connect: true
1923
script:
2024
- true || xvfb-run polymer test
21-
- 'if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then true || polymer test -s ''default''; fi'
25+
- >-
26+
if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then true || polymer test -s
27+
'default'; fi
2228
dist: trusty

bower.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@
2323
"dependencies": {
2424
"iron-flex-layout": "PolymerElements/iron-flex-layout#2.0-preview",
2525
"font-roboto": "PolymerElements/font-roboto#^1.0.1",
26-
"polymer": "polymer/polymer#2.0-preview"
26+
"polymer": "Polymer/polymer#^2.0.0-rc.1"
2727
},
2828
"devDependencies": {
29+
"iron-component-page": "PolymerElements/iron-component-page#2.0-preview",
2930
"iron-demo-helpers": "PolymerElements/iron-demo-helpers#2.0-preview",
30-
"webcomponentsjs": "webcomponents/webcomponentsjs#v1",
31-
"web-component-tester": "v6.0.0-prerelease.5"
31+
"webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0-rc.1",
32+
"web-component-tester": "^6.0.0-prerelease.6"
3233
},
3334
"variants": {
3435
"1.x": {
@@ -38,7 +39,9 @@
3839
"polymer": "Polymer/polymer#^1.1.0"
3940
},
4041
"devDependencies": {
42+
"iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
4143
"iron-demo-helpers": "PolymerElements/iron-demo-helpers#^1.0.0",
44+
"web-component-tester": "^4.0.0",
4245
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
4346
}
4447
}

classes/global.html

-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
a `<style is=custom-style include="..."` type of style include, which mean
1616
these styles will only apply to the main document, regardless of where
1717
you import this file.
18-
19-
For a set of styles that can be applied to an element,
20-
check iron-demo-helpers/demo-pages-shared-styles.html.
2118
-->
2219

2320
<style>

element-styles/paper-item.html

+18-12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
@license
3-
Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
3+
Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
44
This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
55
The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
66
The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
@@ -35,17 +35,23 @@
3535
<dom-module id="paper-item">
3636
<template>
3737
<style>
38+
:host, html {
39+
--paper-item: {
40+
display: block;
41+
position: relative;
42+
min-height: var(--paper-item-min-height, 48px);
43+
padding: 0px 16px;
44+
@apply --paper-font-subhead;
45+
border:none;
46+
outline: none;
47+
background: white;
48+
width: 100%;
49+
text-align: left;
50+
};
51+
}
52+
3853
.paper-item {
39-
display: block;
40-
position: relative;
41-
min-height: var(--paper-item-min-height, 48px);
42-
padding: 0px 16px;
43-
@apply --paper-font-subhead;
44-
border:none;
45-
outline: none;
46-
background: white;
47-
width: 100%;
48-
text-align: left;
54+
@apply --paper-item;
4955
}
5056

5157
.paper-item[hidden] {
@@ -58,7 +64,7 @@
5864
}
5965

6066
.paper-item[disabled] {
61-
color: var(--paper-item-disabled-color, --disabled-text-color);
67+
color: var(--paper-item-disabled-color, var(--disabled-text-color));
6268
@apply --paper-item-disabled;
6369
}
6470

element-styles/paper-material.html

+29-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
@license
3-
Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
3+
Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
44
This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
55
The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
66
The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
@@ -23,7 +23,7 @@
2323
<style is="custom-style" include="paper-material"></style>
2424
</custom-style>
2525
26-
<div class="paper-material elevation-1">
26+
<div class="paper-material" elevation="1">
2727
... content ...
2828
</div>
2929
@@ -34,29 +34,44 @@
3434
<dom-module id="paper-material">
3535
<template>
3636
<style>
37+
:host, html {
38+
--paper-material: {
39+
display: block;
40+
position: relative;
41+
};
42+
--paper-material-elevation-1: {
43+
@apply --shadow-elevation-2dp;
44+
};
45+
--paper-material-elevation-2: {
46+
@apply --shadow-elevation-4dp;
47+
};
48+
--paper-material-elevation-3: {
49+
@apply --shadow-elevation-6dp;
50+
};
51+
--paper-material-elevation-4: {
52+
@apply --shadow-elevation-8dp;
53+
};
54+
--paper-material-elevation-5: {
55+
@apply --shadow-elevation-16dp;
56+
};
57+
}
3758
:host(.paper-material), .paper-material {
38-
display: block;
39-
position: relative;
59+
@apply --paper-material;
4060
}
41-
4261
:host(.paper-material[elevation="1"]), .paper-material[elevation="1"] {
43-
@apply --shadow-elevation-2dp;
62+
@apply --paper-material-elevation-1;
4463
}
45-
4664
:host(.paper-material[elevation="2"]), .paper-material[elevation="2"] {
47-
@apply --shadow-elevation-4dp;
65+
@apply --paper-material-elevation-2;
4866
}
49-
5067
:host(.paper-material[elevation="3"]), .paper-material[elevation="3"] {
51-
@apply --shadow-elevation-6dp;
68+
@apply --paper-material-elevation-3;
5269
}
53-
5470
:host(.paper-material[elevation="4"]), .paper-material[elevation="4"] {
55-
@apply --shadow-elevation-8dp;
71+
@apply --paper-material-elevation-4;
5672
}
57-
5873
:host(.paper-material[elevation="5"]), .paper-material[elevation="5"] {
59-
@apply --shadow-elevation-16dp;
74+
@apply --paper-material-elevation-5;
6075
}
6176
</style>
6277
</template>

typography.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
font-weight: 400;
6565
letter-spacing: -.026em;
6666
line-height: 1.071428571;
67+
6768
};
6869

6970
--paper-font-display2: {
@@ -72,7 +73,7 @@
7273
font-size: 2.8125rem;
7374
font-weight: 400;
7475
letter-spacing: -.018em;
75-
line-height: 1.066666667;
76+
line-height: 1.066666667;
7677
};
7778

7879
--paper-font-display1: {
@@ -120,7 +121,7 @@
120121

121122
--paper-font-body1: {
122123
@apply --paper-font-common-base;
123-
124+
124125
font-size: .875rem;
125126
font-weight: 400;
126127
line-height: 1.428571429;

0 commit comments

Comments
 (0)