Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixes alshedivat#1952 by updating font awesome version. Also updated icons names
to newest font awesome style.

---------

Signed-off-by: George Araujo <[email protected]>
  • Loading branch information
george-gca authored and wangmagg committed May 14, 2024
1 parent d580e81 commit 38c5dc2
Show file tree
Hide file tree
Showing 31 changed files with 92 additions and 82 deletions.
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ og_image: # The site-wide (default for all links) Open Graph preview image

github_username: wangmagg # your GitHub user name
gitlab_username: # your GitLab user name
twitter_username: # your Twitter handle
x_username: # your X handle
mastodon_username: # your mastodon instance+username in the format instance.tld/@username
linkedin_username: wangmagg # your LinkedIn user name
telegram_username: # your Telegram user name
Expand Down
8 changes: 4 additions & 4 deletions _includes/cv/time_table.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
{% if content.location %}
<tr>
<td>
<p class="location"><i class="fas fa-map-marker-alt iconlocation"></i> {{ content.location }}</p>
<p class="location"><i class="fa-solid fa-location-dot iconlocation"></i> {{ content.location }}</p>
</td>
</tr>
{% endif %}
</tbody>
</table>

</div>
{% endif %}
<div class="col-xs-10 cl-sm-10 col-md-10 mt-2 mt-md-0">
Expand All @@ -32,13 +32,13 @@ <h6 class="title font-weight-bold ml-1 ml-md-4">{{content.title}}</h6>
<tbody>
{% if content.institution %}
<tr>
<td style="vertical-align: top; text-align: center;" class="institution"><i class="fas fa-university iconinstitution"></i></td>
<td style="vertical-align: top; text-align: center;" class="institution"><i class="fa-solid fa-building-columns iconinstitution"></i></td>
<td class="institution">{{content.institution}}</td>
</tr>
{% endif %}
{% if content.department %}
<tr>
<td style="vertical-align: top; text-align: center;" class="department"><i class="far fa-dot-circle icondepartment"></i></td>
<td style="vertical-align: top; text-align: center;" class="department"><i class="fa-regular fa-circle-dot icondepartment"></i></td>
<td class="department">{{content.department}}</td>
</tr>
{% endif %}
Expand Down
4 changes: 2 additions & 2 deletions _includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@
<!-- Toogle theme mode -->
<li class="toggle-container">
<button id="light-toggle" title="Change theme">
<i class="fas fa-moon"></i>
<i class="fas fa-sun"></i>
<i class="fa-solid fa-moon"></i>
<i class="fa-solid fa-sun"></i>
</button>
</li>
{%- endif %}
Expand Down
10 changes: 5 additions & 5 deletions _includes/metadata.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@
{% if page.og_image or site.og_image -%}
<meta name="twitter:image" content="{%- if page.og_image -%}{{ page.og_image }}{%- else -%}{{ site.og_image }}{%- endif -%}" />
{%- endif %}
{% if site.twitter_username -%}
<meta name="twitter:site" content="@{{ site.twitter_username }}" />
<meta name="twitter:creator" content="@{{ site.twitter_username }}" />
{% if site.x_username -%}
<meta name="twitter:site" content="@{{ site.x_username }}" />
<meta name="twitter:creator" content="@{{ site.x_username }}" />
{%- endif %}
{%- endif %}

Expand Down Expand Up @@ -122,8 +122,8 @@
{%- capture link -%}https://www.linkedin.com/in/{{ site.linkedin_username }}{%- endcapture -%}
{%- assign sameaslinks = sameaslinks | push: link -%}
{%- endif -%}
{%- if site.twitter_username -%}
{%- capture link -%}https://twitter.com/{{ site.twitter_username }}{%- endcapture -%}
{%- if site.x_username -%}
{%- capture link -%}https://twitter.com/{{ site.x_username }}{%- endcapture -%}
{%- assign sameaslinks = sameaslinks | push: link -%}
{%- endif -%}
{%- if site.mastodon_username -%}
Expand Down
4 changes: 2 additions & 2 deletions _includes/projects.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ <h2 class="card-title text-lowercase">{{ project.title }}</h2>
{%- if project.github -%}
<div class="github-icon">
<div class="icon" data-toggle="tooltip" title="Code Repository">
<a href="{{ project.github }}"><i class="fab fa-github gh-icon"></i></a>
<a href="{{ project.github }}"><i class="fa-brands fa-github gh-icon"></i></a>
</div>
{%- if project.github_stars -%}
<span class="stars" data-toggle="tooltip" title="GitHub Stars">
<i class="fas fa-star"></i>
<i class="fa-solid fa-star"></i>
<span id="{{ project.github_stars }}-stars"></span>
</span>
{%- endif %}
Expand Down
4 changes: 2 additions & 2 deletions _includes/projects_horizontal.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ <h3 class="card-title text-lowercase">{{ project.title }}</h3>
{%- if project.github -%}
<div class="github-icon">
<div class="icon" data-toggle="tooltip" title="Code Repository">
<a href="{{ project.github }}"><i class="fab fa-github gh-icon"></i></a>
<a href="{{ project.github }}"><i class="fa-brands fa-github gh-icon"></i></a>
</div>
{%- if project.github_stars -%}
<span class="stars" data-toggle="tooltip" title="GitHub Stars">
<i class="fas fa-star"></i>
<i class="fa-solid fa-star"></i>
<span id="{{ project.github_stars }}-stars"></span>
</span>
{%- endif -%}
Expand Down
2 changes: 1 addition & 1 deletion _includes/resume/education.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
{% if content.location %}
<tr>
<td>
<p class="location"><i class="fas fa-map-marker-alt iconlocation"></i> {{ content.location }}</p>
<p class="location"><i class="fa-solid fa-location-dot iconlocation"></i> {{ content.location }}</p>
</td>
</tr>
{% endif %}
Expand Down
58 changes: 29 additions & 29 deletions _includes/social.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{%- if site.email -%}
<a href="mailto:{{ site.email | encode_email }}" title="email"><i class="fas fa-envelope"></i></a>
<a href="mailto:{{ site.email | encode_email }}" title="email"><i class="fa-solid fa-envelope"></i></a>
{% endif %}
{%- if site.telegram_username -%}
<a href="https://telegram.me/{{ site.telegram_username }}" title="telegram"><i class="fab fa-telegram"></i></a>
<a href="https://telegram.me/{{ site.telegram_username }}" title="telegram"><i class="fa-brands fa-telegram"></i></a>
{% endif %}
{%- if site.whatsapp_number -%}
<a href="https://wa.me/{{ site.whatsapp_number }}" title="whatsapp"><i class="fab fa-whatsapp"></i></a>
<a href="https://wa.me/{{ site.whatsapp_number }}" title="whatsapp"><i class="fa-brands fa-whatsapp"></i></a>
{% endif %}
{%- if site.orcid_id -%}
<a href="https://orcid.org/{{ site.orcid_id }}" title="ORCID"><i class="ai ai-orcid"></i></a>
Expand All @@ -32,85 +32,85 @@
<a href="https://www.scopus.com/authid/detail.uri?authorId={{site.scopus_id}}" title="Scopus"><i class="ai ai-scopus"></i></a>
{% endif %}
{%- if site.github_username -%}
<a href="https://github.com/{{ site.github_username }}" title="GitHub"><i class="fab fa-github"></i></a>
<a href="https://github.com/{{ site.github_username }}" title="GitHub"><i class="fa-brands fa-github"></i></a>
{% endif %}
{%- if site.linkedin_username -%}
<a href="https://www.linkedin.com/in/{{ site.linkedin_username }}" title="LinkedIn"><i class="fab fa-linkedin"></i></a>
<a href="https://www.linkedin.com/in/{{ site.linkedin_username }}" title="LinkedIn"><i class="fa-brands fa-linkedin"></i></a>
{% endif %}
{%- if site.twitter_username -%}
<a href="https://twitter.com/{{ site.twitter_username }}" title="Twitter"><i class="fab fa-twitter"></i></a>
{%- if site.x_username -%}
<a href="https://twitter.com/{{ site.x_username }}" title="X"><i class="fa-brands fa-x-twitter"></i></a>
{% endif %}
{%- if site.mastodon_username -%}
<a rel="me" href="https://{{ site.mastodon_username }}" title="Mastodon"><i class="fab fa-mastodon"></i></a>
<a rel="me" href="https://{{ site.mastodon_username }}" title="Mastodon"><i class="fa-brands fa-mastodon"></i></a>
{% endif %}
{%- if site.medium_username -%}
<a href="https://medium.com/@{{ site.medium_username }}" title="Medium"><i class="fab fa-medium"></i></a>
<a href="https://medium.com/@{{ site.medium_username }}" title="Medium"><i class="fa-brands fa-medium"></i></a>
{% endif %}
{%- if site.quora_username -%}
<a href="https://www.quora.com/profile/{{ site.quora_username }}" title="Quora"><i class="fab fa-quora"></i></a>
<a href="https://www.quora.com/profile/{{ site.quora_username }}" title="Quora"><i class="fa-brands fa-quora"></i></a>
{% endif %}
{%- if site.blogger_url -%}
<a href="{{ site.blogger_url }}" title="Blogger"><i class="fab fa-blogger-b"></i></a>
<a href="{{ site.blogger_url }}" title="Blogger"><i class="fa-brands fa-blogger-b"></i></a>
{% endif %}
{%- if site.work_url -%}
<a href="{{ site.work_url }}" title="Work"><i class="fas fa-briefcase"></i></a>
<a href="{{ site.work_url }}" title="Work"><i class="fa-solid fa-briefcase"></i></a>
{% endif %}
{%- if site.wikidata_id -%}
<a href="https://www.wikidata.org/wiki/{{ site.wikidata_id }}" title="Wikidata"><i class="fas fa-barcode"></i></a>
<a href="https://www.wikidata.org/wiki/{{ site.wikidata_id }}" title="Wikidata"><i class="fa-solid fa-barcode"></i></a>
{% endif %}
{%- if site.wikipedia_id -%}
<a href="https://wikipedia.org/wiki/User:{{ site.wikipedia_id }}" title="Wikipedia"><i class="fab fa-wikipedia-w"></i></a>
<a href="https://wikipedia.org/wiki/User:{{ site.wikipedia_id }}" title="Wikipedia"><i class="fa-brands fa-wikipedia-w"></i></a>
{% endif %}
{%- if site.strava_userid -%}
<a href="https://www.strava.com/athletes/{{ site.strava_userid }}" title="Strava"><i class="fab fa-strava"></i></a>
<a href="https://www.strava.com/athletes/{{ site.strava_userid }}" title="Strava"><i class="fa-brands fa-strava"></i></a>
{% endif %}
{%- if site.keybase_username -%}
<a href="https://keybase.io/{{ site.keybase_username }}" title="Keybase"><i class="fab fa-keybase"></i></a>
<a href="https://keybase.io/{{ site.keybase_username }}" title="Keybase"><i class="fa-brands fa-keybase"></i></a>
{% endif %}
{%- if site.gitlab_username -%}
<a href="https://gitlab.com/{{ site.gitlab_username }}" title="GitLab"><i class="fab fa-gitlab"></i></a>
<a href="https://gitlab.com/{{ site.gitlab_username }}" title="GitLab"><i class="fa-brands fa-gitlab"></i></a>
{% endif %}
{%- if site.dblp_url -%}
<a href="{{ site.dblp_url }}" title="DBLP"><i class="ai ai-dblp"></i></a>
{% endif %}
{%- if site.stackoverflow_id -%}
<a href="https://stackoverflow.com/users/{{ site.stackoverflow_id }}" title="Stackoverflow"><i class="fab fa-stack-overflow"></i></a>
<a href="https://stackoverflow.com/users/{{ site.stackoverflow_id }}" title="Stackoverflow"><i class="fa-brands fa-stack-overflow"></i></a>
{% endif %}
{%- if site.kaggle_id -%}
<a href="https://www.kaggle.com/{{ site.kaggle_id }}" title="Kaggle"><i class="fab fa-kaggle"></i></a>
<a href="https://www.kaggle.com/{{ site.kaggle_id }}" title="Kaggle"><i class="fa-brands fa-kaggle"></i></a>
{% endif %}
{%- if site.lastfm_id -%}
<a href="https://www.last.fm/user/{{ site.lastfm_id }}" title="Last FM"><i class="fab fa-lastfm"></i></a>
<a href="https://www.last.fm/user/{{ site.lastfm_id }}" title="Last FM"><i class="fa-brands fa-lastfm"></i></a>
{% endif %}
{%- if site.spotify_id -%}
<a href="https://open.spotify.com/user/{{ site.spotify_id }}" title="Spotify"><i class="fab fa-spotify"></i></a>
<a href="https://open.spotify.com/user/{{ site.spotify_id }}" title="Spotify"><i class="fa-brands fa-spotify"></i></a>
{% endif %}
{%- if site.pinterest_id -%}
<a href="https://www.pinterest.com/{{ site.pinterest_id }}" title="Pinterest"><i class="fab fa-pinterest"></i></a>
<a href="https://www.pinterest.com/{{ site.pinterest_id }}" title="Pinterest"><i class="fa-brands fa-pinterest"></i></a>
{% endif %}
{%- if site.unsplash_id -%}
<a href="https://unsplash.com/@{{ site.unsplash_id }}" title="Unsplash"><i class="fab fa-unsplash"></i></a>
<a href="https://unsplash.com/@{{ site.unsplash_id }}" title="Unsplash"><i class="fa-brands fa-unsplash"></i></a>
{% endif %}
{%- if site.instagram_id -%}
<a href="https://instagram.com/{{ site.instagram_id }}" title="Instagram"><i class="fab fa-instagram"></i></a>
<a href="https://instagram.com/{{ site.instagram_id }}" title="Instagram"><i class="fa-brands fa-instagram"></i></a>
{% endif %}
{%- if site.facebook_id -%}
<a href="https://facebook.com/{{ site.facebook_id }}" title="Facebook"><i class="fab fa-facebook"></i></a>
<a href="https://facebook.com/{{ site.facebook_id }}" title="Facebook"><i class="fa-brands fa-facebook"></i></a>
{% endif %}
{%- if site.youtube_id -%}
<a href="https://youtube.com/@{{ site.youtube_id }}" title="YouTube"><i class="fab fa-youtube"></i></a>
<a href="https://youtube.com/@{{ site.youtube_id }}" title="YouTube"><i class="fa-brands fa-youtube"></i></a>
{% endif %}
{%- if site.discord_id -%}
<a href="https://discord.com/users/{{ site.discord_id }}" title="Discord"><i class="fab fa-discord"></i></a>
<a href="https://discord.com/users/{{ site.discord_id }}" title="Discord"><i class="fa-brands fa-discord"></i></a>
{% endif %}
{%- if site.zotero_username -%}
<a href="https://www.zotero.org/{{ site.zotero_username }}" title="Zotero"><i class="ai ai-zotero"></i></a>
{% endif %}
{%- if site.rss_icon -%}
<a href="{{ site.baseurl }}/feed.xml" title="RSS Feed"><i class="fas fa-rss-square"></i></a>
<a href="{{ site.baseurl }}/feed.xml" title="RSS Feed"><i class="fa-solid fa-square-rss"></i></a>
{% endif %}
{%- if site.wechat_qr -%}
<a id="WeChatBtn" title="WeChat"><i class="fab fa-weixin"></i></a>
<a id="WeChatBtn" title="WeChat"><i class="fa-brands fa-weixin"></i></a>
<div id="WeChatMod" class="wechat-modal">
<img src="{{ site.wechat_qr | prepend: 'assets/img/' | relative_url }}" alt="WeChat QR" id="WeChatQR">
</div>
Expand Down
2 changes: 1 addition & 1 deletion _layouts/archive-category.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="post">

<header class="post-header">
<h1 class="post-title"> <i class="fas fa-tag fa-sm"></i> {{ page.title }} </h1>
<h1 class="post-title"> <i class="fa-solid fa-tag fa-sm"></i> {{ page.title }} </h1>
<p class="post-description"> an archive of posts in this category </p>
</header>

Expand Down
2 changes: 1 addition & 1 deletion _layouts/archive-tag.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="post">

<header class="post-header">
<h1 class="post-title"> <i class="fas fa-hashtag fa-sm"></i> {{ page.title }} </h1>
<h1 class="post-title"> <i class="fa-solid fa-hashtag fa-sm"></i> {{ page.title }} </h1>
<p class="post-description"> an archive of posts with this tag </p>
</header>

Expand Down
2 changes: 1 addition & 1 deletion _layouts/archive-year.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="post">

<header class="post-header">
<h1 class="post-title"> <i class="fas fa-calendar fa-sm"></i> {{ page.date | date: "%Y" }} </h1>
<h1 class="post-title"> <i class="fa-solid fa-calendar fa-sm"></i> {{ page.date | date: "%Y" }} </h1>
<p class="post-description"> an archive of posts from this year </p>
</header>

Expand Down
4 changes: 2 additions & 2 deletions _layouts/cv.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ <h3 class="card-title font-weight-medium">{{ entry.title }}</h3>
</article>

<header class="post-header">
<h1 class="post-title">{{ page.title }} {% if page.cv_pdf %}<a href="{{ page.cv_pdf | prepend: 'assets/pdf/' | relative_url}}" target="_blank" rel="noopener noreferrer" class="float-right"><i class="fas fa-file-pdf"></i></a>{% endif %}</h1>
<h1 class="post-title">{{ page.title }} {% if page.cv_pdf %}<a href="{{ page.cv_pdf | prepend: 'assets/pdf/' | relative_url}}" target="_blank" rel="noopener noreferrer" class="float-right"><i class="fa-solid fa-file-pdf"></i></a>{% endif %}</h1>
{% if page.description %}<p class="post-description">{{ page.description }}</p>{% endif %}
</header>

Expand Down Expand Up @@ -78,7 +78,7 @@ <h3 class="card-title font-weight-medium">{{ entry.title }}</h3>
<div class="post">

<header class="post-header">
<h1 class="post-title">{{ page.title }} {% if page.cv_pdf %}<a href="{{ page.cv_pdf | prepend: 'assets/pdf/' | relative_url}}" target="_blank" rel="noopener noreferrer" class="float-right"><i class="fas fa-file-pdf"></i></a>{% endif %}</h1>
<h1 class="post-title">{{ page.title }} {% if page.cv_pdf %}<a href="{{ page.cv_pdf | prepend: 'assets/pdf/' | relative_url}}" target="_blank" rel="noopener noreferrer" class="float-right"><i class="fa-solid fa-file-pdf"></i></a>{% endif %}</h1>
{% if page.description %}<p class="post-description">{{ page.description }}</p>{% endif %}
</header>

Expand Down
6 changes: 3 additions & 3 deletions _layouts/post.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@
<h1 class="post-title">{{ page.title }}</h1>
<p class="post-meta">{{ page.date | date: "%B %-d, %Y" }}{%- if page.author -%} • {{ page.author }}{%- endif -%}{%- if page.meta -%} • {{ page.meta }}{%- endif -%}</p>
<p class="post-tags">
<a href="{{ year | prepend: '/blog/' | prepend: site.baseurl}}"> <i class="fas fa-calendar fa-sm"></i> {{ year }} </a>
<a href="{{ year | prepend: '/blog/' | prepend: site.baseurl}}"> <i class="fa-solid fa-calendar fa-sm"></i> {{ year }} </a>
{%- if tags != "" %}
&nbsp; &middot; &nbsp;
{% for tag in page.tags -%}
<a href="{{ tag | slugify | prepend: '/blog/tag/' | prepend: site.baseurl}}">
<i class="fas fa-hashtag fa-sm"></i> {{ tag }}</a> &nbsp;
<i class="fa-solid fa-hashtag fa-sm"></i> {{ tag }}</a> &nbsp;
{% endfor -%}
{% endif %}

{%- if categories != "" %}
&nbsp; &middot; &nbsp;
{% for category in page.categories -%}
<a href="{{ category | slugify | prepend: '/blog/category/' | prepend: site.baseurl}}">
<i class="fas fa-tag fa-sm"></i> {{ category }}</a> &nbsp;
<i class="fa-solid fa-tag fa-sm"></i> {{ category }}</a> &nbsp;
{% endfor -%}
{% endif %}

Expand Down
Loading

0 comments on commit 38c5dc2

Please sign in to comment.