update version

ZhgChgLi · Aug 10, 2023 · 23003c9 · 23003c9
1 parent 5ffb59b
commit 23003c9
Show file tree

Hide file tree

Showing 10 changed files with 81 additions and 185 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "jekyll-theme-chirpy", "~> 5.6", ">= 5.6.1"
+gem "jekyll-theme-chirpy", "~> 6.1"
 
 group :test do
   gem "html-proofer", "~> 3.18"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.1)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     colorator (1.1.0)
     concurrent-ruby (1.2.2)
@@ -13,8 +13,8 @@ GEM
     eventmachine (1.2.7)
     ffi (1.15.5)
     forwardable-extended (2.6.0)
-    google-protobuf (3.22.2)
-    google-protobuf (3.22.2-x86_64-linux)
+    google-protobuf (3.23.4)
+    google-protobuf (3.23.4-x86_64-linux)
     html-proofer (3.19.4)
       addressable (~> 2.3)
       mercenary (~> 0.3)
@@ -24,7 +24,7 @@ GEM
       typhoeus (~> 1.3)
       yell (~> 2.0)
     http_parser.rb (0.8.0)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     jekyll (4.3.2)
       addressable (~> 2.4)
@@ -44,6 +44,8 @@ GEM
       webrick (~> 1.7)
     jekyll-archives (2.2.1)
       jekyll (>= 3.6, < 5.0)
+    jekyll-include-cache (0.2.1)
+      jekyll (>= 3.7, < 5.0)
     jekyll-paginate (1.1.0)
     jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
@@ -53,9 +55,10 @@ GEM
       jekyll (>= 3.8, < 5.0)
     jekyll-sitemap (1.4.0)
       jekyll (>= 3.7, < 5.0)
-    jekyll-theme-chirpy (5.6.1)
+    jekyll-theme-chirpy (6.1.0)
       jekyll (~> 4.3)
       jekyll-archives (~> 2.2)
+      jekyll-include-cache (~> 0.2)
       jekyll-paginate (~> 1.1)
       jekyll-redirect-from (~> 0.16)
       jekyll-seo-tag (~> 2.7)
@@ -80,14 +83,14 @@ GEM
     parallel (1.22.1)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (5.0.1)
+    public_suffix (5.0.3)
     racc (1.6.0)
     rainbow (3.1.1)
     rake (13.0.6)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
+    rexml (3.2.6)
     rouge (3.30.0)
     safe_yaml (1.0.5)
     sass-embedded (1.58.3)
@@ -104,7 +107,7 @@ GEM
       tzinfo (>= 1.0.0)
     unicode-display_width (2.4.2)
     wdm (0.1.1)
-    webrick (1.7.0)
+    webrick (1.8.1)
     yell (2.2.2)
 
 PLATFORMS
@@ -113,7 +116,7 @@ PLATFORMS
 
 DEPENDENCIES
   html-proofer (~> 3.18)
-  jekyll-theme-chirpy (~> 5.6, >= 5.6.1)
+  jekyll-theme-chirpy (~> 6.1)
   tzinfo (~> 1.2)
   tzinfo-data
   wdm (~> 0.1.1)

diff --git a/_data/locales/en.yml b/_data/locales/en.yml
@@ -40,7 +40,10 @@ copyright:
     Except where otherwise noted, the blog posts on this site are licensed
     under the Creative Commons Attribution 4.0 International (CC BY 4.0) License by the author.
 
-meta: Using the :PLATFORM theme :THEME, automatically sync Medium articles with <a href="https://github.com/ZhgChgLi/ZMediumToJekyll" target="_blank">ZMediumToJekyll</a>, powered by <a href="https://github.com/ZhgChgLi/ZMediumToMarkdown" target="_blank">ZMediumToMarkdown</a>.
+meta: >-
+    Using the :PLATFORM theme :THEME <br/>
+    Automatically sync Medium articles with <a href="https://github.com/ZhgChgLi/ZMediumToJekyll" target="_blank">ZMediumToJekyll</a>.<br/>
+    Powered by <a href="https://github.com/ZhgChgLi/ZMediumToMarkdown" target="_blank">ZMediumToMarkdown</a>.
 
 not_found:
   statment: Sorry, we've misplaced that URL or it's pointing to something that doesn't exist.

diff --git a/_includes/buymeacoffee.html b/_includes/buymeacoffee.html
@@ -1,9 +1 @@
-<hr/>
-
-<h1>2023 Open to Work</h1>
-
-➡️ <a href="https://resume.zhgchg.li" target="_blank">check out my Resume.</a>
-
-<hr/>
-
 <a href="https://www.buymeacoffee.com/zhgchgli"><img src="https://img.buymeacoffee.com/button-api/?text=Buy me a beer!&emoji=🍺&slug=zhgchgli&button_colour=FFDD00&font_colour=000000&font_family=Bree&outline_colour=000000&coffee_colour=ffffff" /></a>
diff --git a/_includes/post-footer.html b/_includes/post-footer.html
@@ -0,0 +1 @@
+<widgetic id="64ce71d5ecb2a165598b4567" resize="fill" width="560" height="60" autoscale="on" adaptive="414"></widgetic><script async src="https://widgetic.com/sdk/sdk.js"></script>
diff --git a/_includes/post-header.html b/_includes/post-header.html
@@ -0,0 +1 @@
+<widgetic id="64ce71d5ecb2a165598b4567" resize="fill" width="560" height="60" autoscale="on" adaptive="414"></widgetic><script async src="https://widgetic.com/sdk/sdk.js"></script>
diff --git a/_includes/related-posts.html b/_includes/related-posts.html
diff --git a/_layouts/page.html b/_layouts/page.html
@@ -4,62 +4,67 @@
   - comments
 ---
 
-{% include assets-origin.html %}
+{% 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 pr-xl-4">
-    <div class="post pl-1 pr-1 pl-md-2 pr-md-2">
+  <div id="core-wrapper" class="col-12 col-lg-11 col-xl-9 pe-xl-4">
+    {% capture padding %}
+      {% unless page.layout == 'home' %}px-1{% endunless %}
+    {% endcapture %}
 
-    {% capture _content %}
+    <div class="post {{ padding | strip }} px-md-2">
+      {% capture _content %}
       {% if layout.refactor or page.layout == 'page' %}
-        {% include refactor-content.html content=content %}
+        {% include refactor-content.html content=content lang=lang %}
       {% else %}
         {{ content }}
       {% endif %}
     {% endcapture %}
 
-    {% 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>
-      <div class="post-content">
+      {% if page.layout == 'page' or page.collection == 'tabs' %}
+        {% assign tab_key = page.title | downcase %}
+        {% assign title = site.data.locales[lang].tabs[tab_key] | default: page.title %}
+        <h1 class="dynamic-title">
+          {{ title }}
+        </h1>
+        <div class="post-content">
+          {{ _content }}
+        </div>
+      {% else %}
         {{ _content }}
-      </div>
-    {% else %}
-      {{ _content }}
-    {% endif %}
-
+      {% endif %}
     </div>
-  </div> <!-- #core-wrapper -->
+  </div>
+  <!-- #core-wrapper -->
 
   <!-- panel -->
-  <div id="panel-wrapper" class="col-xl-3 pl-2 text-muted">
-
+  <div id="panel-wrapper" class="col-xl-3 ps-2 text-muted">
     <div class="access">
-      {% include update-list.html %}
-      {% include trending-tags.html %}
+      {% include_cached update-list.html lang=lang %}
+      {% include_cached trending-tags.html lang=lang %}
     </div>
 
     {% for _include in layout.panel_includes %}
       {% assign _include_path = _include | append: '.html' %}
-      {% include {{ _include_path }} %}
+      {% include {{ _include_path }} lang=lang %}
     {% endfor %}
   </div>
-
 </div>
 
 <!-- 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 mt-5">
-    {% for _include in layout.tail_includes %}
-      {% assign _include_path = _include | append: '.html' %}
-      {% include {{ _include_path }} %}
-    {% endfor %}
+{% 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 %}
+        {% assign _include_path = _include | append: '.html' %}
+        {% include {{ _include_path }} lang=lang %}
+      {% endfor %}
+    </div>
   </div>
-</div>
-{% endif %}
+{% endif %}