diff --git a/public/css/fonts.css b/public/css/fonts.css new file mode 100644 index 0000000000..acb620f3b1 --- /dev/null +++ b/public/css/fonts.css @@ -0,0 +1,19 @@ +@font-face { + font-family: "Lato"; + src: url(/fonts/Lato-Regular.ttf) format("truetype"); +} + +@font-face { + font-family: "Lato Light"; + src: url(/fonts/Lato-Light.ttf) format("truetype"); +} + +@font-face { + font-family: "Ubuntu"; + src: url(/fonts/Ubuntu-Regular.ttf) format("truetype"); +} + +@font-face { + font-family: "Ubuntu Mono"; + src: url(/fonts/UbuntuMono-Regular.ttf) format("truetype"); +} diff --git a/public/fonts/Lato-Light.ttf b/public/fonts/Lato-Light.ttf old mode 100755 new mode 100644 diff --git a/public/fonts/Lato-Regular.ttf b/public/fonts/Lato-Regular.ttf new file mode 100644 index 0000000000..04ea8efb13 Binary files /dev/null and b/public/fonts/Lato-Regular.ttf differ diff --git a/public/fonts/Ubuntu-Regular.ttf b/public/fonts/Ubuntu-Regular.ttf new file mode 100644 index 0000000000..d748728a20 Binary files /dev/null and b/public/fonts/Ubuntu-Regular.ttf differ diff --git a/public/fonts/UbuntuMono-Regular.ttf b/public/fonts/UbuntuMono-Regular.ttf new file mode 100644 index 0000000000..fdd309d716 Binary files /dev/null and b/public/fonts/UbuntuMono-Regular.ttf differ diff --git a/public/fonts/ionicons.eot b/public/fonts/ionicons.eot old mode 100755 new mode 100644 diff --git a/public/fonts/ionicons.svg b/public/fonts/ionicons.svg old mode 100755 new mode 100644 diff --git a/public/fonts/ionicons.ttf b/public/fonts/ionicons.ttf old mode 100755 new mode 100644 diff --git a/public/fonts/ionicons.woff b/public/fonts/ionicons.woff old mode 100755 new mode 100644 diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade index 687ce496b3..5acc723c45 100644 --- a/server/views/coursewares/showBonfire.jade +++ b/server/views/coursewares/showBonfire.jade @@ -11,7 +11,7 @@ block content link(rel='stylesheet', href='/js/lib/codemirror/lib/codemirror.css') link(rel='stylesheet', href='/js/lib/codemirror/addon/lint/lint.css') link(rel='stylesheet', href='/js/lib/codemirror/theme/monokai.css') - link(rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono") + link(rel='stylesheet', href='/css/fonts.css') script(type='text/javascript', src='/js/lib/codemirror/mode/javascript/javascript.js') script(type='text/javascript', src='/js/lib/jailed/jailed.js') @@ -167,4 +167,3 @@ block content if (!MDNlinks.length) { $('#MDN-links').addClass('collapse'); } - diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade index 7b83db4168..8667e43b5e 100644 --- a/server/views/coursewares/showHTML.jade +++ b/server/views/coursewares/showHTML.jade @@ -11,7 +11,7 @@ block content link(rel='stylesheet', href='/js/lib/codemirror/lib/codemirror.css') link(rel='stylesheet', href='/js/lib/codemirror/addon/lint/lint.css') link(rel='stylesheet', href='/js/lib/codemirror/theme/monokai.css') - link(rel="stylesheet", href="http://fonts.googleapis.com/css?family=Ubuntu+Mono") + link(rel='stylesheet', href='/css/fonts.css') script(src='/js/lib/codemirror/mode/javascript/javascript.js') script(src='/js/lib/jailed/jailed.js') script(src='/js/lib/codemirror/mode/xml/xml.js') diff --git a/server/views/coursewares/showJS.jade b/server/views/coursewares/showJS.jade index 3edcd9d1fd..4db06c9d6b 100644 --- a/server/views/coursewares/showJS.jade +++ b/server/views/coursewares/showJS.jade @@ -10,7 +10,7 @@ block content link(rel='stylesheet', href='/js/lib/codemirror/lib/codemirror.css') link(rel='stylesheet', href='/js/lib/codemirror/addon/lint/lint.css') link(rel='stylesheet', href='/js/lib/codemirror/theme/monokai.css') - link(rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono") + link(rel='stylesheet', href='/css/fonts.css') script(type='text/javascript', src='/js/lib/codemirror/mode/javascript/javascript.js') script(type='text/javascript', src='/js/lib/jailed/jailed.js') .row(ng-controller="pairedWithController") diff --git a/server/views/partials/small-head.jade b/server/views/partials/small-head.jade index 9116a6a32a..aeb765ed64 100644 --- a/server/views/partials/small-head.jade +++ b/server/views/partials/small-head.jade @@ -1,6 +1,6 @@ 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="//fonts.googleapis.com/css?family=Lato:400|Inconsolata") +link(rel='stylesheet' type='text/css' href='/css/fonts.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 da6d843378..59f1b93caa 100644 --- a/server/views/partials/stylesheets.jade +++ b/server/views/partials/stylesheets.jade @@ -1,4 +1,4 @@ -link(rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Lato:400|Inconsolata") +link(rel="stylesheet" type="text/css" href="/css/fonts.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')