Merge upstream

This commit is contained in:
2022-10-10 12:47:38 -04:00
parent f4ebff5cda
commit fd4e05cc7d
80 changed files with 1685 additions and 3017 deletions

View File

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