new fonts include + tick json

MediaMath · Sep 9, 2015 · 644835a · 644835a
1 parent 37af9c9
commit 644835a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/bower.json b/bower.json
@@ -34,11 +34,11 @@
     "*.md"
   ],
   "dependencies": {
-    "polymer": "Polymer/polymer#1.1.2",
+    "polymer": "Polymer/polymer#1.1.3",
     "webcomponentsjs": "webcomponents/webcomponentsjs#0.7.12",
     "moment": "~2.10.6",
     "moment-range": "~2.0.3",
-    "zousan": "~1.2.1"
+    "zousan": "~1.3.0"
   },
   "devDependencies": {
     "web-component-tester": "~2.2.6",

diff --git a/src/mm-icon/mm-icon.html b/src/mm-icon/mm-icon.html
@@ -5,16 +5,17 @@
 
 -->
 <link rel="import" href="../../bower_components/polymer/polymer.html"/>
-<link rel="import" href="../shared/fonts/shared-fonts.html"/>
+<link rel="import" href="../shared/fonts/fonts.html"/>
 <link rel="import" href="style.html"/>
 <link rel="import" href="../shared/js/colors.html"/>
 <link rel="import" href="../shared/behaviors/stylable.html"/>
 
 <dom-module id="mm-icon">
 	<template>
-		<style include="shared-fonts-style"></style>
+		<style include="fonts-style"></style>
 		<style include="mm-icon-style"></style>
 		<span id="iconGlyph" class$="{{_updateClass(type)}}" style$="{{_updateStyle(width, height)}}"></span>
+		<span class="cats">cats</span>
 	</template>
 </dom-module>
 

diff --git a/src/shared/fonts/fonts.html b/src/shared/fonts/fonts.html
@@ -1,2 +1,6 @@
-<link rel="stylesheet" type="text/css" href="fonts.css">
-<span style="font-family:Arimo; display:none">a</span>
+<dom-module id="fonts-style">
+	<link rel="stylesheet" type="text/css" href="fonts.css">
+	<template>
+		<span style="font-family:Arimo; display:none">a</span>
+	</template>
+</dom-module>