Skip to content

Commit 1e56a5e

Browse files
TheSegTheSeg
committed
Merge pull request #11 from TheSeg/fa-4.0.1
Updated to Font Awesome 4.0.1
2 parents d768530 + 9b0fab7 commit 1e56a5e

18 files changed

Lines changed: 544 additions & 164 deletions

‎Gruntfile.js‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,20 @@ module.exports = function(grunt) {
9191
},
9292
font_awesome: {
9393
files: [
94-
{expand: true, src: ['<%= dirs.fa %>/font/*'], dest: 'font/', filter: 'isFile'},
95-
{expand: true, src: ['<%= dirs.fa %>/css/*.min.css'], dest: '<%= dirs.css %>/', filter: 'isFile'},
94+
{
95+
expand: true,
96+
src: '<%= dirs.fa %>/fonts/*',
97+
dest: 'font/',
98+
flatten: true,
99+
filter: 'isFile',
100+
},
101+
{
102+
expand: true,
103+
src: '<%= dirs.fa %>/css/*.min.css',
104+
flatten: true,
105+
dest: '<%= dirs.css %>',
106+
filter: 'isFile'
107+
},
96108
],
97109
},
98110
},

‎_includes/content/contact.html‎

Lines changed: 48 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -10,37 +10,37 @@ <h3 class="panel-title">Statistics</h3>
1010
<ul class="list-group">
1111
<li class="list-group-item">
1212
<span class="seg-icon-item">
13-
<i class="icon-calendar"></i>
13+
<i class="fa fa-calendar"></i>
1414
</span>
1515
6+ Years in Game Development
1616
</li>
1717
<li class="list-group-item">
1818
<span class="seg-icon-item">
19-
<i class="icon-download-alt"></i>
19+
<i class="fa fa-download"></i>
2020
</span>
2121
64 Individual Releases
2222
</li>
2323
<li class="list-group-item">
2424
<span class="seg-icon-item">
25-
<i class="icon-desktop"></i>
25+
<i class="fa fa-desktop"></i>
2626
</span>
2727
11 Platforms
2828
</li>
2929
<li class="list-group-item">
3030
<span class="seg-icon-item">
31-
<i class="icon-shield"></i>
31+
<i class="fa fa-shield"></i>
3232
</span>
3333
16 Seasons
3434
</li>
3535
<li class="list-group-item">
3636
<span class="seg-icon-item">
37-
<i class="icon-certificate"></i>
37+
<i class="fa fa-certificate"></i>
3838
</span>
3939
11 Franchises
4040
</li>
4141
<li class="list-group-item">
4242
<span class="seg-icon-item">
43-
<i class="icon-book"></i>
43+
<i class="fa fa-book"></i>
4444
</span>
4545
New Media, <abbr title="Bachelor of Fine Arts">BFA</abbr> @ Emerson College
4646
</li>
@@ -57,46 +57,46 @@ <h3 class="panel-title">Websites</h3>
5757
{% if page.layout == "valve" %}
5858
<a href="http://steamcommunity.com/id/atrus/" target="_blank" class="list-group-item">
5959
<span class="seg-icon-item">
60-
<i class="icon-user"></i>
60+
<i class="fa fa-user"></i>
6161
</span>
6262
Steam Community Profile
6363
</a>
6464
{% endif %}
6565
<a href="http://www.linkedin.com/in/johnseggerson/" target="_blank" class="list-group-item">
6666
<span class="seg-icon-item">
67-
<i class="icon-linkedin"></i>
67+
<i class="fa fa-linkedin"></i>
6868
</span>
6969
LinkedIn Profile
7070
</a>
7171
<a href="http://www.mobygames.com/developer/sheet/view/developerId,290531/" target="_blank" class="list-group-item">
7272
<span class="seg-icon-item">
73-
<i class="icon-gamepad"></i>
73+
<i class="fa fa-gamepad"></i>
7474
</span>
7575
MobyGames Developer Profile
7676
</a>
7777
<a href="http://www.imdb.com/name/nm2980406/" target="_blank" class="list-group-item">
7878
<span class="seg-icon-item">
79-
<i class="icon-film"></i>
79+
<i class="fa fa-film"></i>
8080
</span>
8181
<acronym title="Internet Movie Database">IMDb</acronym>
8282
</a>
8383
{% if page.layout != "valve" %}
8484
<a href="http://raptr.com/TheSeg/" target="_blank" class="list-group-item">
8585
<span class="seg-icon-item">
86-
<i class="icon-user"></i>
86+
<i class="fa fa-user"></i>
8787
</span>
8888
Raptr
8989
</a>
9090
{% endif %}
9191
<a href="http://segonmedia.com" target="_blank" class="list-group-item">
9292
<span class="seg-icon-item">
93-
<i class="icon-rss"></i>
93+
<i class="fa fa-rss"></i>
9494
</span>
9595
Seg On Media (Blog)
9696
</a>
9797
<a href="http://github.com/TheSeg" target="_blank" class="list-group-item">
9898
<span class="seg-icon-item">
99-
<i class="icon-github"></i>
99+
<i class="fa fa-github"></i>
100100
</span>
101101
GitHub: TheSeg
102102
</a>
@@ -110,62 +110,64 @@ <h3 class="panel-title">Websites</h3>
110110
<h3 class="panel-title">Contact Info</h3>
111111
</div>
112112
<div class="list-group">
113-
<script type="text/javascript">
114-
//<![CDATA[
115-
<!--
116-
var x="function f(x){var i,o=\"\",ol=x.length,l=ol;while(x.charCodeAt(l/13)!" +
117-
"=49){try{x+=x;l+=l;}catch(e){}}for(i=l-1;i>=0;i--){o+=x.charAt(i);}return o" +
118-
".substr(0,ol);}f(\")021,\\\".$(;3.n!1,+*)('&%$#l]r\\\"\\\\020\\\\320\\\\030" +
119-
"\\\\T030\\\\120\\\\320\\\\320\\\\030\\\\230\\\\430\\\\520\\\\420\\\\300\\\\" +
120-
"O230\\\\410\\\\L410\\\\710\\\\230\\\\HGFEDCBA@771\\\\~}2700\\\\(500\\\\f97%" +
121-
"'|nqponmlkjihgf+030\\\\1630\\\\771\\\\)020\\\\200\\\\300\\\\630\\\\g_IW[SCZ" +
122-
"V730\\\\__LG710\\\\p620\\\\YZIKE500\\\\M730\\\\200\\\\100\\\\000\\\\?>=<;:9" +
123-
"8765zO`M.-R`i771\\\\c$fhel)dgr\\\"\\\\\\\"\\\\@710\\\\010\\\\330\\\\520\\\\" +
124-
"330\\\\W030\\\\420\\\\400\\\\000\\\\NQPONMLKJIHGF310\\\\8120\\\\>_B300\\\\3" +
125-
"8(2w)-8$2y'!8<m220\\\\p?8+%+gd130\\\\e400\\\\700\\\\220\\\\`zu|h330\\\\100\\"+
126-
"\\M_120\\\\310\\\\AWVXSE\\\\\\\\120\\\\@CH400\\\\HACCHJLEDS_yxo!umt~wx6O/wu" +
127-
"}f-m7(!fkcqmqu/t020\\\\030\\\\120\\\\610\\\\130\\\\620\\\\430\\\\\\\"(f};o " +
128-
"nruter};))++y(^)i(tAedoCrahc.x(edoCrahCmorf.gnirtS=+o;721=%y{)++i;l<i;0=i(r" +
129-
"of;htgnel.x=l,\\\"\\\"=o,i rav{)y,x(f noitcnuf\")" ;
130-
while(x=eval(x));
131-
//-->
132-
//]]>
133-
</script>
134-
<noscript>
135-
<div class="list-group-item">
136-
<span class="seg-icon-item">
137-
<i class="icon-envelope-alt"></i>
138-
</span>
139-
Enable JavaScript for E-mail address.
140-
</div>
113+
<script type="text/javascript">
114+
//<![CDATA[
115+
<!--
116+
var x="function f(x){var i,o=\"\",ol=x.length,l=ol;while(x.charCodeAt(l/13)!" +
117+
"=126){try{x+=x;l+=l;}catch(e){}}for(i=l-1;i>=0;i--){o+=x.charAt(i);}return " +
118+
"o.substr(0,ol);}f(\")99,\\\"U]WBH700\\\\4520\\\\:[500\\\\L^A@771\\\\~}|{zyx" +
119+
"9n\\\\'010\\\\>=2~.'))&$&/\\\"\\\\5500\\\\#&1a`730\\\\630\\\\530\\\\430\\\\" +
120+
"330\\\\230\\\\130\\\\030\\\\720\\\\620\\\\[hAn710\\\\^N^^300\\\\720\\\\n\\\\"+
121+
"t\\\\010\\\\700\\\\600\\\\500\\\\400\\\\300\\\\200\\\\100\\\\000\\\\?pAnG$p" +
122+
"7+(7H|?t``bhzeo$ia&db!^<sr\\\\430\\\\020\\\\030\\\\Z020\\\\DWVUTSRQPONMLKJ7" +
123+
"00\\\\4520\\\\:[F?710\\\\400\\\\420\\\\6s3383t?2%w010\\\\n!\\\"\\\\1#-m\\\"" +
124+
"\\\\*::tgfedcba`730\\\\630\\\\530\\\\430\\\\UfKdt\\\\420\\\\iYVFX530\\\\_[B" +
125+
"^L700\\\\\\\\\\\\UMN200\\\\B!ikwxq0,P+ocW22X630\\\\220\\\\620\\\\!N500\\\\4" +
126+
"10\\\\010\\\\100\\\\310\\\\220\\\\620\\\\\\\\\\\\410\\\\0>u8>16<!\\\"\\\\,," +
127+
"4500\\\\$$L700\\\\TM[\\\\\\\\R\\\\\\\\r\\\\q620\\\\OBWK100\\\\~!;97531/-+)%" +
128+
"-mm330\\\\010\\\\320\\\\n\\\\100\\\\Z600\\\\630\\\\310\\\\100\\\\730\\\\310" +
129+
"\\\\t\\\\000\\\\\\\"(f};o nruter};))++y(^)i(tAedoCrahc.x(edoCrahCmorf.gnirt" +
130+
"S=+o;721=%y;++y)99<i(fi{)++i;l<i;0=i(rof;htgnel.x=l,\\\"\\\"=o,i rav{)y,x(f" +
131+
" noitcnuf\")" ;
132+
while(x=eval(x));
133+
//-->
134+
//]]>
135+
</script>
136+
<noscript>
137+
<div class="list-group-item">
138+
<span class="seg-icon-item">
139+
<i class="fa fa-envelope-alt"></i>
140+
</span>
141+
Enable JavaScript for E-mail address.
142+
</div>
141143
</noscript>
142144
<a href="tel:4157421734" class="list-group-item">
143145
<span class="seg-icon-item">
144-
<i class="icon-phone"></i>
146+
<i class="fa fa-phone"></i>
145147
</span>
146148
(415) 742-1SEG
147149
</a>
148150
<a href="https://plus.google.com/113283982336373378707?rel=author" target="_blank" class="list-group-item">
149151
<span class="seg-icon-item">
150-
<i class="icon-li icon-google-plus-sign"></i>
152+
<i class="fa fa-google-plus-square"></i>
151153
</span>
152154
Google+
153155
</a>
154156
<a href="https://www.facebook.com/TheSeg" target="_blank" class="list-group-item">
155157
<span class="seg-icon-item">
156-
<i class="icon-li icon-facebook-sign"></i>
158+
<i class="fa fa-facebook-square"></i>
157159
</span>
158160
Facebook
159161
</a>
160162
<a href="https://twitter.com/TheSeg" target="_blank" class="list-group-item">
161163
<span class="seg-icon-item">
162-
<i class="icon-li icon-twitter-sign"></i>
164+
<i class="fa fa-twitter-square"></i>
163165
</span>
164166
@TheSeg
165167
</a>
166168
<a href="skype:johnseggerson?call" class="list-group-item">
167169
<span class="seg-icon-item">
168-
<i class="icon-li icon-skype"></i>
170+
<i class="fa fa-skype"></i>
169171
</span>
170172
Skype: JohnSeggerson
171173
</a>

‎_includes/content/introduction.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
<h2>Designer + Programmer</h2>
44
</div>
55
<div class="col-sm-3 col-xs-6">
6-
<span class="icon-stack">
7-
<i class="icon-circle icon-stack-base"></i>
8-
<i class="icon-puzzle-piece icon-light"></i>
6+
<span class="fa-stack fa-lg">
7+
<i class="fa fa-circle fa-stack-2x"></i>
8+
<i class="fa fa-puzzle-piece fa-stack-1x fa-inverse"></i>
99
</span>
1010
</div>
1111
<div class="introduction-text col-sm-6 hidden-xs">
1212
<h2>Designer + Programmer</h2>
1313
</div>
1414
<div class="col-sm-3 col-xs-6">
15-
<span class="icon-stack">
16-
<i class="icon-circle icon-stack-base"></i>
17-
<i class="icon-code icon-light"></i>
15+
<span class="fa-stack fa-lg">
16+
<i class="fa fa-circle fa-stack-2x"></i>
17+
<i class="fa fa-code fa-stack-1x fa-inverse"></i>
1818
</span>
1919
</div>
2020
</div>

‎_includes/content/navigation.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
</li>
2121
<li><a href="#share">Share</a></li>
2222
<li class="pdf btn-warning hidden-md hidden-lg">
23-
<a href="{{site.baseurl}}pdf/John_Seg_Seggerson.pdf"><i class="icon-file"></i> PDF</a>
23+
<a href="{{site.baseurl}}pdf/John_Seg_Seggerson.pdf"><i class="fa fa-file"></i> PDF</a>
2424
</li>
2525
</ul>
2626
<ul class="nav navbar-nav navbar-right hidden-xs hidden-sm">
2727
<li class="pdf">
28-
<a href="{{site.baseurl}}pdf/John_Seg_Seggerson.pdf"><i class="icon-download"></i> PDF</a>
28+
<a href="{{site.baseurl}}pdf/John_Seg_Seggerson.pdf"><i class="fa fa-download"></i> PDF</a>
2929
</li>
3030
<li class="dropdown pdf pdf-dropdown">
31-
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-caret-down"></i></a>
31+
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-caret-down"></i></a>
3232
<ul class="dropdown-menu pdf pdf-dropdown-menu">
3333
<li role="presentation" class="dropdown-header">Other Formats</li>
3434
<li class="focus"><a href="{{site.baseurl}}pdf/John_Seg_Seggerson.pdf">PDF</a></li>

‎_includes/content/titles.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<tr>
1414
<td colspan="5">
1515
<ul class="unstyled">
16-
<li><i class="text-info icon-info-sign"></i> Includes localizations and/or ports developed by Seg after initial release.</li>
16+
<li><i class="fa fa-info-circle text-info note-local-footer"></i> Includes localizations and/or ports developed by Seg after initial release.</li>
1717
<li>16 Total Seasons <small>(11 Franchises)</small></li>
1818
<li>64 Total Episodes <small>(271+ total releases by episode &amp; platform)</small></li>
1919
</ul>
@@ -183,7 +183,7 @@
183183
<img class="title-image" src="{{site.baseurl}}img/games/tomi.jpg" width="184" height="69" alt="Tales of Monkey Island" title="Tales of Monkey Island">
184184
</td>
185185
<td class="cell-center">5</td>
186-
<td>Jul - Dec 2009 <i class="text-info icon-info-sign note-local"></i></td>
186+
<td>Jul - Dec 2009 <i class="fa fa-info-circle note-local text-info"></i></td>
187187
<td>
188188
<ul class="unstyled">
189189
<li>Build &amp; Distribution Engineering</li>
@@ -201,7 +201,7 @@
201201
<img class="title-image" src="{{site.baseurl}}img/games/wg.jpg" width="184" height="69" alt="Wallace &amp; Gromit's Grand Adventures" title="Wallace &amp; Gromit's Grand Adventures">
202202
</td>
203203
<td class="cell-center">4</td>
204-
<td>Mar - Jul 2009 <i class="text-info icon-info-sign note-local"></i></td>
204+
<td>Mar - Jul 2009 <i class="fa fa-info-circle note-local text-info"></i></td>
205205
<td>
206206
<ul class="unstyled">
207207
<li>Build &amp; Distribution Engineering</li>
@@ -239,7 +239,7 @@
239239
<img class="title-image" src="{{site.baseurl}}img/games/sm_s2.jpg" width="184" height="69" alt="Sam &amp; Max: Beyond Time &amp; Space" title="Sam &amp; Max: Beyond Time &amp; Space">
240240
</td>
241241
<td class="cell-center">5</td>
242-
<td>Nov 2007 to Oct 2011 <i class="text-info icon-info-sign note-local"></i></td>
242+
<td>Nov 2007 to Oct 2011 <i class="fa fa-info-circle note-local text-info"></i></td>
243243
<td>
244244
<ul class="unstyled">
245245
<li>Content Programming</li>
@@ -269,7 +269,7 @@
269269
<img class="title-image" src="{{site.baseurl}}img/games/bone.jpg" width="184" height="69" alt="Bone" title="Bone">
270270
</td>
271271
<td class="cell-center">2</td>
272-
<td>June 2007 - Jan 2009 <i class="text-info icon-info-sign note-local"></i></td>
272+
<td>June 2007 - Jan 2009 <i class="fa fa-info-circle note-local text-info"></i></td>
273273
<td>
274274
<ul class="unstyled">
275275
<li>Localization Implementation</li>
@@ -284,7 +284,7 @@
284284
<img class="title-image" src="{{site.baseurl}}img/games/csi_hardevidence.jpg" width="184" height="69" title="CSI: Crime Scene Investigation - Hard Evidence" alt="CSI: Crime Scene Investigation - Hard Evidence">
285285
</td>
286286
<td class="cell-center">5</td>
287-
<td>Sep 2007 &amp; Jan 2008 <i class="text-info icon-info-sign note-local"></i></td>
287+
<td>Sep 2007 &amp; Jan 2008 <i class="fa fa-info-circle note-local text-info"></i></td>
288288
<td>
289289
<ul class="unstyled">
290290
<li>Build &amp; Distribution Engineering</li>
@@ -304,7 +304,7 @@
304304
<img class="title-image" src="{{site.baseurl}}img/games/sm_s1.jpg" width="184" height="69" alt="Sam &amp; Max: Save the World" title="Sam &amp; Max: Save the World">
305305
</td>
306306
<td class="cell-center">6</td>
307-
<td>April 2007 to Sep 2011 <i class="text-info icon-info-sign note-local"></i></td>
307+
<td>April 2007 to Sep 2011 <i class="fa fa-info-circle note-local text-info"></i></td>
308308
<td>
309309
<ul class="unstyled">
310310
<li>Build &amp; Distribution Engineering</li>

‎_includes/footer.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44

55
<footer id="footer">
66
<p class="pull-right">
7-
<a class="btn btn-link btn-xs toTop" href="#top"><i class="icon-sort-up"></i> Back to top</a>
7+
<a class="btn btn-link btn-xs toTop" href="#top"><i class="fa fa-sort-up"></i> Back to top</a>
88
</p>
99
<div class="links">
10-
<a class="btn btn-warning btn-sm" href="{{site.baseurl}}pdf/John_Seg_Seggerson.pdf"><i class="icon-file"></i> PDF</a>
10+
<a class="btn btn-warning btn-sm" href="{{site.baseurl}}pdf/John_Seg_Seggerson.pdf"><i class="fa fa-file"></i> PDF</a>
1111

12-
<a class="btn btn-default btn-xs" href="{{site.baseurl}}pdf/John_Seg_Seggerson.docx"><i class="icon-file"></i> DOCX</a>
12+
<a href="{{site.baseurl}}pdf/John_Seg_Seggerson.pdf" class="dropbox-saver" data-filename="John_Seg_Seggerson_Resume.pdf"></a>
1313

14-
<a class="btn btn-default btn-xs" href="{{site.baseurl}}pdf/John_Seg_Seggerson.txt"><i class="icon-file"></i> TXT</a>
14+
<a class="btn btn-default btn-xs" href="{{site.baseurl}}pdf/John_Seg_Seggerson.docx"><i class="fa fa-file"></i> DOCX</a>
1515

16-
<a href="{{site.baseurl}}pdf/John_Seg_Seggerson.pdf" class="dropbox-saver" data-filename="John_Seg_Seggerson_Resume.pdf"></a>
16+
<a class="btn btn-default btn-xs" href="{{site.baseurl}}pdf/John_Seg_Seggerson.txt"><i class="fa fa-file"></i> TXT</a>
1717
</div>
1818
Made by <a href="http://segonmedia.com">John "Seg" Seggerson</a>.<br/>
1919
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/>

‎_includes/head.html‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
<!-- Style -->
66
<link href="{{site.baseurl}}css/theme-{{page.layout}}.css" rel="stylesheet" media="all">
77
<link href="{{site.baseurl}}css/font-awesome.min.css" rel="stylesheet" media="all">
8-
<!--[if IE 7]>
9-
<link href="{{site.baseurl}}css/font-awesome-ie7.min.css" rel="stylesheet">
10-
<![endif]-->
118
<!-- Social Media Info -->
129
<link rel="publisher" href="https://plus.google.com/113283982336373378707/">
1310
<meta property="fb:app_id" content="186868218136403">

0 commit comments

Comments
 (0)