merge from dev

2016-01-14 12:04:42 -05:00 · 2016-01-14 12:04:42 -05:00 · bcfee41a57
commit bcfee41a57
parent d96250df7f
318 changed files with 54424 additions and 6419 deletions
--- a/dashboard-ui/bower_components/neon-animation/demo/doc/my-animatable.html
+++ b/dashboard-ui/bower_components/neon-animation/demo/doc/my-animatable.html
@ -11,25 +11,19 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 <link rel="import" href="../../animations/scale-down-animation.html">

 <dom-module id="my-animatable">
-
-  <style>
-
-    :host {
-      display: inline-block;
-      border-radius: 50%;
-      width: 300px;
-      height: 300px;
-      background: orange;
-    }
-
-  </style>
-
  <template>
-
+    <style>
+      :host {
+        display: inline-block;
+        border-radius: 50%;
+        width: 300px;
+        height: 300px;
+        background: orange;
+      }
+    </style>
    <content></content>

  </template>
-
 </dom-module>

 <script>