Merge branch 'release/v2.2.1'

Author: TheSeg

Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    activesupport (4.1.0)
+    activesupport (4.1.1)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -17,12 +17,12 @@ GEM
     fast-stemmer (1.0.2)
     ffi (1.9.3)
     gemoji (1.5.0)
-    github-pages (18)
+    github-pages (19)
       RedCloth (= 4.2.9)
       jekyll (= 1.5.1)
       jekyll-mentions (= 0.0.6)
       jekyll-redirect-from (= 0.3.1)
-      jekyll-sitemap (= 0.2.0)
+      jekyll-sitemap (= 0.3.0)
       jemoji (= 0.1.0)
       kramdown (= 1.3.1)
       liquid (= 2.5.5)
@@ -50,7 +50,7 @@ GEM
       jekyll (~> 1.4)
     jekyll-redirect-from (0.3.1)
       jekyll (~> 1.4)
-    jekyll-sitemap (0.2.0)
+    jekyll-sitemap (0.3.0)
       jekyll (~> 1.4)
     jemoji (0.1.0)
       gemoji (~> 1.5.0)
@@ -64,10 +64,10 @@ GEM
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
     maruku (0.7.0)
-    mini_portile (0.5.3)
-    minitest (5.3.3)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
+    mini_portile (0.6.0)
+    minitest (5.3.4)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
     parslet (1.5.0)
       blankslate (~> 2.0)
     posix-spawn (0.3.8)

_includes/content/contact.html

@@ -40,7 +40,7 @@ <h3 class="panel-title">Statistics</h3>
           </li>
           <li class="list-group-item">
             <span class="seg-icon-item">
-              <i class="fa fa-book"></i>
+              <i class="fa fa-university"></i>
             </span>
             New Media, <abbr title="Bachelor of Fine Arts">BFA</abbr> @ Emerson College
           </li>

_includes/content/navigation.html

@@ -25,14 +25,14 @@
         </ul>
         <ul class="nav navbar-nav navbar-right hidden-xs hidden-sm">
             <li class="pdf">
-                <a href="{{site.baseurl}}pdf/John_Seg_Seggerson.pdf"><i class="fa fa-download"></i> PDF</a>
+                <a href="{{site.baseurl}}pdf/John_Seg_Seggerson.pdf"><i class="fa fa-file-pdf-o"></i> PDF</a>
             </li>
             <li class="dropdown pdf pdf-dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-caret-down"></i></a>
                 <ul class="dropdown-menu pdf pdf-dropdown-menu">
                     <li role="presentation" class="dropdown-header">Other Formats</li>
-                    <li class="focus"><a href="{{site.baseurl}}pdf/John_Seg_Seggerson.pdf">PDF</a></li>
-                    <li><a href="{{site.baseurl}}pdf/John_Seg_Seggerson.txt">TEXT</a></li>
+                    <li class="focus"><a href="{{site.baseurl}}pdf/John_Seg_Seggerson.pdf"><i class="fa fa-file-pdf-o"></i> PDF</a></li>
+                    <li><a href="{{site.baseurl}}pdf/John_Seg_Seggerson.txt"><i class="fa fa-file-text-o"></i> TEXT</a></li>
                 </ul>
             </li>
         </ul>

_includes/content/skills.html

@@ -9,11 +9,12 @@
             <li>Unity</li>
             <li>JavaScript</li>
             <li>PHP</li>
-            <li>Ruby (Ruby on Rails)</li>
             <li>ColdFusion</li>
+            <li>Ruby (Ruby on Rails)</li>
             <li>ActionScript</li>
             <li>HTML5</li>
             <li>CSS</li>
+            <li>Parse</li>
           </ul>
         </li>
         <li>Development and build submissions to the following platforms:

_includes/footer.html

@@ -7,11 +7,11 @@
     <a class="btn btn-link btn-xs toTop" href="#top"><i class="fa fa-sort-up"></i> Back to top</a>
   </p>
   <div class="links">
-    <a class="btn btn-warning btn-sm" href="{{site.baseurl}}pdf/John_Seg_Seggerson.pdf"><i class="fa fa-file"></i> PDF</a>
+    <a class="btn btn-warning btn-sm" href="{{site.baseurl}}pdf/John_Seg_Seggerson.pdf"><i class="fa fa-file-pdf-o"></i> PDF</a>
 
     <a href="{{site.baseurl}}pdf/John_Seg_Seggerson.pdf" class="dropbox-saver" data-filename="John_Seg_Seggerson_Resume.pdf"></a>
 
-    <a class="btn btn-default btn-xs" href="{{site.baseurl}}pdf/John_Seg_Seggerson.txt"><i class="fa fa-file"></i> TXT</a>
+    <a class="btn btn-default btn-xs" href="{{site.baseurl}}pdf/John_Seg_Seggerson.txt"><i class="fa fa-file-text-o"></i> TXT</a>
   </div>
   Made by <a href="http://segonmedia.com">John "Seg" Seggerson</a>.<br/>
   Licensed under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Attribution-ShareAlike 3.0 Unported <small>(CC BY-SA 3.0)</small></a> unless otherwise noted.<br/>

_less/font-awesome.less

@@ -1,13 +1,13 @@
 /*!
- *  Font Awesome 4.0.3 by @davegandy - http://fontawesome.io - @fontawesome
+ *  Font Awesome 4.1.0 by @davegandy - http://fontawesome.io - @fontawesome
  *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
  */
 
 @import "variables";
 
 // Fix for Seg's Resume
 //@fa-font-path:        "../font";
-@fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.0.3/fonts"; // for referencing Bootstrap CDN font files directly
+@fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.1.0/fonts"; // for referencing Bootstrap CDN font files directly
 
 @import "mixins";
 @import "path";

bower.json

@@ -10,7 +10,7 @@
     },
     "dependencies": {
         "jquery": "~2.1.0",
-        "font-awesome": "~= 4.0.3",
+        "font-awesome": "~4.1.0",
         "holderjs": "^2.3.2",
         "html5shiv": "^3.7.0",
         "bootstrap": "^3.1.1",