Merge upstream

This commit is contained in:
2024-12-06 16:44:12 -05:00
parent 14e8771049
commit 913e60acc9
86 changed files with 1987 additions and 1556 deletions

View File

@@ -1,27 +1,36 @@
<footer>
<div class="container-md beautiful-jekyll-footer">
<div class="container beautiful-jekyll-footer">
<div class="row">
<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">
{% for file in page.footer-extra %}
{% include {{ file }} %}
{% endfor %}
</div>
{% endif %}
<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>
<p class="copyright text-muted">
{% if site.author %}
{{ site.author }}
&nbsp;&bull;&nbsp;
{% endif %}
{{ site.author.name }}
&nbsp;&bull;&nbsp;
{{ site.time | date: '%Y' }}
{% if site.url-pretty %}
&nbsp;&bull;&nbsp;
<span class="author-site">
<a href="{% if site.url-canonical %}{{ site.url-canonical }}{% else %}{{ '' | absolute_url }}{% endif %}">{{ site.url-pretty }}</a>
</span>
&nbsp;&bull;&nbsp;
<a href="{{ '' | absolute_url }}">{{ site.url-pretty }}</a>
{% endif %}
{% if site.matomo %}
@@ -30,17 +39,12 @@
<a href="http://{{- site.matomo.uri -}}/index.php?module=CoreAdminHome&action=optOut" target="_blank" class="text_muted">Do-not-Track</a>
{% endif %}
{% endif%}
{% if site.edit_page_button and site.github.repository_url %}
&nbsp;&bull;&nbsp;
<a title="Edit this page on GitHub" href="{{ site.github.repository_url }}/edit/{{ site.github.source.branch }}/{{ page.path }}" class="text_muted">Edit page</a>
{% endif%}
</p>
{% unless site.remove-ads %}<p class="theme-by text-muted">
Powered by
<a href="https://beautifuljekyll.com">Beautiful Jekyll</a>
</p>{% endunless %}
<!-- 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>
</div>
</div>
</div>