Merge tag '6.0.1'
This commit is contained in:
commit
a6fe22b283
25 changed files with 599 additions and 159 deletions
|
@ -21,7 +21,7 @@ common-js:
|
|||
|
||||
<!DOCTYPE html>
|
||||
<html lang="{{ page.language | default: site.language | default: 'en' }}">
|
||||
<!-- Beautiful Jekyll 5.0.0 | Copyright Dean Attali 2020 -->
|
||||
<!-- Beautiful Jekyll 6.0.1 | Copyright Dean Attali 2023 -->
|
||||
{% include head.html %}
|
||||
|
||||
<body>
|
||||
|
|
|
@ -6,88 +6,96 @@ layout: page
|
|||
|
||||
{% assign posts = paginator.posts | default: site.posts %}
|
||||
|
||||
<div class="posts-list">
|
||||
<!-- role="list" needed so that `list-style: none` in Safari doesn't remove the list semantics -->
|
||||
<ul class="posts-list list-unstyled" role="list">
|
||||
{% for post in posts %}
|
||||
<article class="post-preview">
|
||||
<li class="post-preview">
|
||||
<article>
|
||||
|
||||
{%- capture thumbnail -%}
|
||||
{% if post.thumbnail-img %}
|
||||
{{ post.thumbnail-img }}
|
||||
{% elsif post.cover-img %}
|
||||
{% if post.cover-img.first %}
|
||||
{{ post.cover-img[0].first.first }}
|
||||
{%- capture thumbnail -%}
|
||||
{% if post.thumbnail-img %}
|
||||
{{ post.thumbnail-img }}
|
||||
{% elsif post.cover-img %}
|
||||
{% if post.cover-img.first %}
|
||||
{{ post.cover-img[0].first.first }}
|
||||
{% else %}
|
||||
{{ post.cover-img }}
|
||||
{% endif %}
|
||||
{% else %}
|
||||
{{ post.cover-img }}
|
||||
{% endif %}
|
||||
{% else %}
|
||||
{% endcapture %}
|
||||
{% assign thumbnail=thumbnail | strip %}
|
||||
|
||||
{% if site.feed_show_excerpt == false %}
|
||||
{% if thumbnail != "" %}
|
||||
<div class="post-image post-image-normal">
|
||||
<a href="{{ post.url | absolute_url }}" aria-label="Thumbnail">
|
||||
<img src="{{ thumbnail | absolute_url }}" alt="Post thumbnail">
|
||||
</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endcapture %}
|
||||
{% assign thumbnail=thumbnail | strip %}
|
||||
|
||||
{% if site.feed_show_excerpt == false %}
|
||||
{% if thumbnail != "" %}
|
||||
<div class="post-image post-image-normal">
|
||||
<a href="{{ post.url | absolute_url }}" aria-label="Thumbnail">
|
||||
<img src="{{ thumbnail | absolute_url }}" alt="Post thumbnail">
|
||||
</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
<a href="{{ post.url | absolute_url }}">
|
||||
<h2 class="post-title">{{ post.title }}</h2>
|
||||
|
||||
{% if post.subtitle %}
|
||||
<h3 class="post-subtitle">
|
||||
{{ post.subtitle }}
|
||||
</h3>
|
||||
{% endif %}
|
||||
</a>
|
||||
|
||||
<p class="post-meta">
|
||||
{% assign date_format = site.date_format | default: "%B %-d, %Y" %}
|
||||
Posted on {{ post.date | date: date_format }}
|
||||
</p>
|
||||
<a href="{{ post.url | absolute_url }}">
|
||||
<h2 class="post-title">{{ post.title | strip_html }}</h2>
|
||||
|
||||
{% if thumbnail != "" %}
|
||||
<div class="post-image post-image-small">
|
||||
<a href="{{ post.url | absolute_url }}" aria-label="Thumbnail">
|
||||
<img src="{{ thumbnail | absolute_url }}" alt="Post thumbnail">
|
||||
{% if post.subtitle %}
|
||||
<h3 class="post-subtitle">
|
||||
{{ post.subtitle | strip_html }}
|
||||
</h3>
|
||||
{% endif %}
|
||||
</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% unless site.feed_show_excerpt == false %}
|
||||
{% if thumbnail != "" %}
|
||||
<div class="post-image post-image-short">
|
||||
<a href="{{ post.url | absolute_url }}" aria-label="Thumbnail">
|
||||
<img src="{{ thumbnail | absolute_url }}" alt="Post thumbnail">
|
||||
</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
<p class="post-meta">
|
||||
{% assign date_format = site.date_format | default: "%B %-d, %Y" %}
|
||||
Posted on {{ post.date | date: date_format }}
|
||||
</p>
|
||||
|
||||
<div class="post-entry">
|
||||
{% assign excerpt_length = site.excerpt_length | default: 50 %}
|
||||
{{ post.excerpt | strip_html | xml_escape | truncatewords: excerpt_length }}
|
||||
{% assign excerpt_word_count = post.excerpt | number_of_words %}
|
||||
{% if post.content != post.excerpt or excerpt_word_count > excerpt_length %}
|
||||
<a href="{{ post.url | absolute_url }}" class="post-read-more">[Read More]</a>
|
||||
{% if thumbnail != "" %}
|
||||
<div class="post-image post-image-small">
|
||||
<a href="{{ post.url | absolute_url }}" aria-label="Thumbnail">
|
||||
<img src="{{ thumbnail | absolute_url }}" alt="Post thumbnail">
|
||||
</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endunless %}
|
||||
|
||||
{% if site.feed_show_tags != false and post.tags.size > 0 %}
|
||||
<div class="blog-tags">
|
||||
<span>Tags:</span>
|
||||
{% for tag in post.tags %}
|
||||
<a href="{{ '/tags' | absolute_url }}#{{- tag -}}">{{- tag -}}</a>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% unless site.feed_show_excerpt == false %}
|
||||
{% if thumbnail != "" %}
|
||||
<div class="post-image post-image-short">
|
||||
<a href="{{ post.url | absolute_url }}" aria-label="Thumbnail">
|
||||
<img src="{{ thumbnail | absolute_url }}" alt="Post thumbnail">
|
||||
</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
</article>
|
||||
<div class="post-entry">
|
||||
{% assign excerpt_length = site.excerpt_length | default: 50 %}
|
||||
{{ post.excerpt | strip_html | truncatewords: excerpt_length }}
|
||||
{% assign excerpt_word_count = post.excerpt | number_of_words %}
|
||||
{% if post.content != post.excerpt or excerpt_word_count > excerpt_length %}
|
||||
<a href="{{ post.url | absolute_url }}" class="post-read-more">[Read More]</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endunless %}
|
||||
|
||||
{% if site.feed_show_tags != false and post.tags.size > 0 %}
|
||||
<div class="blog-tags">
|
||||
<span>Tags:</span>
|
||||
<!-- role="list" needed so that `list-style: none` in Safari doesn't remove the list semantics -->
|
||||
<ul class="d-inline list-inline" role="list">
|
||||
{% for tag in post.tags %}
|
||||
<li class="list-inline-item">
|
||||
<a href="{{ '/tags' | absolute_url }}#{{- tag -}}">{{- tag -}}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
</article>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</ul>
|
||||
|
||||
{% if paginator.total_pages > 1 %}
|
||||
<ul class="pagination main-pager">
|
||||
|
|
|
@ -67,12 +67,12 @@ layout: base
|
|||
<ul class="pagination blog-pager">
|
||||
{% if page.previous.url %}
|
||||
<li class="page-item previous">
|
||||
<a class="page-link" href="{{ page.previous.url | relative_url }}" data-toggle="tooltip" data-placement="top" title="{{page.previous.title}}">← Previous Post</a>
|
||||
<a class="page-link" href="{{ page.previous.url | relative_url }}" data-toggle="tooltip" data-placement="top" title="{{page.previous.title | strip_html | xml_escape}}">← Previous Post</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% if page.next.url %}
|
||||
<li class="page-item next">
|
||||
<a class="page-link" href="{{ page.next.url | relative_url }}" data-toggle="tooltip" data-placement="top" title="{{page.next.title}}">Next Post →</a>
|
||||
<a class="page-link" href="{{ page.next.url | relative_url }}" data-toggle="tooltip" data-placement="top" title="{{page.next.title | strip_html | xml_escape}}">Next Post →</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue