gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

split fonts into two separate files

Browse Source
This commit is contained in:
Berkeley Martinez
2015-09-17 00:06:01 -07:00
parent 04727620e4
commit 38d76ec3bb
7 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/css/lato.css Normal file
View File

@ -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");
}

10
public/css/fonts.css → public/css/ubuntu.css
View File

@ -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-face {
font-family: "Ubuntu"; font-family: "Ubuntu";
src: url(/fonts/Ubuntu-Regular.ttf) format("truetype"); src: url(/fonts/Ubuntu-Regular.ttf) format("truetype");

2
server/views/coursewares/showBonfire.jade
View File

@ -11,7 +11,7 @@ block content
link(rel='stylesheet', href='/js/lib/codemirror/lib/codemirror.css') 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/addon/lint/lint.css')
link(rel='stylesheet', href='/js/lib/codemirror/theme/monokai.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/codemirror/mode/javascript/javascript.js')
script(type='text/javascript', src='/js/lib/jailed/jailed.js') script(type='text/javascript', src='/js/lib/jailed/jailed.js')

2
server/views/coursewares/showHTML.jade
View File

@ -11,7 +11,7 @@ block content
link(rel='stylesheet', href='/js/lib/codemirror/lib/codemirror.css') 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/addon/lint/lint.css')
link(rel='stylesheet', href='/js/lib/codemirror/theme/monokai.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/codemirror/mode/javascript/javascript.js')
script(src='/js/lib/jailed/jailed.js') script(src='/js/lib/jailed/jailed.js')
script(src='/js/lib/codemirror/mode/xml/xml.js') script(src='/js/lib/codemirror/mode/xml/xml.js')

2
server/views/coursewares/showJS.jade
View File

@ -10,7 +10,7 @@ block content
link(rel='stylesheet', href='/js/lib/codemirror/lib/codemirror.css') 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/addon/lint/lint.css')
link(rel='stylesheet', href='/js/lib/codemirror/theme/monokai.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/codemirror/mode/javascript/javascript.js')
script(type='text/javascript', src='/js/lib/jailed/jailed.js') script(type='text/javascript', src='/js/lib/jailed/jailed.js')
.row(ng-controller="pairedWithController") .row(ng-controller="pairedWithController")

2
server/views/partials/small-head.jade
View File

@ -1,6 +1,6 @@
script(src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js") 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") 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='/bower_components/font-awesome/css/font-awesome.min.css')
link(rel='stylesheet', href=rev('/css', 'main.css')) link(rel='stylesheet', href=rev('/css', 'main.css'))
link(rel='stylesheet', href='/css/Vimeo.css') link(rel='stylesheet', href='/css/Vimeo.css')

2
server/views/partials/stylesheets.jade
View File

@ -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" 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/font-awesome/css/font-awesome.min.css')
link(rel='stylesheet', href='/bower_components/lightbox2/dist/css/lightbox.css') link(rel='stylesheet', href='/bower_components/lightbox2/dist/css/lightbox.css')