Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated FontAwesome to 5.15.2 and made the changes needed #246

Merged
merged 5 commits into from
Feb 19, 2021
Merged

Updated FontAwesome to 5.15.2 and made the changes needed #246

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
55e622d
Localization for months
Feb 17, 2021
42a8a35
Upgraded FontAwesome to 5.15.2
Feb 17, 2021
8eb0157
Removing unwanted changes from other branch
Feb 17, 2021
c7f6ea3
Fixed my git mistake
Feb 18, 2021
63ffff1
Fixed missing icons
Feb 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions _includes/blog_nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
{% if paginator.previous_page and paginator.previous_page != 1%}
<!-- << -->
<a aria-label="{{ site.data.language.str_previous_page | default: 'Prev' }}" href="{{ '/' | relative_url }}" class="button">
<span><i class="fa fa-angle-double-left"></i></span>
<span><i class="fas fa-angle-double-left"></i></span>
</a>
{% endif %}

<!-- < previous -->
<a aria-label="{{ site.data.language.str_previous_page | default: 'Prev' }}" href="{{ paginator.previous_page_path | relative_url }}"
{% unless paginator.previous_page %}style="visibility:hidden"{% endunless %} class="button">
<span><i class="fa fa-chevron-left"></i></span>
<span><i class="fas fa-chevron-left"></i></span>
{{ site.data.language.str_previous_page | default: "Prev" }}
</a>
</div>
Expand All @@ -27,14 +27,14 @@
<a aria-label="{{ site.data.language.str_next_page | default: 'Next' }}" href="{{ paginator.next_page_path | relative_url }}"
{% unless paginator.next_page %}style="visibility:hidden"{% endunless %} class="button">
{{ site.data.language.str_next_page | default: "Next" }}
<span><i class="fa fa-chevron-right"></i></span>
<span><i class="fas fa-chevron-right"></i></span>
</a>

{% if paginator.next_page and paginator.next_page != paginator.total_pages %}
<!-- >> -->
<a aria-label="{{ site.data.language.str_next_page | default: 'Next' }}"
href="{{ site.paginate_path | relative_url | replace: ':num', paginator.total_pages }}" class="button">
<span><i class="fa fa-angle-double-right"></i></span>
<span><i class="fas fa-angle-double-right"></i></span>
</a>
{% endif %}

Expand Down
92 changes: 46 additions & 46 deletions _includes/icons.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<a feed.xml href="{{ site.data.social.feed.path | default: 'feed.xml' | relative_url }}"
title="{{ site.data.language.str_rss_follow | default: "Follow RSS feed" }}">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-rss fa-stack-1x fa-inverse"></i>
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fas fa-rss fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
Expand All @@ -14,8 +14,8 @@
<li>
<a href="mailto:{{ site.data.social.email_address }}" title="{{ site.data.language.str_email }}">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-envelope fa-stack-1x fa-inverse"></i>
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fas fa-envelope fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
Expand All @@ -26,8 +26,8 @@
<a href="https://www.behance.net/{{ site.data.social.behance }}"
title="{{ site.data.language.str_follow_on }} Behance">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-behance fa-stack-1x fa-inverse"></i>
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-behance fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
Expand All @@ -38,8 +38,8 @@
<a href="https://bitbucket.org/{{ site.data.social.bitbucket }}"
title="{{ site.data.language.str_follow_on }} Bitbucket">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-bitbucket fa-stack-1x fa-inverse"></i>
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-bitbucket fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
Expand All @@ -50,8 +50,8 @@
<a href="https://dribbble.com/{{ site.data.social.dribbble }}"
title="{{ site.data.language.str_follow_on }} Dribbble">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-dribbble fa-stack-1x fa-inverse"></i>
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-dribbble fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
Expand All @@ -62,8 +62,8 @@
<a href="https://www.facebook.com/{{ site.data.social.facebook }}"
title="{{ site.data.language.str_follow_on }} Facebook">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-facebook fa-stack-1x fa-inverse"></i>
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-facebook fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
Expand All @@ -74,8 +74,8 @@
<a href="https://www.flickr.com/photos/{{ site.data.social.flickr }}"
title="{{ site.data.language.str_follow_on }} Flickr">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-flickr fa-stack-1x fa-inverse"></i>
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-flickr fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
Expand All @@ -85,8 +85,8 @@
<li>
<a href="https://github.com/{{ site.data.social.github }}" title="{{ site.data.language.str_follow_on }} GitHub">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-github fa-stack-1x fa-inverse"></i>
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-github fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
Expand All @@ -97,8 +97,8 @@
<a href="http://instagram.com/{{ site.data.social.instagram }}"
title="{{ site.data.language.str_follow_on }} Instagram">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-instagram fa-stack-1x fa-inverse"></i>
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-instagram fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
Expand All @@ -108,8 +108,8 @@
<li>
<a href="https://keybase.io/{{ site.data.social.keybase }}" title="{{ site.data.language.str_follow_on }} Keybase">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-key fa-stack-1x fa-inverse"></i>
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fas fab-key fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
Expand All @@ -119,8 +119,8 @@
<li>
<a href="{{ site.data.social.linkedin }}" title="{{ site.data.language.str_follow_on }} LinkedIn">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-linkedin fa-stack-1x fa-inverse"></i>
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-linkedin fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
Expand All @@ -131,8 +131,8 @@
<a href="http://www.pinterest.com/{{ site.data.social.pinterest }}"
title="{{ site.data.language.str_follow_on }} Pinterest">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-pinterest fa-stack-1x fa-inverse"></i>
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-pinterest fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
Expand All @@ -143,8 +143,8 @@
<a href="https://www.reddit.com/user/{{ site.data.social.reddit }}"
title="{{ site.data.language.str_follow_on }} Reddit">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-reddit fa-stack-1x fa-inverse"></i>
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-reddit fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
Expand All @@ -155,8 +155,8 @@
<a href="https://soundcloud.com/{{ site.data.social.soundcloud }}"
title="{{ site.data.language.str_follow_on }} SoundCloud">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-soundcloud fa-stack-1x fa-inverse"></i>
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-soundcloud fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
Expand All @@ -166,8 +166,8 @@
<li>
<a href="{{ site.data.social.stack_exchange }}" title="{{ site.data.language.str_follow_on }} Stack Exchange">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-stack-exchange fa-stack-1x fa-inverse"></i>
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-stack-exchange fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
Expand All @@ -177,8 +177,8 @@
<li>
<a href="{{ site.data.social.stack_overflow }}" title="{{ site.data.language.str_follow_on }} Stack Overflow">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-stack-overflow fa-stack-1x fa-inverse"></i>
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-stack-overflow fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
Expand All @@ -189,8 +189,8 @@
<a href="http://steamcommunity.com/id/{{ site.data.social.steam }}"
title="{{ site.data.language.str_follow_on }} Steam">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-steam fa-stack-1x fa-inverse"></i>
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-steam fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
Expand All @@ -200,8 +200,8 @@
<li>
<a href="http://{{ site.data.social.tumblr }}.tumblr.com/" title="{{ site.data.language.str_follow_on }} Tumblr">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-tumblr fa-stack-1x fa-inverse"></i>
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-tumblr fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
Expand All @@ -211,8 +211,8 @@
<li>
<a href="https://gitlab.com/{{ site.data.social.gitlab }}" title="{{ site.data.language.str_follow_on }} Gitlab">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-gitlab fa-stack-1x fa-inverse"></i>
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-gitlab fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
Expand All @@ -223,8 +223,8 @@
<a class="type" href="https://twitter.com/{{ site.data.social.twitter }}"
title="{{ site.data.language.str_follow_on }} Twitter">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-twitter fa-stack-1x fa-inverse"></i>
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-twitter fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
Expand All @@ -235,8 +235,8 @@
<a class="type" href="https://vimeo.com/{{ site.data.social.vimeo }}"
title="{{ site.data.language.str_follow_on }} Vimeo">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-vimeo fa-stack-1x fa-inverse"></i>
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-vimeo fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
Expand All @@ -247,8 +247,8 @@
<a href="https://{{ site.data.social.wordpress }}.wordpress.com/"
title="{{ site.data.language.str_follow_on }} WordPress">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-wordpress fa-stack-1x fa-inverse"></i>
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-wordpress fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
Expand All @@ -259,8 +259,8 @@
<a href="https://www.youtube.com/channel/{{ site.data.social.youtube }}"
title="{{ site.data.language.str_follow_on }} YouTube">
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-youtube fa-stack-1x fa-inverse"></i>
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-youtube fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
Expand Down
4 changes: 2 additions & 2 deletions _includes/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<!-- Toggle menu -->
<nav class="clear">
<a aria-label="pull" id="pull" class="toggle" href="#">
<i class="fa fa-bars fa-lg"></i>
<i class="fas fa-bars fa-lg"></i>
</a>

<!-- Menu -->
Expand All @@ -27,7 +27,7 @@
<li class="separator"> | </li>
<li>
<a class="clear" aria-label="{{ page.title }}" title="{{ page.title }}" href="{{ page.url | relative_url }}">
{% if page.icon %} <i class="fa {{ page.icon }}" aria-hidden="true"></i>
{% if page.icon %} <i class="{{ page.icon }}" aria-hidden="true"></i>
{% else %} {{ page.title }} {% endif%}
</a>
</li>
Expand Down
2 changes: 1 addition & 1 deletion _includes/portfolio.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<a class="portfolio-link" data-keyboard="true" href="{{ item.url | relative_url }}">
<div class="caption" title="{{ item.title }}">
<div class="caption-content">
<i class="fa fa-search-plus fa-3x"></i>
<i class="fas fa-search-plus fa-3x"></i>
</div>
</div>
<img alt="" class="" src="{{ item.img | relative_url }}">
Expand Down
2 changes: 1 addition & 1 deletion _includes/post_info.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<img src="{{ author.avatar | relative_url }}">
{% endif %}
<p class="meta">
{% if author.name %}{{ author.name }} - {% endif %}{{ date | date: "%B %-d, %Y" }}
{% if author.name %}{{ author.name }} - {% endif %} - {% endif %}{{ date | date: "%B %-d, %Y" }}
danisztls marked this conversation as resolved.
Show resolved Hide resolved
</p>
{%- if author.url -%}</a>{%- endif -%}
</div>
4 changes: 2 additions & 2 deletions _includes/tags_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

{% for tag in tags %}
<a class="button" href="{{ "/tags" | relative_url }}#{{ tag | cgi_escape }}">
<p><i class="fa fa-tag fa-fw"></i> {{ tag }}</p>
<p><i class="fas fa-tag fa-fw"></i> {{ tag }}</p>
</a>
{% endfor %}
</div>
Expand All @@ -20,4 +20,4 @@
<footer>
<div class="tag-list"></div>
</footer>
{% endif %}
{% endif %}
2 changes: 1 addition & 1 deletion _layouts/search.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
searchInput: document.getElementById('search-input'),
resultsContainer: document.getElementById('results-container'),
json: '{{ "/assets/data/search.json" | relative_url }}',
searchResultTemplate: '<div class="search-title"><a href="{url}"><h3> {title}</h3></a><div class="meta">{date} <div class="right"><i class="fa fa-tag"></i> {tags}</div></div><p>{excerpt}</p></div><hr> ',
searchResultTemplate: '<div class="search-title"><a href="{url}"><h3> {title}</h3></a><div class="meta">{date} <div class="right"><i class="fas fa-tag"></i> {tags}</div></div><p>{excerpt}</p></div><hr> ',
noResultsText: '{{ site.data.language.str_no_result_found | default: "No result found" }}',
limit: 10,
fuzzy: false,
Expand Down
10 changes: 5 additions & 5 deletions _layouts/tags.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
<div class="posts">
{% for tag in tags %}
<h3 id="{{ tag | cgi_escape }}" class="tag-anchor">
<a href="#{{ tag | cgi_escape }}"><i class="fa fa-tag fa-fw"></i> {{ tag }}</a>
<a href="#{{ page.title }}" style="float: right"><i class="fa fa-chevron-up" aria-hidden="true"> </i> </a>
<a href="#{{ tag | cgi_escape }}"><i class="fas fa-tag fa-fw"></i> {{ tag }}</a>
<a href="#{{ page.title }}" style="float: right"><i class="fas fa-chevron-up" aria-hidden="true"> </i> </a>

</h3>

Expand All @@ -48,7 +48,7 @@ <h3 id="{{ tag | cgi_escape }}" class="tag-anchor">
{% if page.tags contains tag %}
<h5 class="tag-title">
<a href="{{ page.url | relative_url }}">
<i class="fa fa-file-image-o" aria-hidden="true"></i>
<i class="far fa-file-image" aria-hidden="true"></i>
{{ page.title }}
</a>

Expand All @@ -64,7 +64,7 @@ <h5 class="tag-title">
{% if post.tags contains tag %}
<h5 class="tag-title">
<a href="{{ post.url | relative_url }}">
<i class="fa fa-file-text-o" aria-hidden="true"></i>
<i class="far fa-file-text" aria-hidden="true"></i>
{{ post.title }}
</a>

Expand All @@ -80,7 +80,7 @@ <h5 class="tag-title">
{% if note.tags contains tag %}
<h5 class="tag-title">
<a href="{{ note.url | relative_url }}">
<i class="fa fa-file-o" aria-hidden="true"></i>
<i class="far fa-file" aria-hidden="true"></i>
{{ note.title }}
</a>

Expand Down
Loading