diff --git a/public/css/lato.css b/public/css/lato.css new file mode 100644 index 00000000000..57941353ccc --- /dev/null +++ b/public/css/lato.css @@ -0,0 +1,9 @@ +@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"); +} diff --git a/public/css/fonts.css b/public/css/ubuntu.css similarity index 51% rename from public/css/fonts.css rename to public/css/ubuntu.css index acb620f3b1d..7036f2e4f46 100644 --- a/public/css/fonts.css +++ b/public/css/ubuntu.css @@ -1,13 +1,3 @@ -@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"); diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade index 5acc723c45b..be9c80590a1 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='/css/fonts.css') + link(rel='stylesheet', href='/css/ubuntu.css') script(type='text/javascript', src='/js/lib/codemirror/mode/javascript/javascript.js') script(type='text/javascript', src='/js/lib/jailed/jailed.js') diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade index 8667e43b5e4..81196ddaadf 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='/css/fonts.css') + link(rel='stylesheet', href='/css/ubuntu.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 4db06c9d6bb..1a35746fc29 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='/css/fonts.css') + link(rel='stylesheet', href='/css/ubuntu.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 aeb765ed640..199b6a7c17f 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='/css/fonts.css') +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 59f1b93caab..6433cb2bb22 100644 --- a/server/views/partials/stylesheets.jade +++ b/server/views/partials/stylesheets.jade @@ -1,4 +1,4 @@ -link(rel="stylesheet" type="text/css" href="/css/fonts.css") +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')