Merge upstream

This commit is contained in:
2020-07-14 17:44:11 -04:00
parent 44353ad37a
commit 489b8963c7
145 changed files with 3145 additions and 21875 deletions

View File

@@ -1,36 +1,23 @@
<footer>
<div class="container beautiful-jekyll-footer">
<div class="container-md beautiful-jekyll-footer">
<div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
<ul class="list-inline text-center footer-links">
{%- for link in site.social-network-links -%}
{%- assign curkey = link[0] -%}
{%- assign element = site.data.SocialNetworks[curkey] -%}
<li>
{%- if curkey == 'rss' -%}
<a href="{{ '/feed.xml' | relative_url }}" title="{{ element.name }}">
{%- elsif curkey == 'yelp' -%}
<a href="https://{{ site.social-network-links[curkey] }}.yelp.com" title="{{ element.name }}">
{%- else -%}
<a href="{{element.baseURL}}{{ site.social-network-links[curkey] }}" title="{{ element.name }}">
{%- endif -%}
<span class="fa-stack fa-lg" aria-hidden="true">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa {{ element.icon }} fa-stack-1x fa-inverse"></i>
</span>
<span class="sr-only">{{ element.name }}</span>
</a>
</li>
{%- endfor -%}
</ul>
<div class="col-xl-8 offset-xl-2 col-lg-10 offset-lg-1">
{% include social-networks-links.html %}
{% if page.footer-extra %}
<div class="footer-custom-content">
{% include {{ page.footer-extra }} %}
</div>
{% endif %}
<p class="copyright text-muted">
{{ site.author.name }}
&nbsp;&bull;&nbsp;
{% if site.author %}
{{ site.author }}
&nbsp;&bull;&nbsp;
{% endif %}
{{ site.time | date: '%Y' }}
{% if site.url-pretty %}
&nbsp;&bull;&nbsp;
<a href="{{ '' | absolute_url }}">{{ site.url-pretty }}</a>
&nbsp;&bull;&nbsp;
<a href="{{ '' | absolute_url }}">{{ site.url-pretty }}</a>
{% endif %}
{% if site.matomo %}
@@ -40,11 +27,11 @@
{% endif %}
{% endif%}
</p>
<!-- Please don't remove this, keep my open source work credited :) -->
<p class="theme-by text-muted">
Theme by
<a href="https://deanattali.com/beautiful-jekyll/">beautiful-jekyll</a>
</p>
<!-- Please don't remove this, keep my open source work credited :) -->
<p class="theme-by text-muted">
Theme by
<a href="https://beautifuljekyll.com">beautiful-jekyll</a>
</p>
</div>
</div>
</div>