Merge branch 'master' of github.com:Mortega5/traffic-incidents

Mortega5 · Sep 21, 2016 · a76329a · a76329a
2 parents 0598fc9 + cd339f7
commit a76329a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/traffic-incidents-data.html b/traffic-incidents-data.html
@@ -31,8 +31,7 @@
   <template>
   <style>
   :host {
-    display: inline-block;
-    box-sizing: border-box;
+    display:none;
   }
   </style>
 

diff --git a/traffic-incidents.html b/traffic-incidents.html
@@ -53,7 +53,25 @@
 <link rel="import" href="../iron-icons/iron-icons.html">
 <link rel="import" href="../paper-spinner/paper-spinner.html">
 <link href="https://fonts.googleapis.com/css?family=Dosis" rel="stylesheet">
-
+<!-- Fix bug with font-face and shadow dom-->
+<style>
+  @font-face {
+    font-family: "Flaticon";
+    src: url("fonts/Flaticon.eot");
+    src: url("fonts/Flaticon.eot?#iefix") format("embedded-opentype"),
+    url("fonts/Flaticon.woff") format("woff"),
+    url("fonts/Flaticon.ttf") format("truetype"),
+    url("fonts/Flaticon.svg#Flaticon") format("svg");
+    font-weight: normal;
+    font-style: normal;
+  }
+  @media screen and (-webkit-min-device-pixel-ratio:0) {
+    @font-face {
+      font-family: "Flaticon";
+      src: url("./fonts/Flaticon.svg#Flaticon") format("svg");
+    }
+  }
+</style>
 
 
 <dom-module id="traffic-incidents">
@@ -64,6 +82,8 @@
     box-sizing: border-box;
     width: var(--ti-width, 400px);
     height: var(--ti-height, 450px);
+    min-width:300px;
+    min-height:250px;
   }
   paper-header-panel {
     width: 100%;
@@ -81,7 +101,6 @@
     font-weight: bold;
     transition: height 0.2s;
     background-color:#B2002F;
-    z-index:10;
     border-top-left-radius: 5px;
     border-top-right-radius: 5px;
     @apply(--ti-header);