Merge branch '2.0-preview' into 2.0-preview

PolymerElements · Apr 16, 2017 · 18fa995 · 18fa995
2 parents f0db02b + 4434596
commit 18fa995
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 40 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-bower_components
+bower_components*
+bower-*.json
diff --git a/.travis.yml b/.travis.yml
@@ -3,20 +3,26 @@ sudo: required
 before_script:
   - npm install -g bower polymer-cli@next
   - polymer install --variants
+  - sudo mv /usr/bin/google-chrome /usr/bin/google-chrome-old
+  - sudo mv /usr/bin/google-chrome-beta /usr/bin/google-chrome
 env:
   global:
-    - secure: n1GTikMyHiZ8pFwPNIo2E26rcJ4qsXsWgoN9QvuhKEOikqZD9XHyLb4tuy1IkFgeAldnbSmX+erfjgM8ZQyrpJD52WjTFV/HFJiEmrMly23HQEPueQ8xykYWIusEOfOjEHyVH4EKM+lidQIw7Ac7BLBPNWxOb85DAeeCorVPN20=
-    - secure: X2osrH6z2xoMz1AHz3vsU4LXqZqMZggUfGDLNUZLeXzY7jwearGdRGSdXS+UFvnZ5a1s7QlWQcbOHfbZm9wVfjHRSFkl3nccVZiTz0PQ+hYoDyAPC6f4L6rC+1IabE3B/fbNbjYePfJMKI/Pwuxl8xeS+ZzIGrNWjkPlFV4MZR4=
+    - secure: >-
+        n1GTikMyHiZ8pFwPNIo2E26rcJ4qsXsWgoN9QvuhKEOikqZD9XHyLb4tuy1IkFgeAldnbSmX+erfjgM8ZQyrpJD52WjTFV/HFJiEmrMly23HQEPueQ8xykYWIusEOfOjEHyVH4EKM+lidQIw7Ac7BLBPNWxOb85DAeeCorVPN20=
+    - secure: >-
+        X2osrH6z2xoMz1AHz3vsU4LXqZqMZggUfGDLNUZLeXzY7jwearGdRGSdXS+UFvnZ5a1s7QlWQcbOHfbZm9wVfjHRSFkl3nccVZiTz0PQ+hYoDyAPC6f4L6rC+1IabE3B/fbNbjYePfJMKI/Pwuxl8xeS+ZzIGrNWjkPlFV4MZR4=
 node_js: stable
 addons:
-  firefox: '46.0'
+  firefox: latest
   apt:
     sources:
       - google-chrome
     packages:
-      - google-chrome-stable
+      - google-chrome-beta
   sauce_connect: true
 script:
   - true || xvfb-run polymer test
-  - 'if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then true || polymer test -s ''default''; fi'
+  - >-
+    if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then true || polymer test -s
+    'default'; fi
 dist: trusty
diff --git a/bower.json b/bower.json
@@ -23,12 +23,13 @@
   "dependencies": {
     "iron-flex-layout": "PolymerElements/iron-flex-layout#2.0-preview",
     "font-roboto": "PolymerElements/font-roboto#^1.0.1",
-    "polymer": "polymer/polymer#2.0-preview"
+    "polymer": "Polymer/polymer#^2.0.0-rc.1"
   },
   "devDependencies": {
+    "iron-component-page": "PolymerElements/iron-component-page#2.0-preview",
     "iron-demo-helpers": "PolymerElements/iron-demo-helpers#2.0-preview",
-    "webcomponentsjs": "webcomponents/webcomponentsjs#v1",
-    "web-component-tester": "v6.0.0-prerelease.5"
+    "webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0-rc.1",
+    "web-component-tester": "^6.0.0-prerelease.6"
   },
   "variants": {
     "1.x": {
@@ -38,7 +39,9 @@
         "polymer": "Polymer/polymer#^1.1.0"
       },
       "devDependencies": {
+        "iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
         "iron-demo-helpers": "PolymerElements/iron-demo-helpers#^1.0.0",
+        "web-component-tester": "^4.0.0",
         "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
       }
     }

diff --git a/classes/global.html b/classes/global.html
@@ -15,9 +15,6 @@
 a `<style is=custom-style include="..."` type of style include, which mean
 these styles will only apply to the main document, regardless of where
 you import this file.
-
-For a set of styles that can be applied to an element,
-check iron-demo-helpers/demo-pages-shared-styles.html.
 -->
 
 <style>

diff --git a/element-styles/paper-item.html b/element-styles/paper-item.html
@@ -1,6 +1,6 @@
 <!--
 @license
-Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
+Copyright (c) 2017 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
@@ -35,17 +35,23 @@
 <dom-module id="paper-item">
   <template>
     <style>
+      :host, html {
+        --paper-item: {
+          display: block;
+          position: relative;
+          min-height: var(--paper-item-min-height, 48px);
+          padding: 0px 16px;
+          @apply --paper-font-subhead;
+          border:none;
+          outline: none;
+          background: white;
+          width: 100%;
+          text-align: left;
+        };
+      }
+
       .paper-item {
-        display: block;
-        position: relative;
-        min-height: var(--paper-item-min-height, 48px);
-        padding: 0px 16px;
-        @apply --paper-font-subhead;
-        border:none;
-        outline: none;
-        background: white;
-        width: 100%;
-        text-align: left;
+        @apply --paper-item;
       }
 
       .paper-item[hidden] {
@@ -58,7 +64,7 @@
       }
 
       .paper-item[disabled] {
-        color: var(--paper-item-disabled-color, --disabled-text-color);
+        color: var(--paper-item-disabled-color, var(--disabled-text-color));
         @apply --paper-item-disabled;
       }
 

diff --git a/element-styles/paper-material.html b/element-styles/paper-material.html
@@ -1,6 +1,6 @@
 <!--
 @license
-Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
+Copyright (c) 2017 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
@@ -23,7 +23,7 @@
       <style is="custom-style" include="paper-material"></style>
     </custom-style>
 
-    <div class="paper-material elevation-1">
+    <div class="paper-material" elevation="1">
       ... content ...
     </div>
 
@@ -34,29 +34,44 @@
 <dom-module id="paper-material">
   <template>
     <style>
+      :host, html {
+        --paper-material: {
+          display: block;
+          position: relative;
+        };
+        --paper-material-elevation-1: {
+          @apply --shadow-elevation-2dp;
+        };
+        --paper-material-elevation-2: {
+          @apply --shadow-elevation-4dp;
+        };
+        --paper-material-elevation-3: {
+          @apply --shadow-elevation-6dp;
+        };
+        --paper-material-elevation-4: {
+          @apply --shadow-elevation-8dp;
+        };
+        --paper-material-elevation-5: {
+          @apply --shadow-elevation-16dp;
+        };
+      }
       :host(.paper-material), .paper-material {
-        display: block;
-        position: relative;
+        @apply --paper-material;
       }
-
       :host(.paper-material[elevation="1"]), .paper-material[elevation="1"] {
-        @apply --shadow-elevation-2dp;
+        @apply --paper-material-elevation-1;
       }
-
       :host(.paper-material[elevation="2"]), .paper-material[elevation="2"] {
-        @apply --shadow-elevation-4dp;
+        @apply --paper-material-elevation-2;
       }
-
       :host(.paper-material[elevation="3"]), .paper-material[elevation="3"] {
-        @apply --shadow-elevation-6dp;
+        @apply --paper-material-elevation-3;
       }
-
       :host(.paper-material[elevation="4"]), .paper-material[elevation="4"] {
-        @apply --shadow-elevation-8dp;
+        @apply --paper-material-elevation-4;
       }
-
       :host(.paper-material[elevation="5"]), .paper-material[elevation="5"] {
-        @apply --shadow-elevation-16dp;
+        @apply --paper-material-elevation-5;
       }
     </style>
   </template>

diff --git a/typography.html b/typography.html
@@ -64,6 +64,7 @@
         font-weight: 400;
         letter-spacing: -.026em;
         line-height: 1.071428571;
+
       };
 
       --paper-font-display2: {
@@ -72,7 +73,7 @@
         font-size: 2.8125rem;
         font-weight: 400;
         letter-spacing: -.018em;
-        line-height: 1.066666667;
+        line-height: 1.066666667;   
       };
 
       --paper-font-display1: {
@@ -120,7 +121,7 @@
 
       --paper-font-body1: {
         @apply --paper-font-common-base;
-
+        
         font-size: .875rem;
         font-weight: 400;
         line-height: 1.428571429;