{{ post.excerpt | markdownify | strip_html | truncate: 160 }}
{% endif %}{{ site.data.ui-text[site.locale].categories_label | default: "Categories:" }} - {% for hash in category_hashes %} - {% assign keyValue = hash | split: '|' %} - {% capture category_word %}{{ keyValue[1] | strip_newlines }}{% endcapture %} - {{ category_word }}{% unless forloop.last %}, {% endunless %} + {% for category_word in categories_sorted %} + {{ category_word }}{% unless forloop.last %}, {% endunless %} {% endfor %}
diff --git a/_includes/comment.html b/_includes/comment.html index cebedabfb5d5..2e3013ee2a76 100644 --- a/_includes/comment.html +++ b/_includes/comment.html @@ -13,7 +13,7 @@{{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}
+{% elsif page.date %} +{{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}
+{% endif %} \ No newline at end of file diff --git a/_includes/page__hero.html b/_includes/page__hero.html index 98bff72aa29e..dd1c26fbf1fc 100644 --- a/_includes/page__hero.html +++ b/_includes/page__hero.html @@ -1,25 +1,13 @@ -{% if page.header.image contains "://" %} - {% capture img_path %}{{ page.header.image }}{% endcapture %} -{% else %} - {% capture img_path %}{{ page.header.image | relative_url }}{% endcapture %} -{% endif %} - -{% if page.header.cta_url contains "://" %} - {% capture cta_path %}{{ page.header.cta_url }}{% endcapture %} -{% else %} - {% capture cta_path %}{{ page.header.cta_url | relative_url }}{% endcapture %} -{% endif %} +{% capture overlay_img_path %}{{ page.header.overlay_image | relative_url }}{% endcapture %} -{% if page.header.overlay_image contains "://" %} - {% capture overlay_img_path %}{{ page.header.overlay_image }}{% endcapture %} -{% elsif page.header.overlay_image %} - {% capture overlay_img_path %}{{ page.header.overlay_image | relative_url }}{% endcapture %} -{% endif %} - -{% if page.header.overlay_filter contains "rgba" %} +{% if page.header.overlay_filter contains "gradient" %} {% capture overlay_filter %}{{ page.header.overlay_filter }}{% endcapture %} +{% elsif page.header.overlay_filter contains "rgba" %} + {% capture overlay_filter %}{{ page.header.overlay_filter }}{% endcapture %} + {% capture overlay_filter %}linear-gradient({{ overlay_filter }}, {{ overlay_filter }}){% endcapture %} {% elsif page.header.overlay_filter %} {% capture overlay_filter %}rgba(0, 0, 0, {{ page.header.overlay_filter }}){% endcapture %} + {% capture overlay_filter %}linear-gradient({{ overlay_filter }}, {{ overlay_filter }}){% endcapture %} {% endif %} {% if page.header.image_description %} @@ -31,7 +19,7 @@ {% assign image_description = image_description | markdownify | strip_html | strip_newlines | escape_once %}" | remove: "
" }} {% endif %} - {% if page.header.show_overlay_excerpt != false and page.excerpt %} + {% if page.tagline %} +{{ page.tagline | markdownify | remove: "
" | remove: "
" }} + {% elsif page.header.show_overlay_excerpt != false and page.excerpt %}{{ page.excerpt | markdownify | remove: "
" | remove: "
" }} {% endif %} - {% if page.read_time %} - - {% endif %} + {% include page__meta.html %} {% if page.header.cta_url %} - + {% endif %} {% if page.header.actions %}{% for action in page.header.actions %} - {% if action.url contains "://" %} - {% assign url = action.url %} - {% else %} - {% assign url = action.url | relative_url %} - {% endif %} - {{ action.label | default: site.data.ui-text[site.locale].more_label | default: "Learn More" }} + {{ action.label | default: site.data.ui-text[site.locale].more_label | default: "Learn More" }} {% endfor %} {% endif %}
" | remove: "
" }} diff --git a/_includes/page__hero_video.html b/_includes/page__hero_video.html index 8586a95a2b15..a313a23d45b9 100644 --- a/_includes/page__hero_video.html +++ b/_includes/page__hero_video.html @@ -1,4 +1,2 @@ -{% capture video_id %}{{ page.header.video.id }}{% endcapture %} -{% capture video_provider %}{{ page.header.video.provider }}{% endcapture %} - -{% include video id=video_id provider=video_provider %} +{% assign video = page.header.video %} +{% include video id=video.id provider=video.provider danmaku=video.danmaku %} diff --git a/_includes/page__meta.html b/_includes/page__meta.html new file mode 100644 index 000000000000..3d228c921205 --- /dev/null +++ b/_includes/page__meta.html @@ -0,0 +1,31 @@ +{% assign document = post | default: page %} +{% if document.read_time or document.show_date %} + +{% endif %} diff --git a/_includes/paginator.html b/_includes/paginator.html index 592a2cfcf9a0..bffa0794678e 100644 --- a/_includes/paginator.html +++ b/_includes/paginator.html @@ -1,6 +1,6 @@ {% if paginator.total_pages > 1 %}