JavaScript/CSS updates

Remove useless font import from CSS
Embed scale.fix.js into footer
Replace GA code in footer with tracking code from GA

3 files changed, 25 insertions, 26 deletions

diff --git a/_includes/footer.html b/_includes/footer.html
index 6eb8358..ecffab0 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -4,16 +4,34 @@
 			<p><small>Hosted on GitHub &mdash; Theme by <a href="https://github.com/orderedlist">orderedlist</a></small></p>
 		</footer>
 	</div>
-	<script src="/javascripts/scale.fix.js"></script>
 	<script type="text/javascript">
-		var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-		document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+		// scale.fix.js
+		var metas = document.getElementsByTagName('meta');
+		var i;
+		if (navigator.userAgent.match(/iPhone/i)) {
+			for (i=0; i<metas.length; i++) {
+				if (metas[i].name == "viewport") {
+					metas[i].content = "width=device-width, minimum-scale=1.0, maximum-scale=1.0";
+				}
+			}
+			document.addEventListener("gesturestart", gestureStart, false);
+		}
+		function gestureStart() {
+			for (i=0; i<metas.length; i++) {
+				if (metas[i].name == "viewport") {
+					metas[i].content = "width=device-width, minimum-scale=0.25, maximum-scale=1.6";
+				}
+			}
+		}
 	</script>
 	<script type="text/javascript">
-		try {
-			var pageTracker = _gat._getTracker("UA-954596-3");
-			pageTracker._trackPageview();
-		} catch(err) {}
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+			(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+			m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+		ga('create', 'UA-954596-3', 'auto');
+		ga('send', 'pageview');
 	</script>
 </body>
 </html>
diff --git a/javascripts/scale.fix.js b/javascripts/scale.fix.js
deleted file mode 100644
index 87a40ca..0000000
--- a/javascripts/scale.fix.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var metas = document.getElementsByTagName('meta');
-var i;
-if (navigator.userAgent.match(/iPhone/i)) {
-  for (i=0; i<metas.length; i++) {
-    if (metas[i].name == "viewport") {
-      metas[i].content = "width=device-width, minimum-scale=1.0, maximum-scale=1.0";
-    }
-  }
-  document.addEventListener("gesturestart", gestureStart, false);
-}
-function gestureStart() {
-  for (i=0; i<metas.length; i++) {
-    if (metas[i].name == "viewport") {
-      metas[i].content = "width=device-width, minimum-scale=0.25, maximum-scale=1.6";
-    }
-  }
-}
\ No newline at end of file
diff --git a/stylesheets/styles.css b/stylesheets/styles.css
index e635dd7..020f974 100644
--- a/stylesheets/styles.css
+++ b/stylesheets/styles.css
@@ -1,5 +1,3 @@
-@import url(https://fonts.googleapis.com/css?family=Lato:300italic,700italic,300,700);
-
 body {
   padding:50px;
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;