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

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