Skip to content

Commit cbf896d

Browse files
jacobtfisherjacobtfisher
committed
updated fontawesome
1 parent 7a14977 commit cbf896d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+9084
-2307
lines changed

‎_config.yml

+1
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ author:
8787
employer :
8888
googlescholar : "http://yourfullgooglescholarurl.com"
8989
email :
90+
researchgate : "https://www.researchgate.net/profile/yourprofile"
9091
uri :
9192
bitbucket :
9293
codepen :

‎_includes/author-profile.html

+29-26
Original file line numberDiff line numberDiff line change
@@ -29,86 +29,89 @@ <h3 class="author__name">{{ author.name }}</h3>
2929
<li><i class="fa fa-fw fa-map-marker" aria-hidden="true"></i> {{ author.employer }}</li>
3030
{% endif %}
3131
{% if author.uri %}
32-
<li><a href="{{ author.uri }}"><i class="fa fa-fw fa-chain" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].website_label | default: "Website" }}</a></li>
32+
<li><a href="{{ author.uri }}"><i class="fas fa-link" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].website_label | default: "Website" }}</a></li>
3333
{% endif %}
3434
{% if author.email %}
35-
<li><a href="mailto:{{ author.email }}"><i class="fa fa-fw fa-envelope-square" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].email_label | default: "Email" }}</a></li>
35+
<li><a href="mailto:{{ author.email }}"><i class="fas fa-envelope" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].email_label | default: "Email" }}</a></li>
3636
{% endif %}
3737
{% if author.keybase %}
38-
<li><a href="https://keybase.io/{{ author.keybase }}"><i class="fa fa-fw fa-key" aria-hidden="true"></i> Keybase</a></li>
38+
<li><a href="https://keybase.io/{{ author.keybase }}"><i class="fas fa-key" aria-hidden="true"></i> Keybase</a></li>
39+
{% endif %}
40+
{% if author.researchgate %}
41+
<li><a href="https://www.researchgate.net/profile/{{ author.researchgate }}"><i class="fab fa-researchgate" aria-hidden="true"></i> ResearchGate</a></li>
3942
{% endif %}
4043
{% if author.twitter %}
41-
<li><a href="https://twitter.com/{{ author.twitter }}"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
44+
<li><a href="https://twitter.com/{{ author.twitter }}"><i class="fab fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
4245
{% endif %}
4346
{% if author.facebook %}
44-
<li><a href="https://www.facebook.com/{{ author.facebook }}"><i class="fa fa-fw fa-facebook-square" aria-hidden="true"></i> Facebook</a></li>
47+
<li><a href="https://www.facebook.com/{{ author.facebook }}"><i class="fab fa-facebook-square" aria-hidden="true"></i> Facebook</a></li>
4548
{% endif %}
4649
{% if author.google_plus %}
47-
<li><a href="https://plus.google.com/+{{ author.google_plus }}"><i class="fa fa-fw fa-google-plus-square" aria-hidden="true"></i> Google+</a></li>
50+
<li><a href="https://plus.google.com/+{{ author.google_plus }}"><i class="fab fa-google-plus" aria-hidden="true"></i> Google+</a></li>
4851
{% endif %}
4952
{% if author.linkedin %}
50-
<li><a href="https://www.linkedin.com/in/{{ author.linkedin }}"><i class="fa fa-fw fa-linkedin-square" aria-hidden="true"></i> LinkedIn</a></li>
53+
<li><a href="https://www.linkedin.com/in/{{ author.linkedin }}"><i class="fab fa-linkedin" aria-hidden="true"></i> LinkedIn</a></li>
5154
{% endif %}
5255
{% if author.xing %}
53-
<li><a href="https://www.xing.com/profile/{{ author.xing }}"><i class="fa fa-fw fa-xing-square" aria-hidden="true"></i> XING</a></li>
56+
<li><a href="https://www.xing.com/profile/{{ author.xing }}"><i class="fab fa-xing-square" aria-hidden="true"></i> XING</a></li>
5457
{% endif %}
5558
{% if author.instagram %}
56-
<li><a href="https://instagram.com/{{ author.instagram }}"><i class="fa fa-fw fa-instagram" aria-hidden="true"></i> Instagram</a></li>
59+
<li><a href="https://instagram.com/{{ author.instagram }}"><i class="fab fa-instagram" aria-hidden="true"></i> Instagram</a></li>
5760
{% endif %}
5861
{% if author.tumblr %}
59-
<li><a href="https://{{ author.tumblr }}.tumblr.com"><i class="fa fa-fw fa-tumblr-square" aria-hidden="true"></i> Tumblr</a></li>
62+
<li><a href="https://{{ author.tumblr }}.tumblr.com"><i class="fab fa-tumblr-square" aria-hidden="true"></i> Tumblr</a></li>
6063
{% endif %}
6164
{% if author.bitbucket %}
62-
<li><a href="https://bitbucket.org/{{ author.bitbucket }}"><i class="fa fa-fw fa-bitbucket" aria-hidden="true"></i> Bitbucket</a></li>
65+
<li><a href="https://bitbucket.org/{{ author.bitbucket }}"><i class="fab fa-bitbucket" aria-hidden="true"></i> Bitbucket</a></li>
6366
{% endif %}
6467
{% if author.github %}
65-
<li><a href="https://github.com/{{ author.github }}"><i class="fa fa-fw fa-github" aria-hidden="true"></i> Github</a></li>
68+
<li><a href="https://github.com/{{ author.github }}"><i class="fab fa-github" aria-hidden="true"></i> Github</a></li>
6669
{% endif %}
6770
{% if author.stackoverflow %}
68-
<li><a href="https://www.stackoverflow.com/users/{{ author.stackoverflow }}"><i class="fa fa-fw fa-stack-overflow" aria-hidden="true"></i> Stackoverflow</a></li>
71+
<li><a href="https://www.stackoverflow.com/users/{{ author.stackoverflow }}"><i class="fa fab -fw fa-stack-overflow" aria-hidden="true"></i> Stackoverflow</a></li>
6972
{% endif %}
7073
{% if author.lastfm %}
71-
<li><a href="https://lastfm.com/user/{{ author.lastfm }}"><i class="fa fa-fw fa-lastfm-square" aria-hidden="true"></i> Last.fm</a></li>
74+
<li><a href="https://lastfm.com/user/{{ author.lastfm }}"><i class="fab fa-lastfm-square" aria-hidden="true"></i> Last.fm</a></li>
7275
{% endif %}
7376
{% if author.dribbble %}
74-
<li><a href="https://dribbble.com/{{ author.dribbble }}"><i class="fa fa-fw fa-dribbble" aria-hidden="true"></i> Dribbble</a></li>
77+
<li><a href="https://dribbble.com/{{ author.dribbble }}"><i class="fab fa-dribbble-square" aria-hidden="true"></i> Dribbble</a></li>
7578
{% endif %}
7679
{% if author.pinterest %}
77-
<li><a href="https://www.pinterest.com/{{ author.pinterest }}"><i class="fa fa-fw fa-pinterest" aria-hidden="true"></i> Pinterest</a></li>
80+
<li><a href="https://www.pinterest.com/{{ author.pinterest }}"><i class="fab fa-pinterest" aria-hidden="true"></i> Pinterest</a></li>
7881
{% endif %}
7982
{% if author.foursquare %}
80-
<li><a href="https://foursquare.com/{{ author.foursquare }}"><i class="fa fa-fw fa-foursquare" aria-hidden="true"></i> Foursquare</a></li>
83+
<li><a href="https://foursquare.com/{{ author.foursquare }}"><i class="fab fa-foursquare" aria-hidden="true"></i> Foursquare</a></li>
8184
{% endif %}
8285
{% if author.steam %}
83-
<li><a href="https://steamcommunity.com/id/{{ author.steam }}"><i class="fa fa-fw fa-steam-square" aria-hidden="true"></i> Steam</a></li>
86+
<li><a href="https://steamcommunity.com/id/{{ author.steam }}"><i class="fab fa-steam-square" aria-hidden="true"></i> Steam</a></li>
8487
{% endif %}
8588
{% if author.youtube %}
86-
<li><a href="https://www.youtube.com/user/{{ author.youtube }}"><i class="fa fa-fw fa-youtube-square" aria-hidden="true"></i> YouTube</a></li>
89+
<li><a href="https://www.youtube.com/user/{{ author.youtube }}"><i class="fab fa-youtube" aria-hidden="true"></i> YouTube</a></li>
8790
{% endif %}
8891
{% if author.soundcloud %}
8992
<li><a href="https://soundcloud.com/{{ author.soundcloud }}"><i class="fa fa-fw fa-soundcloud" aria-hidden="true"></i> Soundcloud</a></li>
9093
{% endif %}
9194
{% if author.weibo %}
92-
<li><a href="https://www.weibo.com/{{ author.weibo }}"><i class="fa fa-fw fa-weibo" aria-hidden="true"></i> Weibo</a></li>
95+
<li><a href="https://www.weibo.com/{{ author.weibo }}"><i class="fab fa-weibo" aria-hidden="true"></i> Weibo</a></li>
9396
{% endif %}
9497
{% if author.flickr %}
95-
<li><a href="https://www.flickr.com/{{ author.flickr }}"><i class="fa fa-fw fa-flickr" aria-hidden="true"></i> Flickr</a></li>
98+
<li><a href="https://www.flickr.com/{{ author.flickr }}"><i class="fab fa-flickr" aria-hidden="true"></i> Flickr</a></li>
9699
{% endif %}
97100
{% if author.codepen %}
98-
<li><a href="https://codepen.io/{{ author.codepen }}"><i class="fa fa-fw fa-codepen" aria-hidden="true"></i> CodePen</a></li>
101+
<li><a href="https://codepen.io/{{ author.codepen }}"><i class="fab fa-codepen" aria-hidden="true"></i> CodePen</a></li>
99102
{% endif %}
100103
{% if author.vine %}
101-
<li><a href="https://vine.co/u/{{ author.vine }}"><i class="fa fa-fw fa-vine" aria-hidden="true"></i> Vine</a></li>
104+
<li><a href="https://vine.co/u/{{ author.vine }}"><i class="fab fa-vine" aria-hidden="true"></i> Vine</a></li>
102105
{% endif %}
103106
{% if author.googlescholar %}
104-
<li><a href="{{ author.googlescholar }}"><i class="ai ai-google-scholar-square ai-fw"></i> Google Scholar</a></li>
107+
<li><a href="{{ author.googlescholar }}"><i class="fas fa-graduation-cap"></i> Google Scholar</a></li>
105108
{% endif %}
106109
{% if author.orcid %}
107110
<li><a href="{{ author.orcid }}"><i class="ai ai-orcid-square ai-fw"></i> ORCID</a></li>
108111
{% endif %}
109112
{% if author.wikipedia %}
110-
<li><a href="https://en.wikipedia.org/wiki/User:{{ author.wikipedia }}"><i class="fa fa-fw fa-chain" aria-hidden="true"></i> Wikipedia</a></li>
111-
{% endif %}
113+
<li><a href="https://en.wikipedia.org/wiki/User:{{ author.wikipedia }}"><i class="fab fa-wikipedia-w" aria-hidden="true"></i> Wikipedia</a></li>
114+
{% endif %}
112115
</ul>
113116
</div>
114117
</div>

‎_includes/footer.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
<li><strong>{{ site.data.ui-text[site.locale].follow_label }}</strong></li>
77
{% endif %}
88
{% if site.twitter.username %}
9-
<li><a href="https://twitter.com/{{ site.twitter.username }}"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
9+
<li><a href="https://twitter.com/{{ site.twitter.username }}"><i class="fab fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
1010
{% endif %}
1111
{% if site.facebook.username %}
12-
<li><a href="https://facebook.com/{{ site.facebook.username }}"><i class="fa fa-fw fa-facebook-square" aria-hidden="true"></i> Facebook</a></li>
12+
<li><a href="https://facebook.com/{{ site.facebook.username }}"><i class="fab fa-facebook-square" aria-hidden="true"></i> Facebook</a></li>
1313
{% endif %}
1414
{% if site.author.github %}
15-
<li><a href="http://github.com/{{ site.author.github }}"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
15+
<li><a href="http://github.com/{{ site.author.github }}"><i class="fab fa-github" aria-hidden="true"></i> GitHub</a></li>
1616
{% endif %}
1717
{% if site.author.bitbucket %}
18-
<li><a href="http://bitbucket.org/{{ site.author.bitbucket }}"><i class="fa fa-fw fa-bitbucket" aria-hidden="true"></i> Bitbucket</a></li>
18+
<li><a href="http://bitbucket.org/{{ site.author.bitbucket }}"><i class="fab fa-bitbucket" aria-hidden="true"></i> Bitbucket</a></li>
1919
{% endif %}
2020
<li><a href="{% if site.atom_feed.path %}{{ site.atom_feed.path }}{% else %}{{ base_path }}/feed.xml{% endif %}"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].feed_label | default: "Feed" }}</a></li>
2121
</ul>

‎_sass/vendor/font-awesome/_animated.scss

+6-20
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,20 @@
1-
// Spinning Icons
1+
// Animated Icons
22
// --------------------------
33

44
.#{$fa-css-prefix}-spin {
5-
-webkit-animation: fa-spin 2s infinite linear;
6-
animation: fa-spin 2s infinite linear;
5+
animation: fa-spin 2s infinite linear;
76
}
87

98
.#{$fa-css-prefix}-pulse {
10-
-webkit-animation: fa-spin 1s infinite steps(8);
11-
animation: fa-spin 1s infinite steps(8);
12-
}
13-
14-
@-webkit-keyframes fa-spin {
15-
0% {
16-
-webkit-transform: rotate(0deg);
17-
transform: rotate(0deg);
18-
}
19-
100% {
20-
-webkit-transform: rotate(359deg);
21-
transform: rotate(359deg);
22-
}
9+
animation: fa-spin 1s infinite steps(8);
2310
}
2411

2512
@keyframes fa-spin {
2613
0% {
27-
-webkit-transform: rotate(0deg);
28-
transform: rotate(0deg);
14+
transform: rotate(0deg);
2915
}
16+
3017
100% {
31-
-webkit-transform: rotate(359deg);
32-
transform: rotate(359deg);
18+
transform: rotate(360deg);
3319
}
3420
}

‎_sass/vendor/font-awesome/_bordered-pulled.scss

+6-11
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,19 @@
22
// -------------------------
33

44
.#{$fa-css-prefix}-border {
5-
padding: .2em .25em .15em;
65
border: solid .08em $fa-border-color;
76
border-radius: .1em;
7+
padding: .2em .25em .15em;
88
}
99

1010
.#{$fa-css-prefix}-pull-left { float: left; }
1111
.#{$fa-css-prefix}-pull-right { float: right; }
1212

13-
.#{$fa-css-prefix} {
13+
.#{$fa-css-prefix},
14+
.fas,
15+
.far,
16+
.fal,
17+
.fab {
1418
&.#{$fa-css-prefix}-pull-left { margin-right: .3em; }
1519
&.#{$fa-css-prefix}-pull-right { margin-left: .3em; }
1620
}
17-
18-
/* Deprecated as of 4.4.0 */
19-
.pull-right { float: right; }
20-
.pull-left { float: left; }
21-
22-
.#{$fa-css-prefix} {
23-
&.pull-left { margin-right: .3em; }
24-
&.pull-right { margin-left: .3em; }
25-
}

‎_sass/vendor/font-awesome/_core.scss

+14-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
// Base Class Definition
22
// -------------------------
33

4-
.#{$fa-css-prefix} {
5-
display: inline-block;
6-
font: normal normal normal #{$fa-font-size-base}/#{$fa-line-height-base} FontAwesome; // shortening font declaration
7-
font-size: inherit; // can't have font-size inherit on line above, so need to override
8-
text-rendering: auto; // optimizelegibility throws things off #1094
9-
-webkit-font-smoothing: antialiased;
4+
.#{$fa-css-prefix},
5+
.fas,
6+
.far,
7+
.fal,
8+
.fab {
109
-moz-osx-font-smoothing: grayscale;
10+
-webkit-font-smoothing: antialiased;
11+
display: inline-block;
12+
font-style: normal;
13+
font-variant: normal;
14+
text-rendering: auto;
15+
line-height: 1;
16+
}
1117

18+
%fa-icon {
19+
@include fa-icon;
1220
}

‎_sass/vendor/font-awesome/_fixed-width.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Fixed Width Icons
22
// -------------------------
33
.#{$fa-css-prefix}-fw {
4-
width: (18em / 14);
54
text-align: center;
5+
width: $fa-fw-width;
66
}

‎_sass/vendor/font-awesome/_font-awesome.scss

-18
This file was deleted.

0 commit comments

Comments
 (0)