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,43 +1,21 @@
---
common-css:
- "/assets/css/beautifuljekyll-minimal.css"
common-ext-css:
- href: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
sri: "sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh"
common-ext-js:
- href: "https://code.jquery.com/jquery-3.5.1.slim.min.js"
sri: "sha256-4+XzXVhsDmqanXGHaHvgh1gMQKX40OUvDEBTu8JcmNs="
- href: "https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"
sri: "sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo"
- href: "https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"
sri: "sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6"
- "/css/bootstrap.min.css"
- "/css/main-minimal.css"
common-js:
- "/js/jquery-1.11.2.min.js"
- "/js/bootstrap.min.js"
---
<!DOCTYPE html>
<html lang="{{ page.language | default: site.language | default: 'en' }}">
<html lang="en">
{% include head.html %}
<body>
<div role="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 %}
{% include {{ file }} %}
{% endfor %}
</div>
{% endif %}
<div role="main" class="container main-content">
{{ content }}
{% if page.after-content %}
<div class="after-content">
{% for file in page.after-content %}
{% include {{ file }} %}
{% endfor %}
</div>
{% endif %}
</div>
{% include footer-minimal.html %}