Merge upstream

This commit is contained in:
2020-07-14 17:44:11 -04:00
parent 44353ad37a
commit 489b8963c7
145 changed files with 3145 additions and 21875 deletions

View File

@@ -4,22 +4,11 @@ layout: base
{% include header.html type="page" %}
<div class="container" role="main">
<div class="container-md" role="main">
<div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
<div class="col-xl-8 offset-xl-2 col-lg-10 offset-lg-1">
{{ content }}
{% if page.comments %}
<div class="disqus-comments">
{% include disqus.html %}
</div>
{% include fb-comment.html %}
<div class="staticman-comments">
{% include staticman-comments.html %}
</div>
<div class="justcomments-comments">
{% include just_comments.html %}
</div>
{% endif %}
{% include comments.html %}
</div>
</div>
</div>