From 308e539e1e75815e4229269011ac21e3c44e0bb6 Mon Sep 17 00:00:00 2001 From: terakilobyte Date: Tue, 16 Jun 2015 12:23:49 -0400 Subject: [PATCH] More protocol experimentation --- public/css/main.less | 33 ----------------------- public/js/lib/jailed/_frame.js | 2 +- server/views/partials/universal-head.jade | 2 +- 3 files changed, 2 insertions(+), 35 deletions(-) diff --git a/public/css/main.less b/public/css/main.less index fc324ceb80..424ae26933 100644 --- a/public/css/main.less +++ b/public/css/main.less @@ -4,39 +4,6 @@ @import "lib/animate.min.less"; @import "lib/bootstrap/variables"; -/* latin-ext */ -@font-face { - font-family: 'Inconsolata'; - font-style: normal; - font-weight: 400; - src: local('Inconsolata'), url(http://fonts.gstatic.com/s/inconsolata/v11/BjAYBlHtW3CJxDcjzrnZCKE8kM4xWR1_1bYURRojRGc.woff2) format('woff2'); - unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; -} -/* latin */ -@font-face { - font-family: 'Inconsolata'; - font-style: normal; - font-weight: 400; - src: local('Inconsolata'), url(http://fonts.gstatic.com/s/inconsolata/v11/BjAYBlHtW3CJxDcjzrnZCIgp9Q8gbYrhqGlRav_IXfk.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; -} -/* latin-ext */ -@font-face { - font-family: 'Lato'; - font-style: normal; - font-weight: 400; - src: local('Lato Regular'), local('Lato-Regular'), url(http://fonts.gstatic.com/s/lato/v11/8qcEw_nrk_5HEcCpYdJu8BTbgVql8nDJpwnrE27mub0.woff2) format('woff2'); - unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; -} -/* latin */ -@font-face { - font-family: 'Lato'; - font-style: normal; - font-weight: 400; - src: local('Lato Regular'), local('Lato-Regular'), url(http://fonts.gstatic.com/s/lato/v11/MDadn8DQ_3oT6kvnUq_2r_esZW2xOQ-xsNqO47m55DA.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; -} - html,body,div,span,a,li,td,th { font-family: 'Lato', sans-serif; font-weight: 300; diff --git a/public/js/lib/jailed/_frame.js b/public/js/lib/jailed/_frame.js index 34046b89de..fa310643fd 100644 --- a/public/js/lib/jailed/_frame.js +++ b/public/js/lib/jailed/_frame.js @@ -12,7 +12,7 @@ var __jailed__path__ = scripts[scripts.length-1].src .split('?')[0] .split('/') .slice(0, -1) - .join('/')+'/'; + .join('/') + '/'; // creating worker as a blob enables import of local files var blobCode = [ diff --git a/server/views/partials/universal-head.jade b/server/views/partials/universal-head.jade index 8670ad192a..c33c77acaa 100644 --- a/server/views/partials/universal-head.jade +++ b/server/views/partials/universal-head.jade @@ -38,7 +38,7 @@ script(src="/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js") script(src="/bower_components/ramda/dist/ramda.min.js") -link(rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Lato:400|Inconsolata") +link(rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Lato:400|Inconsolata") link(rel="stylesheet" type="text/css" href="/bower_components/cal-heatmap/cal-heatmap.css")