From 22386a50359b9927b5a5543c80e41740228c1028 Mon Sep 17 00:00:00 2001
From: Justin Weberg <justweb1@users.noreply.github.com>
Date: Sun, 2 Oct 2016 17:23:06 -0500
Subject: [PATCH] Polymer 1.7 (#113)

* Update paper-range-slider in Bower.json

* Changed Content to slot in ha-card.html

* Update bower.json for Polymer 1.7

* Revert "Update paper-range-slider in Bower.json"

This reverts commit 0c305bd2fec2c8d99b3aeb1ee3f2461df80dc87c.

* change :root to html
---
 bower.json                  | 2 +-
 src/components/ha-card.html | 4 ++--
 src/resources/ha-style.html | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bower.json b/bower.json
index fd49e29545..11dc896ac8 100644
--- a/bower.json
+++ b/bower.json
@@ -8,7 +8,7 @@
   "license": "MIT",
   "private": true,
   "devDependencies": {
-    "polymer": "Polymer/polymer#~1.6.1",
+    "polymer": "Polymer/polymer#~1.7.0",
     "pikaday": "~1.4.0",
     "leaflet-map": "~1.2.0",
     "iron-elements": "PolymerElements/iron-elements#~1.0.10",
diff --git a/src/components/ha-card.html b/src/components/ha-card.html
index d5d7beaf67..5c0d71c2b2 100644
--- a/src/components/ha-card.html
+++ b/src/components/ha-card.html
@@ -23,7 +23,7 @@
     <template is='dom-if' if='[[header]]'>
       <div class='header'>[[header]]</div>
     </template>
-    <content></content>
+    <slot></slot>
   </template>
 </dom-module>
 
@@ -45,4 +45,4 @@ Polymer({
     },
   },
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/src/resources/ha-style.html b/src/resources/ha-style.html
index b16465838f..1e70069523 100644
--- a/src/resources/ha-style.html
+++ b/src/resources/ha-style.html
@@ -1,7 +1,7 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
 <style is="custom-style">
-  :root {
+  html {
     font-size: 14px;
 
     --dark-primary-color: #0288D1;