Merge branch 'hotfix/6.0.1' into production

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [6.0.1](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v6.0.0...v6.0.1) (2023-05-19)
+
+
+### Bug Fixes
+
+* **home:** preview image missing `[alt]` and `img_path` ([#1044](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1044)) ([aba9468](https://github.com/cotes2020/jekyll-theme-chirpy/commit/aba9468b5332802db961166889d4c4a84e404a2c))
+* **layout:** restore the margin bottom of the main area ([#1047](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1047)) ([eb40f51](https://github.com/cotes2020/jekyll-theme-chirpy/commit/eb40f51c84b011a7c301279527f544ad27efd5eb))
+* **post, page:** image link loses shimmer effect ([#1046](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1046)) ([3bd881d](https://github.com/cotes2020/jekyll-theme-chirpy/commit/3bd881da70d685d10659f47bfe0e79cd02e7af92))
+* **typography:** long string for update-list is not truncated ([#1050](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1050)) ([a51d31c](https://github.com/cotes2020/jekyll-theme-chirpy/commit/a51d31c55a37fbe034f0b0f699f4df0b6a14ba8f)), closes [#1049](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1049)
+
 ## [6.0.0](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v5.6.1...v6.0.0) (2023-05-16)
 
 

_includes/post-paginator.html

@@ -1,6 +1,6 @@
 <!-- The paginator for post list on HomgPage. -->
 
-<ul class="pagination align-items-center my-4 ps-lg-2">
+<ul class="pagination align-items-center mt-4 mb-1 ps-lg-2">
   <!-- left arrow -->
   {% if paginator.previous_page %}
     {% assign prev_url = paginator.previous_page_path | relative_url %}

_includes/refactor-content.html

@@ -1,6 +1,4 @@
-<!--
+<!-- Refactor the HTML structure -->
-  Refactor the HTML structure.
--->
 
 {% assign _content = include.content %}
 
@@ -44,9 +42,9 @@
 {% endif %}
 
 <!-- images -->
+{% assign IMG_TAG = '<img ' %}
 
-{% if _content contains '<img' %}
+{% if _content contains IMG_TAG %}
-  {% assign IMG_TAG = '<img ' %}
   {% assign _img_content = nil %}
   {% assign _img_snippets = _content | split: IMG_TAG %}
 
@@ -160,7 +158,15 @@
     <!-- Bypass the HTML-proofer test -->
     {% assign _left = _left | append: ' data-proofer-ignore' %}
 
-    {% if page.layout == 'post' %}
+    {% if page.layout == 'home' %}
+      <!-- create the image wrapper -->
+      {%- capture _wrapper_start -%}
+        <div class="preview-img {{ _class | strip }}">
+      {%- endcapture -%}
+      {% assign _img_content = _img_content | append: _wrapper_start %}
+      {% assign _right = _right | prepend: '></div' %}
+
+    {% else %}
       <!-- make sure the `<img>` is wrapped by `<a>` -->
       {% assign _parent = _right | slice: 1, 4 %}
 
@@ -179,16 +185,6 @@
         {% assign _img_content = _img_content | append: _wrapper_start %}
         {% assign _right = _right | prepend: '></a' %}
       {% endif %}
-
-    {% endif %}
-
-    {% if page.layout == 'home' %}
-      <!-- create the image wrapper -->
-      {%- capture _wrapper_start -%}
-        <div class="preview-img {{ _class | strip }}">
-      {%- endcapture -%}
-      {% assign _img_content = _img_content | append: _wrapper_start %}
-      {% assign _right = _right | prepend: '></div' %}
     {% endif %}
 
     <!-- combine -->

_includes/update-list.html

@@ -1,6 +1,4 @@
-{% comment %}
+<!-- Get the last 5 posts from lastmod list. -->
-  Get the last 5 posts from lastmod list.
-{% endcomment %}
 
 {% assign MAX_SIZE = 5 %}
 
@@ -26,12 +24,12 @@
 {% if update_list.size > 0 %}
   <div id="access-lastmod" class="post">
     <div class="panel-heading">{{- site.data.locales[include.lang].panel.lastmod -}}</div>
-    <ul class="post-content ps-0 pb-1 ms-1 mt-2">
+    <ul class="post-content list-unstyled ps-0 pb-1 ms-1 mt-2">
       {% for item in update_list %}
         {% assign index = item | split: '::' | last | plus: 0 %}
         {% assign post = site.posts[index] %}
         {% assign url = post.url | relative_url %}
-        <li>
+        <li class="text-truncate lh-lg">
           <a href="{{ url }}">{{ post.title }}</a>
         </li>
       {% endfor %}

_layouts/home.html

@@ -48,7 +48,15 @@ refactor: true
           {% if post.image.lqip %}
             {% capture lqip %}lqip="{{ post.image.lqip }}"{% endcapture %}
           {% endif %}
-          <img src="{{ post.image.path | default: post.image }}" w="15" h="8" {{ lqip }}>
+
+          {% assign src = post.image.path | default: post.image %}
+          {% unless src contains '//' %}
+            {% assign src = post.img_path | append: '/' | append: src | replace: '//', '/' %}
+          {% endunless %}
+
+          {% assign alt = post.image.alt | default: 'Preview Image' %}
+
+          <img src="{{ src }}" w="15" h="8" alt="{{ alt }}" {{ lqip }}>
         {% endif %}
 
         <div class="card-body d-flex flex-column">

_layouts/page.html

@@ -5,7 +5,11 @@ layout: default
 {% include lang.html %}
 {% include origin-type.html %}
 
-<div class="row">
+{% if layout.tail_includes %}
+  {% assign has_tail = true %}
+{% endif %}
+
+<div class="row{% unless has_tail %} mb-5{% endunless %}">
   <!-- core -->
   <div id="core-wrapper" class="col-12 col-lg-11 col-xl-9 pe-xl-4">
     {% capture padding %}
@@ -52,7 +56,7 @@ layout: default
 </div>
 
 <!-- tail -->
-{% if layout.tail_includes %}
+{% if has_tail %}
   <div class="row">
     <div id="tail-wrapper" class="col-12 col-lg-11 col-xl-9 px-3 pe-xl-4 mt-5">
       {% for _include in layout.tail_includes %}

_sass/addon/commons.scss

@@ -255,16 +255,6 @@ i {
 }
 
 #access-lastmod {
-  li {
-    height: 1.8rem;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-line-clamp: 1;
-    -webkit-box-orient: vertical;
-    list-style: none;
-  }
-
   a {
     &:hover {
       @extend %link-hover;
@@ -1113,10 +1103,6 @@ $btn-mb: 0.5rem;
       @extend %no-bottom-border;
     }
   }
-
-  @at-root .row:only-child > #{&} {
-    padding-bottom: 3rem;
-  }
 }
 
 #mask {

_sass/jekyll-theme-chirpy.scss

@@ -1,5 +1,5 @@
 /*!
- * Chirpy v6.0.0 (https://github.com/cotes2020/jekyll-theme-chirpy)
+ * Chirpy v6.0.1 (https://github.com/cotes2020/jekyll-theme-chirpy)
  * © 2019 Cotes Chung
  * MIT Licensed
  */

_sass/layout/home.scss

@@ -5,10 +5,6 @@
 #post-list {
   margin-top: 2rem;
 
-  &:only-child {
-    margin-bottom: 3.75rem;
-  }
-
   a.card-wrapper {
     display: block;
 

jekyll-theme-chirpy.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "jekyll-theme-chirpy"
-  spec.version       = "6.0.0"
+  spec.version       = "6.0.1"
   spec.authors       = ["Cotes Chung"]
   spec.email         = ["cotes.chung@gmail.com"]
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jekyll-theme-chirpy",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "A minimal, responsive and feature-rich Jekyll theme for technical writing.",
   "repository": {
     "type": "git",

tools/release

@@ -164,15 +164,14 @@ build_gem() {
 release() {
   _version="$1" # X.Y.Z
 
+  git checkout "$PROD_BRANCH"
+  git merge --no-ff --no-edit "$working_branch"
+
   # Create a new tag on working branch
   echo -e "Create tag v$_version\n"
   git tag "v$_version"
 
-  git checkout "$PROD_BRANCH"
+  # Merge from patch branch to the staging branch
-  git merge --no-ff --no-edit "$working_branch"
-
-  # merge from patch branch to the staging branch
-  # NOTE: This may break due to merge conflicts, so it may need to be resolved manually.
   if [[ $working_branch == hotfix/* ]]; then
     git checkout "$STAGING_BRANCH"
     git merge --no-ff --no-edit "$working_branch"