jekyll-theme-chirpy 5.2.1 → 5.3.1

data/_includes/refactor-content.html

@@ -31,11 +31,15 @@
   %}
 {% endif %}
 
-<!-- Add attribute 'hide-bullet' to the checkbox list -->
-
-{% if _content contains '<li class="task-list-item"><' %}
+<!-- Change the icon of checkbox -->
+{% if _content contains '<input type="checkbox"' %}
   {% assign _content = _content
-    | replace: '"task-list-item"><', '"task-list-item" hide-bullet><'
+    | replace:
+        '<input type="checkbox" class="task-list-item-checkbox" disabled="disabled" checked="checked" />',
+        '<i class="fas fa-check-circle fa-fw checked"></i>'
+    | replace:
+        '<input type="checkbox" class="task-list-item-checkbox" disabled="disabled" />',
+        '<i class="far fa-circle fa-fw"></i>'
   %}
 {% endif %}
 
@@ -177,7 +181,7 @@
           | append: '<div class="code-header">'
           | append: _label
           | append: '<button aria-label="copy" data-title-succeed="'
-          | append: site.data.locales[lang].post.button.copy_code.succeed
+          | append: site.data.locales[site.lang].post.button.copy_code.succeed
           | append: '"><i class="far fa-clipboard"></i></button></div>'
           | append: '<div class="highlight"><code>'
       %}
@@ -214,7 +218,7 @@
 
       {% assign left = snippet | split: mark_end | first %}
       {% assign right = snippet | slice: left.size, snippet.size %}
-      {% assign left = left | replace: '">', '"><span class="mr-2">' | append: '</span>' %}
+      {% assign left = left | replace_first: '">', '"><span class="mr-2">' | append: '</span>' %}
 
       {% assign _new_content = _new_content | append: mark_start
           | append: left | append: anchor | append: right

data/_includes/related-posts.html

@@ -76,9 +76,9 @@
 {% endif %}
 
 {% if index_list.size > 0 %}
-  <div id="related-posts" class="mt-5 mb-2 mb-sm-4">
-    <h3 class="pt-2 mt-1 mb-4 ml-1"
-      data-toc-skip>{{ site.data.locales[lang].post.relate_posts }}</h3>
+  <div id="related-posts" class="mb-2 mb-sm-4">
+    <h3 class="pt-2 mb-4 ml-1"
+      data-toc-skip>{{ site.data.locales[site.lang].post.relate_posts }}</h3>
     <div class="card-deck mb-4">
     {% for entry in index_list %}
       {% assign index = entry | plus: 0 %}

data/_includes/search-loader.html

@@ -14,7 +14,7 @@
 </div>
 {% endcapture %}
 
-{% capture not_found %}<p class="mt-5">{{ site.data.locales[lang].search.no_results }}</p>{% endcapture %}
+{% capture not_found %}<p class="mt-5">{{ site.data.locales[site.lang].search.no_results }}</p>{% endcapture %}
 
 <script src="{{ site.data.assets[origin].search.js | relative_url }}"></script>
 

data/_includes/sidebar.html

@@ -21,7 +21,7 @@
       </a>
     </div>
 
-    <div class="site-title mt-3">
+    <div class="site-title">
       <a href="{{ '/' | relative_url }}">{{ site.title }}</a>
     </div>
     <div class="site-subtitle font-italic">{{ site.tagline }}</div>
@@ -34,7 +34,7 @@
     <li class="nav-item{% if page.layout == 'home' %}{{ " active" }}{% endif %}">
       <a href="{{ '/' | relative_url }}" class="nav-link">
         <i class="fa-fw fas fa-home ml-xl-3 mr-xl-3 unloaded"></i>
-        <span>{{ site.data.locales[lang].tabs.home | upcase }}</span>
+        <span>{{ site.data.locales[site.lang].tabs.home | upcase }}</span>
       </a>
     </li>
     <!-- the real tabs -->
@@ -44,7 +44,7 @@
         <i class="fa-fw {{ tab.icon }} ml-xl-3 mr-xl-3 unloaded"></i>
         {% capture tab_name %}{{ tab.url | split: '/' }}{% endcapture %}
 
-        <span>{{ site.data.locales[lang].tabs.[tab_name] | default: tab.title | upcase }}</span>
+        <span>{{ site.data.locales[site.lang].tabs.[tab_name] | default: tab.title | upcase }}</span>
       </a>
     </li> <!-- .nav-item -->
     {% endfor %}

data/_includes/toc.html

@@ -10,7 +10,7 @@
 <script src="{{ site.data.assets[origin].bootstrap-toc.js | relative_url }}"></script>
 
 <div id="toc-wrapper" class="pl-0 pr-4 mb-5">
-  <div class="panel-heading pl-3 pt-2 mb-2">{{- site.data.locales[lang].panel.toc -}}</div>
+  <div class="panel-heading pl-3 pt-2 mb-2">{{- site.data.locales[site.lang].panel.toc -}}</div>
   <nav id="toc" data-toggle="toc"></nav>
 </div>
 {% endif %}

data/_includes/topbar.html

@@ -10,7 +10,7 @@
 
     {% if paths.size == 0 or page.layout == 'home' %}
       <!-- index page -->
-      <span>{{ site.data.locales[lang].tabs.home | capitalize }}</span>
+      <span>{{ site.data.locales[site.lang].tabs.home | capitalize }}</span>
 
     {% else %}
 
@@ -19,14 +19,14 @@
         {% if forloop.first %}
           <span>
             <a href="{{ '/' | relative_url }}">
-              {{ site.data.locales[lang].tabs.home | capitalize }}
+              {{ site.data.locales[site.lang].tabs.home | capitalize }}
             </a>
           </span>
 
         {% elsif forloop.last %}
 
           {% if page.collection == 'tabs' %}
-            <span>{{ site.data.locales[lang].tabs[item] | default: page.title }}</span>
+            <span>{{ site.data.locales[site.lang].tabs[item] | default: page.title }}</span>
           {% else %}
             <span>{{ page.title }}</span>
           {% endif %}
@@ -34,7 +34,7 @@
         {% elsif page.layout == 'category' or page.layout == 'tag' %}
           <span>
             <a href="{{ item | relative_url }}">
-              {{ site.data.locales[lang].tabs[item] | default: page.title }}
+              {{ site.data.locales[site.lang].tabs[item] | default: page.title }}
             </a>
           </span>
         {% endif %}
@@ -49,12 +49,12 @@
 
     <div id="topbar-title">
       {% if page.layout == 'home' %}
-        {{- site.data.locales[lang].title | default: site.title -}}
+        {{- site.data.locales[site.lang].title | default: site.title -}}
       {% elsif page.collection == 'tabs' or page.layout == 'page' %}
         {%- capture tab_key -%}{{ page.url | split: '/' }}{%- endcapture -%}
-        {{- site.data.locales[lang].tabs[tab_key] | default: page.title -}}
+        {{- site.data.locales[site.lang].tabs[tab_key] | default: page.title -}}
       {% else %}
-        {{- site.data.locales[lang].layout[page.layout] | default: page.layout | capitalize -}}
+        {{- site.data.locales[site.lang].layout[page.layout] | default: page.layout | capitalize -}}
       {% endif %}
     </div>
 
@@ -62,9 +62,9 @@
     <span id="search-wrapper" class="align-items-center">
       <i class="fas fa-search fa-fw"></i>
       <input class="form-control" id="search-input" type="search"
-        aria-label="search" autocomplete="off" placeholder="{{ site.data.locales[lang].search.hint | capitalize }}...">
+        aria-label="search" autocomplete="off" placeholder="{{ site.data.locales[site.lang].search.hint | capitalize }}...">
     </span>
-    <span id="search-cancel" >{{ site.data.locales[lang].search.cancel }}</span>
+    <span id="search-cancel" >{{ site.data.locales[site.lang].search.cancel }}</span>
   </div>
 
 </div>

data/_includes/trending-tags.html

@@ -37,7 +37,7 @@
 
 {% if trending_tags.size > 0 %}
   <div id="access-tags">
-    <div class="panel-heading">{{- site.data.locales[lang].panel.trending_tags -}}</div>
+    <div class="panel-heading">{{- site.data.locales[site.lang].panel.trending_tags -}}</div>
     <div class="d-flex flex-wrap mt-3 mb-1 mr-3">
 
     {% for tag_name in trending_tags %}

data/_includes/update-list.html

@@ -26,7 +26,7 @@
 {% if update_list.size > 0 %}
 
   <div id="access-lastmod" class="post">
-    <div class="panel-heading">{{- site.data.locales[lang].panel.lastmod -}}</div>
+    <div class="panel-heading">{{- site.data.locales[site.lang].panel.lastmod -}}</div>
     <ul class="post-content pl-0 pb-1 ml-1 mt-2">
       {% for item in update_list %}
         {% assign index = item | split: "::" | last | plus: 0 %}

data/_layouts/archives.html

@@ -3,46 +3,32 @@ layout: page
 # The Archives of posts.
 ---
 
-{% include lang.html %}
+{% assign df_strftime_m = site.data.locales[site.lang].df.archives.strftime | default: '/ %m' %}
+{% assign df_dayjs_m = site.data.locales[site.lang].df.archives.dayjs | default: '/ MM' %}
 
-{% if site.prefer_datetime_locale == 'en' or lang == 'en' %}
-  {% assign df_strftime_m = '%b' %}
-  {% assign df_dayjs_m = 'MMM' %}
-{% else %}
-  {% assign df_strftime_m = '/ %m' %}
-  {% assign df_dayjs_m = '/ MM' %}
-{% endif %}
+<div id="archives" class="pl-xl-3">
 
-<div id="archives" class="pl-xl-2">
 {% for post in site.posts %}
-  {% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %}
-  {% capture pre_year %}{{ post.previous.date | date: "%Y" }}{% endcapture %}
-  {% if forloop.first %}
-    {% assign last_day = "" %}
-    {% assign last_month = "" %}
-  <span class="lead">{{this_year}}</span>
-  <ul class="list-unstyled">
-  {% endif %}
-    <li>
-      <div>
-        {% assign ts = post.date | date: '%s' %}
-        <span class="date day" data-ts="{{ ts }}" data-df="DD">
-          {{ post.date | date: "%d" }}
-        </span>
-        <span class="date month small text-muted" data-ts="{{ ts }}" data-df="{{ df_dayjs_m }}">
-          {{ post.date | date: df_strftime_m }}
-        </span>
-        <a href="{{ post.url | relative_url }}">{{ post.title }}</a>
-      </div>
-    </li>
-  {% if forloop.last %}
-  </ul>
-  {% elsif this_year != pre_year %}
-  </ul>
-  <span class="lead">{{pre_year}}</span>
-  <ul class="list-unstyled">
-    {% assign last_day = "" %}
-    {% assign last_month = "" %}
+  {% capture cur_year %}{{ post.date | date: "%Y" }}{% endcapture %}
+
+  {% if cur_year != last_year %}
+    {% unless forloop.first %}</ul>{% endunless %}
+    <div class="year lead">{{ cur_year }}</div>
+    <ul class="list-unstyled">
+    {% assign last_year = cur_year %}
   {% endif %}
+
+  <li>
+  {% assign ts = post.date | date: '%s' %}
+    <span class="date day" data-ts="{{ ts }}" data-df="DD">{{ post.date | date: "%d" }}</span>
+    <span class="date month small text-muted ml-1" data-ts="{{ ts }}" data-df="{{ df_dayjs_m }}">
+      {{ post.date | date: df_strftime_m }}
+    </span>
+    <a href="{{ post.url | relative_url }}">{{ post.title }}</a>
+  </li>
+
+  {% if forloop.last %}</ul>{% endif %}
+
 {% endfor %}
+
 </div>

data/_layouts/categories.html

@@ -3,8 +3,6 @@ layout: page
 # All the Categories of posts
 ---
 
-{% include lang.html %}
-
 {% assign HEAD_PREFIX = "h_" %}
 {% assign LIST_PREFIX = "l_" %}
 
@@ -48,22 +46,22 @@ layout: page
           {% if sub_categories_size > 0 %}
             {{ sub_categories_size }}
             {% if sub_categories_size > 1 %}
-              {{ site.data.locales[lang].categories.category_measure.plural
-                | default: site.data.locales[lang].categories.category_measure }}
+              {{ site.data.locales[site.lang].categories.category_measure.plural
+                | default: site.data.locales[site.lang].categories.category_measure }}
             {% else %}
-              {{ site.data.locales[lang].categories.category_measure.singular
-                | default: site.data.locales[lang].categories.category_measure }}
+              {{ site.data.locales[site.lang].categories.category_measure.singular
+                | default: site.data.locales[site.lang].categories.category_measure }}
             {% endif %},
           {% endif %}
 
           {{ top_posts_size }}
 
           {% if top_posts_size > 1 %}
-            {{ site.data.locales[lang].categories.post_measure.plural
-              | default: site.data.locales[lang].categories.post_measure }}
+            {{ site.data.locales[site.lang].categories.post_measure.plural
+              | default: site.data.locales[site.lang].categories.post_measure }}
           {% else %}
-            {{ site.data.locales[lang].categories.post_measure.singular
-              | default: site.data.locales[lang].categories.post_measure }}
+            {{ site.data.locales[site.lang].categories.post_measure.singular
+              | default: site.data.locales[site.lang].categories.post_measure }}
           {% endif %}
         </span>
       </span>
@@ -99,11 +97,11 @@ layout: page
             {{ posts_size }}
 
             {% if posts_size > 1 %}
-              {{ site.data.locales[lang].categories.post_measure.plural
-                | default: site.data.locales[lang].categories.post_measure }}
+              {{ site.data.locales[site.lang].categories.post_measure.plural
+                | default: site.data.locales[site.lang].categories.post_measure }}
             {% else %}
-              {{ site.data.locales[lang].categories.post_measure.singular
-                | default: site.data.locales[lang].categories.post_measure }}
+              {{ site.data.locales[site.lang].categories.post_measure.singular
+                | default: site.data.locales[site.lang].categories.post_measure }}
             {% endif %}
           </span>
         </li>

data/_layouts/category.html

@@ -3,8 +3,6 @@ layout: page
 # The Category layout
 ---
 
-{% include lang.html %}
-
 <div id="page-category">
   <h1 class="pl-lg-2">
     <i class="far fa-folder-open fa-fw text-muted"></i>

data/_layouts/default.html

@@ -5,8 +5,6 @@ layout: compress
 
 <!DOCTYPE html>
 
-{% include lang.html %}
-
 {% include assets-origin.html %}
 
 {% capture prefer_mode %}
@@ -15,7 +13,8 @@ layout: compress
   {% endif %}
 {% endcapture %}
 
-<html lang="{{ site.lang }}"{{ prefer_mode }}>
+<!-- `site.alt_lang` can specify a language different from the UI -->
+<html lang="{{ site.alt_lang | default: site.lang }}"{{ prefer_mode }}>
 
   {% include head.html %}
 
@@ -27,17 +26,15 @@ layout: compress
 
     <div id="main-wrapper" class="d-flex justify-content-center">
       <div id="main" class="container pl-xl-4 pr-xl-4">
-
         {{ content }}
-
-        {% include footer.html %}
-
       </div>
 
       {% include search-results.html %}
 
     </div> <!-- #main-wrapper -->
 
+    {% include footer.html %}
+
     {% if page.mermaid %}
       {% include mermaid.html %}
     {% endif %}
@@ -57,9 +54,9 @@ layout: compress
           </button>
         </div>
         <div class="toast-body text-center pt-0">
-          <p class="pl-2 pr-2 mb-3">{{ site.data.locales[lang].notification.update_found }}</p>
+          <p class="pl-2 pr-2 mb-3">{{ site.data.locales[site.lang].notification.update_found }}</p>
           <button type="button" class="btn btn-primary" aria-label="Update">
-            {{ site.data.locales[lang].notification.update }}
+            {{ site.data.locales[site.lang].notification.update }}
           </button>
         </div>
       </div>

data/_layouts/home.html

@@ -3,8 +3,6 @@ layout: page
 # The Home page layout
 ---
 
-{% include lang.html %}
-
 {% assign pinned = site.posts | where: "pin", "true" %}
 {% assign default = site.posts | where_exp: "item", "item.pin != true and item.hidden != true" %}
 
@@ -79,7 +77,7 @@ layout: page
       {% if post.pin %}
       <div class="pin">
         <i class="fas fa-thumbtack fa-fw"></i>
-        <span>{{ site.data.locales[lang].post.pin_prompt }}</span>
+        <span>{{ site.data.locales[site.lang].post.pin_prompt }}</span>
       </div>
       {% endif %}
 

data/_layouts/page.html

@@ -2,8 +2,6 @@
 layout: default
 ---
 
-{% include lang.html %}
-
 {% include assets-origin.html %}
 
 <div class="row">
@@ -20,8 +18,9 @@ layout: default
       {% endif %}
     {% endcapture %}
 
-    {% if page.layout == 'page' or page.collection == 'tabs'%}
-      {% assign title = site.data.locales[lang].tabs[tab_key] | default: page.title %}
+    {% if page.layout == 'page' or page.collection == 'tabs' %}
+      {% assign tab_key = page.title | downcase %}
+      {% assign title = site.data.locales[site.lang].tabs[tab_key] | default: page.title %}
       <h1 class="dynamic-title">
         {{ title }}
       </h1>
@@ -35,7 +34,7 @@ layout: default
     </div>
   </div> <!-- #core-wrapper -->
 
-  <!-- pannel -->
+  <!-- panel -->
   <div id="panel-wrapper" class="col-xl-3 pl-2 text-muted">
 
     <div class="access">
@@ -43,7 +42,7 @@ layout: default
       {% include trending-tags.html %}
     </div>
 
-    {% for _include in layout.pannel_includes %}
+    {% for _include in layout.panel_includes %}
       {% assign _include_path = _include | append: '.html' %}
       {% include {{ _include_path }} %}
     {% endfor %}
@@ -54,7 +53,7 @@ layout: default
 <!-- tail -->
 {% if layout.tail_includes %}
 <div class="row">
-  <div id="tail-wrapper" class="col-12 col-lg-11 col-xl-9 pl-3 pr-3 pr-xl-4">
+  <div id="tail-wrapper" class="col-12 col-lg-11 col-xl-9 pl-3 pr-3 pr-xl-4 mt-5">
     {% for _include in layout.tail_includes %}
       {% assign _include_path = _include | append: '.html' %}
       {% include {{ _include_path }} %}

data/_layouts/post.html

@@ -1,7 +1,7 @@
 ---
 layout: page
 refactor: true
-pannel_includes:
+panel_includes:
   - toc
 tail_includes:
   - related-posts
@@ -9,21 +9,19 @@ tail_includes:
   - comments
 ---
 
-{% include lang.html %}
-
 <h1 data-toc-skip>{{ page.title }}</h1>
 
 <div class="post-meta text-muted">
     <!-- published date -->
     <span>
-      {{ site.data.locales[lang].post.posted }}
+      {{ site.data.locales[site.lang].post.posted }}
       {% include datetime.html date=page.date tooltip=true %}
     </span>
 
     <!-- lastmod date -->
     {% if page.last_modified_at %}
     <span>
-      {{ site.data.locales[lang].post.updated }}
+      {{ site.data.locales[site.lang].post.updated }}
       {% include datetime.html date=page.last_modified_at tooltip=true %}
     </span>
     {% endif %}
@@ -50,32 +48,32 @@ tail_includes:
       {% endif %}>
 
       {% if page.image.alt %}
-        <figcaption class="pt-2 pb-2">{{ page.image.alt }}</figcaption>
+        <figcaption class="text-center pt-2 pb-2">{{ page.image.alt }}</figcaption>
       {% endif %}
 
     </div>
   {% endif %}
 
   <div class="d-flex justify-content-between">
-    <!-- author -->
+    <!-- author(s) -->
     <span>
-      {% capture author_name %}{{ site.data.authors[page.author].name | default: site.social.name }}{% endcapture %}
-      {% assign author_link = nil %}
-
       {% if page.author %}
-        {% assign author_link = site.data.authors[page.author].url %}
-      {% elsif author_name == site.social.name %}
-        {% assign author_link = site.social.links[0] %}
+        {% assign authors = page.author %}
+      {% elsif page.authors %}
+        {% assign authors = page.authors %}
       {% endif %}
 
-      {{ site.data.locales[lang].post.written_by }}
+      {{ site.data.locales[site.lang].post.written_by }}
 
       <em>
-        {% if author_link %}
-          <a href="{{ author_link }}">{{ author_name }}</a>
-        {% else %}
-        {{ author_name }}
-        {% endif %}
+      {% if authors %}
+        {% for author in authors %}
+          <a href="{{ site.data.authors[author].url }}">{{ site.data.authors[author].name }}</a>
+          {% unless forloop.last %}</em>, <em>{% endunless %}
+        {% endfor %}
+      {% else %}
+        <a href="{{ site.social.links[0] }}">{{ site.social.name }}</a>
+      {% endif %}
       </em>
     </span>
 
@@ -86,7 +84,7 @@ tail_includes:
         <em id="pv" class="pageviews">
           <i class="fas fa-spinner fa-spin fa-fw"></i>
         </em>
-        {{ site.data.locales[lang].post.pageview_measure }}
+        {{ site.data.locales[site.lang].post.pageview_measure }}
       </span>
       {% endif %}
 
@@ -132,15 +130,15 @@ tail_includes:
     d-flex justify-content-between align-items-center mt-3 pt-5 pb-2">
     <div class="license-wrapper">
 
-      {% if site.data.locales[lang].copyright.license.template %}
+      {% if site.data.locales[site.lang].copyright.license.template %}
 
         {% capture _replacement %}
-        <a href="{{ site.data.locales[lang].copyright.license.link }}">
-          {{ site.data.locales[lang].copyright.license.name }}
+        <a href="{{ site.data.locales[site.lang].copyright.license.link }}">
+          {{ site.data.locales[site.lang].copyright.license.name }}
         </a>
         {% endcapture %}
 
-        {{ site.data.locales[lang].copyright.license.template | replace: ':LICENSE_NAME', _replacement }}
+        {{ site.data.locales[site.lang].copyright.license.template | replace: ':LICENSE_NAME', _replacement }}
 
       {% endif %}
     </div>

data/_layouts/tag.html

@@ -3,8 +3,6 @@ layout: page
 # The layout for Tag page
 ---
 
-{% include lang.html %}
-
 <div id="page-tag">
   <h1 class="pl-lg-2">
     <i class="fa fa-tag fa-fw text-muted"></i>