fixed 404ing font

OSUOSC · Jan 11, 2016 · b8e9e94 · b8e9e94
1 parent 283ba36
commit b8e9e94
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 13 deletions.
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
@@ -245,15 +245,35 @@ module.exports = (grunt) ->
           dest: '_site/vendor/css/'
         } ]
 
-      fonts:
+      opensans:
         files: [ {
           stdout: false
           expand: true
           filter: 'isFile'
-          flatten: true
-          cwd: 'bower_components/'
+          cwd: 'bower_components/open-sans-fontface/'
           src: [ '**/*.woff', '**/*.woff2', '**/*.ttf' ]
-          dest: '_site/vendor/fonts/'
+          dest: '_site/vendor/css/'
+        } ]
+
+      fontawesome:
+        files: [ {
+          stdout: false
+          expand: true
+          filter: 'isFile'
+          flatten: true
+          cwd: 'bower_components/font-awesome/'
+          src: [ '**/*.woff', '**/*.svg','**/*.otf', '**/*.eot', '**/*.woff2', '**/*.ttf' ]
+          dest: '_site/vendor/fonts'
+        } ]
+
+      ubuntu:
+        files: [ {
+          stdout: false
+          expand: true
+          filter: 'isFile'
+          cwd: 'bower_components/ubuntu-fontface/'
+          src: [ '**/*.woff', '**/*.svg','**/*.otf', '**/*.eot', '**/*.woff2', '**/*.ttf' ]
+          dest: '_site/vendor/css/'
         } ]
 
 

diff --git a/_includes/jade/core/scripts.jade b/_includes/jade/core/scripts.jade
@@ -5,6 +5,7 @@
 script(src='{{ site.baseurl }}/vendor/js/jekyll-search.min.js', type='text/javascript')
 
 link(rel='stylesheet', href='{{ site.baseurl }}/vendor/css/normalize.min.css')
+link(rel='stylesheet', href='{{ site.baseurl }}/vendor/css/ubuntu.min.css')
 link(rel='stylesheet', href='{{ site.baseurl }}/vendor/css/open-sans.min.css')
 link(rel='stylesheet', href='{{ site.baseurl }}/vendor/css/font-awesome.min.css')
 
@@ -13,6 +14,7 @@ link(rel='stylesheet', href='{{ site.baseurl }}/vendor/css/font-awesome.min.css'
 script(src='{{ site.baseurl }}/vendor/js/jekyll-search.min.js', type='text/javascript')
 
 link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/normalize/3.0.3/normalize.min.css')
+link(rel='stylesheet', href='https://cdn.rawgit.com/egladman/ubuntu-fontface/master/ubuntu.min.css')
 link(rel='stylesheet', href='https://cdn.rawgit.com/egladman/open-sans/master/css/open-sans.min.css')
 link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.4.0/css/font-awesome.min.css')
 {% endif %}
diff --git a/_includes/jade/index/landing.jade b/_includes/jade/index/landing.jade
@@ -1,5 +1,3 @@
-{% capture baseurl_size %}{{ site.baseurl | size }}{% endcapture %}
-
 .landing
   a(href='//github.com/OSUOSC/open-source-club-website')
     .github-ribbon Fork us on Github
@@ -14,10 +12,3 @@
       h4.landing-heading Open Source Club
       h5.landing-heading at The Ohio State University
 
-{% if baseurl_size == 0 %}
-// if running the site locally use local fonts
-link(rel='stylesheet', href='{{ site.baseurl }}/vendor/css/ubuntu.min.css')
-{% else %}
-// if deploying to github pages use cdn
-link(rel='stylesheet', href='https://cdn.rawgit.com/egladman/ubuntu-fontface/master/ubuntu.min.css')
-{% endif %}