diff --git a/package.json b/package.json index 2e0986284d..ab36586f00 100644 --- a/package.json +++ b/package.json @@ -33,8 +33,10 @@ "express-flash": "^0.0.2", "express-session": "^1.9.2", "express-validator": "^2.8.0", + "font-awesome": "^4.3.0", "forever": "^0.14.1", "github-api": "^0.7.0", + "gulp-minify-css": "^0.5.1", "helmet": "^0.5.3", "jade": "^1.8.0", "less": "^1.7.5", @@ -70,6 +72,7 @@ "chai": "^1.10.0", "gulp": "^3.8.8", "gulp-inject": "^1.0.2", + "gulp-minify-css": "^0.5.1", "gulp-nodemon": "^1.0.4", "mocha": "^2.0.1", "multiline": "^1.0.1", diff --git a/public/css/lib/font-awesome.less b/public/css/lib/font-awesome.less new file mode 100644 index 0000000000..8ac3c9db68 --- /dev/null +++ b/public/css/lib/font-awesome.less @@ -0,0 +1,17 @@ +/*! + * Font Awesome 4.3.0 by @davegandy - http://fontawesome.io - @fontawesome + * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) + */ + +@import "../../../../../Downloads/font-awesome-4.3.0/less/variables.less"; +@import "../../../../../Downloads/font-awesome-4.3.0/less/mixins.less"; +@import "../../../../../Downloads/font-awesome-4.3.0/less/path.less"; +@import "../../../../../Downloads/font-awesome-4.3.0/less/core.less"; +@import "../../../../../Downloads/font-awesome-4.3.0/less/larger.less"; +@import "../../../../../Downloads/font-awesome-4.3.0/less/fixed-width.less"; +@import "../../../../../Downloads/font-awesome-4.3.0/less/list.less"; +@import "../../../../../Downloads/font-awesome-4.3.0/less/bordered-pulled.less"; +@import "../../../../../Downloads/font-awesome-4.3.0/less/animated.less"; +@import "../../../../../Downloads/font-awesome-4.3.0/less/rotated-flipped.less"; +@import "../../../../../Downloads/font-awesome-4.3.0/less/stacked.less"; +@import "../../../../../Downloads/font-awesome-4.3.0/less/icons.less"; diff --git a/public/css/main.less b/public/css/main.less index 9885b31d57..09b335e303 100644 --- a/public/css/main.less +++ b/public/css/main.less @@ -3,8 +3,8 @@ @import "lib/ionicons/ionicons"; @import "lib/animate.min.less"; @import "lib/bootstrap/variables"; +@import "lib/font-awesome.less"; -//fonts.googleapis.com/css?family=Lato:300); @import url(http://fonts.googleapis.com/css?family=Lato:400); @import url(http://fonts.googleapis.com/css?family=Inconsolata); diff --git a/public/fonts/FontAwesome.otf b/public/fonts/FontAwesome.otf new file mode 100644 index 0000000000..f7936cc1e7 Binary files /dev/null and b/public/fonts/FontAwesome.otf differ diff --git a/public/fonts/fontawesome-webfont.eot b/public/fonts/fontawesome-webfont.eot index 84677bc0c5..33b2bb8005 100644 Binary files a/public/fonts/fontawesome-webfont.eot and b/public/fonts/fontawesome-webfont.eot differ diff --git a/public/fonts/fontawesome-webfont.svg b/public/fonts/fontawesome-webfont.svg new file mode 100644 index 0000000000..1ee89d4368 --- /dev/null +++ b/public/fonts/fontawesome-webfont.svg @@ -0,0 +1,565 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/fonts/fontawesome-webfont.ttf b/public/fonts/fontawesome-webfont.ttf new file mode 100644 index 0000000000..ed9372f8ea Binary files /dev/null and b/public/fonts/fontawesome-webfont.ttf differ diff --git a/public/fonts/fontawesome-webfont.woff b/public/fonts/fontawesome-webfont.woff new file mode 100644 index 0000000000..8b280b98fa Binary files /dev/null and b/public/fonts/fontawesome-webfont.woff differ diff --git a/public/fonts/fontawesome-webfont.woff2 b/public/fonts/fontawesome-webfont.woff2 new file mode 100644 index 0000000000..3311d58514 Binary files /dev/null and b/public/fonts/fontawesome-webfont.woff2 differ diff --git a/views/partials/universal-head.jade b/views/partials/universal-head.jade index a0d0fe2618..8534eb7cd8 100644 --- a/views/partials/universal-head.jade +++ b/views/partials/universal-head.jade @@ -1,8 +1,6 @@ script(async src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js") script(async src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.11/angular.min.js") script(async src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.12.0/ui-bootstrap-tpls.min.js") -link(async rel='stylesheet', href='//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css') -link(async rel='stylesheet', href='//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css') include meta title #{title} | Free Code Camp meta(charset='utf-8')