Merge upstream

This commit is contained in:
2020-01-26 00:28:11 -05:00
parent 0f2e183485
commit 12bc37ec52
44 changed files with 1696 additions and 197 deletions

View File

@@ -40,7 +40,7 @@ layout: base
Tags:
{% if site.link-tags %}
{% for tag in page.tags %}
<a href="{{ site.baseurl }}/tags#{{- tag -}}">{{- tag -}}</a>
<a href="{{ '/tags' | relative_url }}#{{- tag -}}">{{- tag -}}</a>
{% endfor %}
{% else %}
{{ page.tags | join: ", " }}
@@ -55,12 +55,12 @@ layout: base
<ul class="pager blog-pager">
{% if page.previous.url %}
<li class="previous">
<a href="{{ page.previous.url | prepend: site.baseurl | replace: '//', '/' }}" data-toggle="tooltip" data-placement="top" title="{{page.previous.title}}">&larr; Previous Post</a>
<a href="{{ page.previous.url | relative_url }}" data-toggle="tooltip" data-placement="top" title="{{page.previous.title}}">&larr; Previous Post</a>
</li>
{% endif %}
{% if page.next.url %}
<li class="next">
<a href="{{ page.next.url | prepend: site.baseurl | replace: '//', '/' }}" data-toggle="tooltip" data-placement="top" title="{{page.next.title}}">Next Post &rarr;</a>
<a href="{{ page.next.url | relative_url }}" data-toggle="tooltip" data-placement="top" title="{{page.next.title}}">Next Post &rarr;</a>
</li>
{% endif %}
</ul>
@@ -70,6 +70,12 @@ layout: base
{% 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 %}
</div>
</div>