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

@@ -5,7 +5,7 @@ common-css:
common-ext-css:
- href: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
sri: "sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh"
- "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.1/css/all.min.css"
- "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css"
- "https://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic"
- "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800"
common-ext-js:
@@ -21,11 +21,10 @@ common-js:
<!DOCTYPE html>
<html lang="{{ page.language | default: site.language | default: 'en' }}">
<!-- Beautiful Jekyll 5.0.0 | Copyright Dean Attali 2020 -->
<!-- Beautiful Jekyll 6.0.1 | Copyright Dean Attali 2023 -->
{% include head.html %}
<body>
{% include gtm_body.html %}
{% include nav.html %}

View File

@@ -4,7 +4,7 @@ layout: base
<div class="intro-header"></div>
<div role="main" class="{% if page.full-width %} container-fluid {% else %} container-md {% endif %}">
<main class="{% if page.full-width %} container-fluid {% else %} container-md {% endif %}">
{% if page.before-content %}
<div class="before-content">
{% for file in page.before-content %}
@@ -22,4 +22,4 @@ layout: base
{% endfor %}
</div>
{% endif %}
</div>
</main>

View File

@@ -46,6 +46,9 @@ layout: page
{% endif %}
</a>
{% if post.author %}
<span>By <strong>{{ post.author | strip_html }}</strong></span>
{% endif %}
<p class="post-meta">
{% assign date_format = site.date_format | default: "%B %-d, %Y" %}
Posted on {{ post.date | date: date_format }}
@@ -101,12 +104,18 @@ layout: page
<ul class="pagination main-pager">
{% if paginator.previous_page %}
<li class="page-item previous">
<a class="page-link" href="{{ paginator.previous_page_path | absolute_url }}">&larr; Newer Posts</a>
<a class="page-link" href="{{ paginator.previous_page_path | absolute_url }}">
<i class="fas fa-arrow-left" alt="Newer Posts"></i>
<span class="d-none d-sm-inline-block">Newer Posts</span>
</a>
</li>
{% endif %}
{% if paginator.next_page %}
<li class="page-item next">
<a class="page-link" href="{{ paginator.next_page_path | absolute_url }}">Older Posts &rarr;</a>
<a class="page-link" href="{{ paginator.next_page_path | absolute_url }}">
<span class="d-none d-sm-inline-block">Older Posts</span>
<i class="fas fa-arrow-right" alt="Older Posts"></i>
</a>
</li>
{% endif %}
</ul>

View File

@@ -20,7 +20,7 @@ common-ext-js:
<body>
<div role="main" class="{% if page.full-width %} container-fluid {% else %} container-md {% endif %} main-content">
<main class="{% if page.full-width %} container-fluid {% else %} container-md {% endif %} main-content">
{% if page.before-content %}
<div class="before-content">
{% for file in page.before-content %}
@@ -38,7 +38,7 @@ common-ext-js:
{% endfor %}
</div>
{% endif %}
</div>
</main>
{% include footer-minimal.html %}

View File

@@ -4,7 +4,7 @@ layout: base
{% include header.html type="page" %}
<div class="{% if page.full-width %} container-fluid {% else %} container-md {% endif %}" role="main">
<main class="{% if page.full-width %} container-fluid {% else %} container-md {% endif %}">
<div class="row">
<div class="{% if page.full-width %} col {% else %} col-xl-8 offset-xl-2 col-lg-10 offset-lg-1 {% endif %}">
{% if page.before-content %}
@@ -28,4 +28,4 @@ layout: base
{% include comments.html %}
</div>
</div>
</div>
</main>

View File

@@ -4,7 +4,7 @@ layout: base
{% include header.html type="post" %}
<div class="{% if page.full-width %} container-fluid {% else %} container-md {% endif %}">
<main class="{% if page.full-width %} container-fluid {% else %} container-md {% endif %}">
<div class="row">
<div class="{% if page.full-width %} col {% else %} col-xl-8 offset-xl-2 col-lg-10 offset-lg-1 {% endif %}">
@@ -39,9 +39,9 @@ layout: base
</div>
{% endif %}
<article role="main" class="blog-post">
<div class="blog-post">
{{ content }}
</article>
</div>
{% if page.tags.size > 0 %}
<div class="blog-tags">
@@ -67,16 +67,22 @@ layout: base
<ul class="pagination blog-pager">
{% if page.previous.url %}
<li class="page-item previous">
<a class="page-link" href="{{ page.previous.url | relative_url }}" data-toggle="tooltip" data-placement="top" title="{{page.previous.title | strip_html | xml_escape}}">&larr; Previous Post</a>
<a class="page-link" href="{{ page.previous.url | relative_url }}" data-toggle="tooltip" data-placement="top" title="{{page.previous.title | strip_html | xml_escape}}">
<i class="fas fa-arrow-left" alt="Previous Post"></i>
<span class="d-none d-sm-inline-block">Previous Post</span>
</a>
</li>
{% endif %}
{% if page.next.url %}
<li class="page-item next">
<a class="page-link" href="{{ page.next.url | relative_url }}" data-toggle="tooltip" data-placement="top" title="{{page.next.title | strip_html | xml_escape}}">Next Post &rarr;</a>
<a class="page-link" href="{{ page.next.url | relative_url }}" data-toggle="tooltip" data-placement="top" title="{{page.next.title | strip_html | xml_escape}}">
<span class="d-none d-sm-inline-block">Next Post</span>
<i class="fas fa-arrow-right" alt="Next Post"></i>
</a>
</li>
{% endif %}
</ul>
{% include comments.html %}
</div>
</div>
</div>
</main>