From 723b49093248bd84f4819a0057eec349f1aaacc1 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Thu, 17 Sep 2015 09:57:27 -0700 Subject: [PATCH] load lato font after dom ready --- client/main.js | 26 ++++++++++++++++++++++++++ server/views/partials/small-head.jade | 1 - server/views/partials/stylesheets.jade | 1 - 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/client/main.js b/client/main.js index 6e6ce8c696..36aa44fe8c 100644 --- a/client/main.js +++ b/client/main.js @@ -4,6 +4,32 @@ $(document).ready(function() { challengeName : 'Untitled'; + // pre-cache fonts + var lightDef = $.ajax({ + url: '/fonts/Lato-Light.ttf', + beforeSend: function(xhr) { + xhr.overrideMimeType('application/octet-stream'); + } + }); + + var regularDef = $.ajax({ + url: '/fonts/Lato-Regular.ttf', + beforeSend: function(xhr) { + xhr.overrideMimeType('application/octet-stream'); + } + }); + + // now add link to css + $.when(lightDef, regularDef).then(function() { + $('') + .attr({ + type: 'text/css', + rel: 'stylesheet', + href: '/css/lato.css' + }) + .appendTo('head'); + }); + if (challengeName) { ga('send', 'event', 'Challenge', 'load', challengeName); } diff --git a/server/views/partials/small-head.jade b/server/views/partials/small-head.jade index 199b6a7c17..37cc19e35b 100644 --- a/server/views/partials/small-head.jade +++ b/server/views/partials/small-head.jade @@ -1,6 +1,5 @@ script(src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js") script(src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/js/bootstrap.min.js") -link(rel='stylesheet' type='text/css' href='/css/lato.css') link(rel='stylesheet', href='/bower_components/font-awesome/css/font-awesome.min.css') link(rel='stylesheet', href=rev('/css', 'main.css')) link(rel='stylesheet', href='/css/Vimeo.css') diff --git a/server/views/partials/stylesheets.jade b/server/views/partials/stylesheets.jade index 6433cb2bb2..d5631396a2 100644 --- a/server/views/partials/stylesheets.jade +++ b/server/views/partials/stylesheets.jade @@ -1,4 +1,3 @@ -link(rel="stylesheet" type="text/css" href="/css/lato.css") link(rel="stylesheet" type="text/css" href="/bower_components/cal-heatmap/cal-heatmap.css") link(rel='stylesheet', href='/bower_components/font-awesome/css/font-awesome.min.css') link(rel='stylesheet', href='/bower_components/lightbox2/dist/css/lightbox.css')