jekyll-theme-h2o-ac 1.2.1 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e8adcaaf4e554babff373944b6f8ca485909faf610b0bfcca931a869fa43490
-  data.tar.gz: 280099e22c19eafcbbba41fcfe96e8656892c05b0de17351be14ccd9a1007ca3
+  metadata.gz: f964f3fa35b036f457909e829661cc630fd817997e6093097609963202ccbe2b
+  data.tar.gz: 4512124057d051e06d9efac0c013618ac5300bd04b9ab7a13b04c37679ce3da4
 SHA512:
-  metadata.gz: a1328cc5cce2252750106589a34f19ccb7dd7f2b81ce1114c65375a191b41e2d61c4af3b51b1bc8d4683f7549684df7666e27deeb2cd182dbccd9889a26306d7
-  data.tar.gz: 2a2a1a7462813ddaba76b0357a032da6c034daa992dabdf08a1241c5f54e50c08a6f7f198df9b83cd32ae7cecbf59d555de353fee84dfc1695b7bc48b74e90db
+  metadata.gz: 68e0f96136129fbfbfd1c6ca38a1e44ceeaa162fd9e54914134b8209448b4ffad0e41f75cf1c764bcffe20f89f8fc4ec7e64ed43e89e833ee4e636fad6922ff2
+  data.tar.gz: 6e1c87fe87e9c77a3183909d7b3d48417bc73972683fc302f575d339c7dfcfeb4312b4bddd277d5a881c3138a994a28af31a807d336b15252e0b7949c4b8a0f9

data/README.md

@@ -16,9 +16,8 @@ A Jekyll theme for researchers and maintainers based on Jekyll and [H2O](https:/
 ## Preview
 
 ### [在线预览 Live Demo →](https://h2o-ac.pages.dev/)
-
-![vgy.me](https://i.vgy.me/tDC0t6.png)
-![vgy.me](https://i.vgy.me/2Oj0Tj.png)
+![Picyard Thu Jul 06 2023 14_59_28 GMT+0900 (日本标准时间)](https://github.com/zhonger/jekyll-theme-H2O-ac/assets/12064158/e6d55bf7-b956-46e9-80d0-f33397a62215)
+![Picyard Thu Jul 06 2023 15_09_27 GMT+0900 (日本标准时间)](https://github.com/zhonger/jekyll-theme-H2O-ac/assets/12064158/fa9a087a-d849-4469-9830-2400d3410660)
 
 如果你喜欢这个博客模板，请在右上角star一下，非常感谢～
 
@@ -28,7 +27,7 @@ If you like this theme or using it, please give a ⭐️ for motivation ;)
 
 Using your smartphone to scan the QR Code for preview
 
-<img src="https://i.vgy.me/0zuPYl.png" width=200 />
+<img src="https://github.com/zhonger/jekyll-theme-H2O-ac/assets/12064158/b01c0a31-4fad-413c-9692-a67d330699b1" width=200 />
 
 ## New Features compared with H2O， 与 H2O 不同的新特性
 
@@ -51,6 +50,7 @@ Using your smartphone to scan the QR Code for preview
 - 提示框支持
 - 文章置顶
 - 版权显式声明
+- 国际化支持（简中、繁中、英文、日文）
 
 ### EN
 
@@ -71,6 +71,7 @@ Using your smartphone to scan the QR Code for preview
 - Premonition
 - Top article pin
 - Copyright statement for articles
+- Internationlization (Simplified Chinese, Traditional Chinse, English, Japanese)
 
 ## Usage 快速开始
 

data/_config.yml

@@ -1,5 +1,5 @@
 # jekyll-theme-h2o-ac
-version: 1.2.1
+version: 1.3.1
 
 # Site settings 配置站点
 title: 'Mr Li'
@@ -104,11 +104,25 @@ sns:
 links:
   # 'Mr Li': 'https://lisz.me'
 
+# Calendar 日历
+calendar: true
+
 # Supports 赞助商
 supports:
   upyun: 
   webify: 
 
+# Badges
+badges:
+  foreverblog: true # Foreverblog
+  wormhole: true # Wormhole
+  travelling: true # Travelling
+  notbyAI: true # NotByAI
+
+# Alive time
+alivetime: true
+alivestart: "12/23/2021"
+
 # Beian 备案号
 beian: '沪ICP备xxxxxxxx号'
 
@@ -183,22 +197,6 @@ extlinks:
 # Mermaid
 mermaid: true
 
-# Webpusher
-webpusher: false
-
-# Foreverblog
-foreverblog: false
-
-# Wormhole
-wormhole: false
-
-# NotByAI
-notbyAI: false
-
-# Alive time
-alivetime: false
-alivestart: "12/23/2021"
-
 # TOC
 toc: true
 # <div class="title">{% if title %} {{title}} {% else %} {{default_title}} {% endif %}</div>

data/_data/collections.yml

@@ -0,0 +1,11 @@
+- id: 'begin'
+  name: 'H2O-ac 主题入门系列'
+  articles:
+  - name: '快速入门'
+    url: '/tech/new-theme-h2o-ac.html'
+  - name: '快速入门'
+    url: '/tech/new-theme-h2o-ac.html'
+  - name: '快速入门'
+    url: '/tech/new-theme-h2o-ac.html'
+  - name: 'Guide'
+    url: 'https://lisz.me/tech/new-theme-h2o-ac.html'

data/_data/locales/en.yml

@@ -3,9 +3,14 @@ panel:
   posts: 'POSTS'
   categories: 'CATEGORIES'
   tags: 'TAGS'
+  calendar: 'CALENDAR'
+  calendar_less: 'Less'
+  calendar_more: 'More'
   hot_tags: 'HOT TAGS'
   links: 'LINKS'
   update: 'RECENT UPDATES'
+  friends: 'FRIENDS'
+  nolink: 'No any links'
 footer:
   driver: 'Powered by <a href="//jekyllrb.com" target="_blank" class="extlinks">Jekyll</a> & <a href="https://github.com/zhonger/jekyll-theme-H2O-ac" target="_blank" class="extlinks">H2O-ac</a> (based on <a href="https://github.com/kaeyleo/jekyll-theme-H2O" target="_blank" class="extlinks">H2O</a>)'
   views: 'Total Views'
@@ -22,6 +27,7 @@ footer:
     middle: 'Terms of Service'
     right: 'page.'
     btn: 'Accept'
+    name: 'Terms of Service'
 post:
   outline: 'Contents'
   cover:

data/_data/locales/ja.yml

@@ -3,9 +3,14 @@ panel:
   posts: '記事'
   categories: 'カテゴリー'
   tags: 'タグ'
+  calendar: 'カレンダー'
+  calendar_less: '少ない'
+  calendar_more: '多い'
   hot_tags: '人気タグ'
   links: 'リンク'
   update: '最新のアップデート'
+  friends: '友達'
+  nolink: 'リンクがありません'
 footer:
   driver: 'このサイトは <a href="//jekyllrb.com" target="_blank" class="extlinks">Jekyll</a> と <a href="https://github.com/zhonger/jekyll-theme-H2O-ac" target="_blank" class="extlinks">H2O-ac</a> を利用しています'
   views: '総閲覧数'
@@ -22,6 +27,7 @@ footer:
     middle: 'このサイトについて'
     right: 'をご覧ください。'
     btn: '同意する'
+    name: '利用規約'
 post:
   outline: '目次'
   cover:

data/_data/locales/zh-Hans.yml

@@ -3,9 +3,14 @@ panel:
   posts: '文章'
   categories: '类别'
   tags: '标签'
+  calendar: '日历'
+  calendar_less: '少'
+  calendar_more: '多'
   hot_tags: '热门标签'
   links: '链接'
   update: '最近更新'
+  friends: '朋友们'
+  nolink: '暂无链接'
 footer:
   driver: '本站由 <a href="//jekyllrb.com" target="_blank" class="extlinks">Jekyll</a> 和 (基于 <a href="https://github.com/kaeyleo/jekyll-theme-H2O" target="_blank" class="extlinks">H2O</a> 的) <a href="https://github.com/zhonger/jekyll-theme-H2O-ac" target="_blank" class="extlinks">H2O-ac</a> 强力驱动'
   views: '总浏览量'
@@ -22,6 +27,7 @@ footer:
     middle: '本站使用条款'
     right: '了解更多。'
     btn: '同意'
+    name: '使用条款'
 post:
   outline: '目录'
   cover:

data/_data/locales/zh-Hant.yml

@@ -3,9 +3,14 @@ panel:
   posts: '文章'
   categories: '類別'
   tags: '標籤'
+  calendar: '日曆'
+  calendar_less: '少'
+  calendar_more: '多'
   hot_tags: '熱門標簽'
   links: '鏈接'
   update: '最近更新'
+  friends: '朋友們'
+  nolink: '暫無鏈接'
 footer:
   driver: '本站由 <a href="//jekyllrb.com" target="_blank" class="extlinks">Jekyll</a> 和 (基於 <a href="https://github.com/kaeyleo/jekyll-theme-H2O" target="_blank" class="extlinks">H2O</a> 的) <a href="https://github.com/zhonger/jekyll-theme-H2O-ac" target="_blank" class="extlinks">H2O-ac</a> 強力驅動'
   views: '總瀏覽量'
@@ -22,6 +27,7 @@ footer:
     middle: '本站使用條款'
     right: '了解更多。'
     btn: '同意'
+    name: '使用條款'
 post:
   outline: '目錄'
   cover:

data/_includes/{footer.html → layouts/footer.html}

@@ -6,7 +6,7 @@
     <div class="g-left">
       <section class="links">
         {{ footer.driver }}
-        {% if site.version %} (<a href="https://github.com/zhonger/jekyll-theme-H2O-ac/releases/tag/v.{{ site.version }}" target="_blank" class="extlinks">v{{ site.version }}</a>){% endif %}  
+        {% if site.version %} (<a href="https://github.com/zhonger/jekyll-theme-H2O-ac/releases/tag/v{{ site.version }}" target="_blank" class="extlinks">v{{ site.version }}</a>){% endif %}  
         {% if site.supports.webify %} & <a href="https://webify.cloudbase.net/" target="_blank" class="extlinks">CloudBase Webify</a> {% endif %}
       </section>
       <section class="links">{{ site.title }} ©
@@ -16,17 +16,31 @@
           -
         {% endunless %}
         {{ current }}
-        {% if site.beian %}
+        {% if site.beian and site.beian != "" %}
           <a href="https://beian.miit.gov.cn/" target="_blank" class="extlinks">{{ site.beian }}</a>
         {% endif %}
+        <a href="/rss.xml" target="_blank" aria-label="Terms of Service" class="others">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-rss"></use>
+          </svg> RSS  
+        </a>
+        <a href="/tos" target="_blank" aria-label="Terms of Service" class="others">
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-tos"></use>
+          </svg> {{footer.tos.name}}  
+        </a>
       </section>
       {% if site.busuanzi %}
-      <section>
+      <section class="links">
         <span id="busuanzi_container_site_pv">
-          👁️ {{ footer.views }} <span id="busuanzi_value_site_pv"></span> <b>·</b>
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-pv"></use>
+          </svg> {{ footer.views }} <span id="busuanzi_value_site_pv"></span> <b>·</b>
         </span>
         <span id="busuanzi_container_site_uv">
-          👤 {{ footer.visitors }} <span id="busuanzi_value_site_uv"></span>
+          <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-user"></use>
+          </svg> {{ footer.visitors }} <span id="busuanzi_value_site_uv"></span>
         </span>
       </section>
       {% endif %}
@@ -43,23 +57,28 @@
     <div class="g-right">
       {% if site.supports.upyun %}
       <section>
-        <a href="https://www.upyun.com/?utm_source=lianmeng&utm_medium=referral" target="_blank" class="extlinks">{{ footer.upyun }} <img src="{{ "/assets/icons/upyun.png" | relative_url }}" class="upyun" /></a>
+        <a href="https://www.upyun.com/?utm_source=lianmeng&utm_medium=referral" target="_blank" class="extlinks">{{ footer.upyun }} <img src="{{ "/assets/icons/upyun.png" | relative_url }}" class="upyun" alt="upyun" /></a>
       </section>
       {% endif %}
-      {% if site.foreverblog or site.wormhole or site.notbyAI %}
+      {% if site.badges.foreverblog or site.badges.wormhole or site.badges.travelling or site.badges.notbyAI %}
       <section class="badges">
-        {% if site.foreverblog %}
-          <a href="https://www.foreverblog.cn/" target="_blank" class="foreverblog"> 
+        {% if site.badges.foreverblog %}
+          <a href="https://www.foreverblog.cn/" target="_blank" class="foreverblog" aria-label="foreverblog"> 
             <img src="https://img.foreverblog.cn/logo_en_default.png" alt=""> 
           </a>
         {% endif %}
-        {% if site.wormhole %}
-          <a href="https://www.foreverblog.cn/go.html" target="_blank" class="wormhole"> 
+        {% if site.badges.wormhole %}
+          <a href="https://www.foreverblog.cn/go.html" target="_blank" class="wormhole" aria-label="wormhole"> 
             <img src="https://img.foreverblog.cn/wormhole_3.gif" alt="" title="穿梭虫洞-随机访问十年之约友链博客">
           </a>
         {% endif%}
-        {% if site.notbyAI %}
-          <a href="https://notbyai.fyi/" target="_blank" class="notbyAI"> 
+        {% if site.badges.travelling %}
+          <a href="https://www.travellings.cn/go.html" target="_blank" class="travelling-badge" aria-label="Travelling" rel="noopener" title="开往-友链接力">
+            <img src="https://www.travellings.cn/assets/logo.gif" alt="开往-友链接力">
+          </a>
+        {% endif %}
+        {% if site.badges.notbyAI %}
+          <a href="https://notbyai.fyi/" target="_blank" class="notbyAI" aria-label="notbyAI"> 
             <img src="{{ "/assets/icons/notbyAI-white.png" | prepend: site.baseurl }}" alt="Written by Human, Not by AI">
           </a>
         {% endif %}
@@ -76,26 +95,33 @@
 
   <button id="accept-tos">{{ footer.tos.btn }}</button>
 </div>
-<button id="list" aria-label="Scroll back to top" class="mobile-list" type="button">
-  <svg class="icon list day" aria-hidden="true">
-    <use xlink:href="#icon-list-day"></use>
-  </svg>
-  <svg class="icon list night" aria-hidden="true">
-    <use xlink:href="#icon-list-night"></use>
-  </svg>
-  <svg class="icon exit day" aria-hidden="true">
-    <use xlink:href="#icon-exit-day"></use>
-  </svg>
-  <svg class="icon exit night" aria-hidden="true">
-    <use xlink:href="#icon-exit-night"></use>
-  </svg>
-</button>
-<button id="bttb" aria-label="Scroll back to top" class="bttb" type="button">
-  <svg class="icon up day" aria-hidden="true">
-    <use xlink:href="#icon-up-day"></use>
-  </svg>
-  <svg class="icon up night" aria-hidden="true">
-    <use xlink:href="#icon-up-night"></use>
-  </svg>
-</button>
 
+<section id="tools">
+  {% if page.submenu %}
+  <div class="tool collection">
+    <svg class="icon b1 active" aria-hidden="true">
+      <use xlink:href="#icon-submenu"></use>
+    </svg>
+    <svg class="icon b2" aria-hidden="true">
+      <use xlink:href="#icon-exit"></use>
+    </svg>
+  </div>
+  {% endif %}
+  {% if page.content contains 'h1' or page.content contains 'h2' or page.content contains 'h3' or page.content contains 'h4' or page.content contains 'h5' or page.content contains 'h6' and site.toc %}
+  <div class="tool toc">
+    <svg class="icon b1 active" aria-hidden="true">
+      <use xlink:href="#icon-toc"></use>
+    </svg>
+    <svg class="icon b2" aria-hidden="true">
+      <use xlink:href="#icon-exit"></use>
+    </svg>
+  </div>
+  {% endif %}
+</section>
+<section id="bttb" aria-label="Scroll back to top" class="bttb">
+  <div class="tool">
+    <svg class="icon top" aria-hidden="true">
+      <use xlink:href="#icon-top"></use>
+    </svg>
+  </div>
+</section>

data/_includes/{post-head.html → layouts/head.html}

@@ -2,23 +2,21 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>{% if page.title %}{{ page.title }} - {{ site.title }}{% else %}{{ site.title }}{% endif %}</title>
-    <meta name="author"  content="{{ site.author }}">
+    <meta name="author" content="{{ site.author }}">
+    {% if layout.type == "post" %}
     <meta name="description" content="{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}">
-    <meta name="keywords"  content="{% if page.tags.size > 0 %}{% for tag in page.tags  %}{{ tag }}{% if forloop.last == false %}, {% endif %}{% endfor %}{% endif %}">
-    <!-- Open Graph -->
-    <meta property="og:title" content="{% if page.title %}{{ page.title }} - {{ site.title }}{% else %}{{ site.title }}{% endif %}">
-    <meta property="og:type" content="website">
-    <meta property="og:url" content="{{ page.url | prepend: site.url }}">
-    <meta property="og:baseurl" content="{{ site.baseurl }}">
-    <meta property="og:description" content="{{ site.description }}">
-    <meta property="og:site_name" content="{{ site.title }}">
-    <meta property="og:gray" content="{{ site.gray }}">
+    <meta name="keywords"
+        content="{% if page.tags.size > 0 %}{% for tag in page.tags  %}{{ tag }}{% if forloop.last == false %}, {% endif %}{% endfor %}{% endif %}">
     {% if page.next.url %}
     <meta property="og:previous_url" content="{{ page.next.url | relative_url }}">
     {% endif %}
     {% if page.previous.url %}
     <meta property="og:next_url" content="{{ page.previous.url | relative_url }}">
     {% endif %}
+    {% else %}
+    <meta name="description" content="{{ site.description }}">
+    <meta name="keywords" content="{{ site.keyword }}">
+    {% endif %}
     <meta property="post-date-format" content="{{ site.formats.time }}">
     {% case site.formats.time %}
     {% when 0 %}
@@ -28,6 +26,21 @@
     {% else %}
     <meta property="post-date" content="{{ page.date | date: '%Y年%-m月%-d日 %H:%M:%S %z'  }}" />
     {% endcase %}
+    {% if site.calendar %}
+    <meta property="calendar-scale" content="{{ site.calendar.scale | default: 'year' }}" />
+    <meta property="calendar-scheme" content="{{ site.calendar.scheme | default: 'null' }}" />
+    <meta property="calendar-color" content="{{ site.calendar.color | default: 'null' }}" />
+    {% endif %}
+    <!-- Open Graph -->
+    <meta property="og:title"
+        content="{% if page.title %}{{ page.title }} - {{ site.title }}{% else %}{{ site.title }}{% endif %}">
+    <meta property="og:type" content="website">
+    <meta property="og:url" content="{{ page.url | prepend: site.url }}">
+    <meta property="og:baseurl" content="{{ site.baseurl }}">
+    <meta property="og:description" content="{{ site.description }}">
+    <meta property="og:site_name" content="{{ site.title }}">
+    <meta property="og:gray" content="{{ site.gray }}">
+    <meta property="og:lang" content="{{ lang }}">
     {% if site.alivetime %}
     <meta name="alivestart" content="{{ site.alivestart }}">
     {% endif %}
@@ -35,29 +48,22 @@
     <meta name="google-site-verification" content="{{ site.google_search }}" />
     {% endif %}
     <meta name="theme-color" content="{{ site.pwa.color }}" />
-    <link rel="manifest" href="{{ "/manifest.json" | prepend: site.baseurl }}" />
-    <link rel="apple-touch-icon" href="{{ site.baseurl }}/assets/img/touch/apple-touch-icon.png"/>
+    <link rel="manifest" href="{{ " /manifest.json" | prepend: site.baseurl }}" />
+    <link rel="apple-touch-icon" href="{{ " /assets/img/touch/apple-touch-icon.png" | prepend: site.baseurl }}" />
     <link rel="Shortcut Icon" href="{{ site.favicon | prepend: site.baseurl }}">
     <link rel="icon" href="{{ site.favicon | prepend: site.baseurl }}" type="image/x-icon" />
     <link rel="bookmark" href="{{ site.favicon | prepend: site.baseurl }}" type="image/x-icon" />
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/normalize.min.css" />
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/normalize.min.css" async>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/lxgw-wenkai-screen-webfont@1.1.0/style.css" />
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/github-markdown-css@5.2.0/github-markdown-light.min.css">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/social-share.js@1.0.16/dist/css/share.min.css">
-    {% assign prisms1 = "coy,dark,funky,okaidia,solarizedlight,tomorrow,twilight" | split: "," %}
-    {% assign prisms2 = "a11y-dark,atom-dark,base16-ateliersulphurpool.light,cb,coldark-cold,coy-without-shadows,darcula,duotone-dark,duotone-earth,duotone-light,dutone-sea,dutone-space,ghcolors,gruvbox-dark,gruvbox-light,holi-theme,hopscotch,lucario,material-dark,material-light,material-oceanic,night-owl,nord,one-dark,one-light,pojoaque,shades-of-purple,solarized-dark-atom,synthwave84,vs,vsc-dark-plus,xonokai,z-touch" | split: "," %}
-    {% if prisms1 contains site.prism.theme %}
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.28.0/themes/prism-{{site.prism.theme}}.min.css" />
-    {% else if prisms2 contains site.prism.theme %}
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prism-themes@1.9.0/themes/prism-{{site.prism.theme}}.min.css" />
+    {% if layout.type == "post" %}
+    {% include plugins/others/social_css.html%}
+    {% include plugins/markdown/fancybox_css.html %}
     {% else %}
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.28.0/themes/prism.min.css" />
-    {% endif %}
-    {% if site.prism.line_numbers %}
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.28.0/plugins/line-numbers/prism-line-numbers.min.css">
+    {% include plugins/others/calendar_css.html %}
     {% endif %}
-    <link rel="stylesheet" href="{{ "/assets/css/app.min.css" | prepend: site.baseurl }}">
-    <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/@fancyapps/ui@4.0/dist/fancybox.min.css" />
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@waline/client/dist/waline.css" />
-    <script src="//cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
-</head>
+    {% include plugins/markdown/prism_css.html %}
+    {% include plugins/comments/waline_css.html %}
+    <link rel="stylesheet" href="{{ " /assets/css/app.min.css" | prepend: site.baseurl }}">
+    <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
+</head>

data/_includes/{header.html → layouts/header.html}

@@ -3,6 +3,15 @@
       <a href="{{ "/" | relative_url }}" aria-label="logo"></a>
     </div>
     <!-- <i id="menu-toggle" class="iconfont icon-menu"></i> -->
+    {% if site.badges.travelling %}
+    <div id="travelling-toggle">
+        <a href="https://www.travellings.cn/go.html" aria-label="Travelings" target="_blank">
+            <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-train-subway"></use>
+            </svg>
+        </a>
+    </div>
+    {% endif %}
     <div id="mode-toggle">
         <svg class="icon icon-day" aria-hidden="true">
             <use xlink:href="#icon-day"></use>
@@ -19,7 +28,7 @@
             {% for i in site.nav %}
                 {% if i[1].first %}
                 <li class="dropdown">
-                    <a class="dropdown-toggle"> {{ i[0] }} </a>
+                    <a class="dropdown-toggle" href="#"> {{ i[0] }} </a>
                     <ul class="dropdown-menu">
                     {% for j in i[1] %}
                         <li>
@@ -38,6 +47,15 @@
                 </li>
                 {% endif %}
             {% endfor %}
+            {% if site.badges.travelling %}
+            <li class="travelling">
+                <a href="https://www.travellings.cn/go.html" aria-label="Travelings" target="_blank">
+                    <svg class="icon" aria-hidden="true">
+                        <use xlink:href="#icon-train-subway"></use>
+                    </svg>
+                </a>
+            </li>
+            {% endif %}
             <li class="mode">
                 <svg class="icon day" aria-hidden="true">
                     <use xlink:href="#icon-day"></use>

data/_includes/layouts/metainfo.html

@@ -0,0 +1,40 @@
+<script src="https://cdn.jsdelivr.net/npm/dayjs@1.11.2/dayjs.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/dayjs@1.11.2/plugin/customParseFormat.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/dayjs@1.11.2/plugin/relativeTime.js"></script>
+<script>
+    $(document).ready(function () {
+        var time_formats = ['YYYY-MM-DD HH:mm:ss ZZ', 'YYYY DD MMM HH:mm:ss ZZ', 'YYYY年MM月DD日 HH:mm:ss ZZ'];
+        function dateFormat(date, format) {
+            var date_org = dayjs(date, time_formats[format]);
+            var date = date_org.format(time_formats[format]);
+            return { "date_org": date_org, "date": date }
+        }
+
+        dayjs.extend(window.dayjs_plugin_customParseFormat);
+        dayjs.extend(window.dayjs_plugin_relativeTime);
+        var post_date = $("meta[property='post-date']").attr('content');
+        var post_date_format = $("meta[property='post-date-format']").attr('content');
+        var local_post_date = dateFormat(post_date, post_date_format);
+
+        $(".post time span.create-at").html(local_post_date["date"]);
+
+        fetch("https://api.github.com/repos/{{ site.github.owner }}/{{ site.github.repository }}/commits?path={{ page.path }}").then((response) => {
+            return response.json();
+        }).then((commits) => {
+            if (commits.length != 0) {
+                var update_at = dayjs(commits[0]['commit']['committer']['date']);
+            } else {
+                var update_at = post_date
+            }
+
+            var local_update_at = dateFormat(update_at, post_date_format);
+            $('.post time span.update-at').html(local_update_at["date"]);
+
+            var relative_time = dayjs().diff(local_update_at["date_org"], 'day');
+            $(".post-copyright .tips span").append(relative_time);
+            if (relative_time > 365) {
+                $(".post-copyright .tips").addClass("active");
+            }
+        });
+    });
+</script>

data/_includes/{paginate-article.html → layouts/paginate-article.html}

@@ -1,7 +1,7 @@
 {% if post.pin %}
 <article class="article-item keep-top">
 {% else %}
-<article class="article-item keep-top">
+<article class="article-item">
 {% endif %}
     {% if post.cover %}
         <div class="post-cover">
@@ -11,7 +11,14 @@
     {% endif %}
     <section class="post-preview">
         <a class="post-link" href="{{ post.url | relative_url }}" title="{{ post.title }}"></a>
-        <h2 class="post-title">{% if post.pin %}<span class="keep-top">[置顶]</span> {% endif %}{{ post.title }}</h2>
+        <h2 class="post-title">
+            {% if post.pin %}
+                <svg class="icon" aria-hidden="true">
+                    <use xlink:href="#icon-pin"></use>
+                </svg>
+            {% endif %}
+            {{ post.title }}
+        </h2>
         {% if post.subtitle %}
         <h3 class="post-subtitle">{{ post.subtitle }}</h3>
         {% endif %}

data/_includes/{paginate.html → layouts/paginate.html}

@@ -15,13 +15,13 @@
     {% endif %}
     {% for i in (unpin_start..unpin_end) %}
         {% assign post = unpin_posts[i] %}
-        {% include paginate-article.html %}
+        {% include layouts/paginate-article.html %}
     {% endfor %}
 {% elsif pin_posts_num < max_num %}
     {% assign pin_end = pin_posts_num | minus: 1 %}
     {% for i in (min_num..pin_end) %}
         {% assign post = pin_posts[i] %}
-        {% include paginate-article.html %}
+        {% include layouts/paginate-article.html %}
     {% endfor %}
     {% assign unpin_end = max_num | minus: pin_posts_num | minus: 1 %}
     {% if unpin_end >= unpin_posts_num %}
@@ -29,13 +29,13 @@
     {% endif %}
     {% for i in (0..unpin_end) %}
         {% assign post = unpin_posts[i] %}
-        {% include paginate-article.html %}
+        {% include layouts/paginate-article.html %}
     {% endfor %}
 {% else %}
     {% assign pin_start = min_num %}
     {% assign pin_end = max_num | minus: 1 %}
     {% for i in (pin_start..pin_end) %}
         {% assign post = pin_posts[i] %}
-        {% include paginate-article.html %}
+        {% include layouts/paginate-article.html %}
     {% endfor %}
-{% endif %}
+{% endif %}

data/_includes/{sidebar.html → layouts/sidebar.html}

@@ -45,7 +45,9 @@
             </ul>
             {% endif %}
         </section>
-
+        {% if site.calendar %}
+            {% include plugins/others/calendar_block.html %}
+        {% endif %}
         {% if site.recommend-tags and site.tags.size>0 %}
         {% assign max_tag_count = 0 %}
         {% for tag in site.tags %}
@@ -54,7 +56,12 @@
             {% endif %}
         {% endfor %}
         <section class="tags-card">
-            <div class="links" rel="links">{{ panel.hot_tags }}</div>
+            <div class="links" rel="links">
+                <svg class="icon" aria-hidden="true">
+                    <use xlink:href="#icon-tags"></use>
+                </svg>                
+                {{ panel.hot_tags }}
+            </div>
             {% assign pnum = 0 %}
             {% for i in (1..max_tag_count) reversed %}
                 {% for tag in site.tags %}
@@ -75,7 +82,12 @@
 
         {% if site.links.size > 0 %}
         <section class="tags-card">
-            <div class="links" rel="links">{{ panel.links }}</div>
+            <div class="links" rel="links">
+                <svg class="icon" aria-hidden="true">
+                    <use xlink:href="#icon-links"></use>
+                </svg>       
+                {{ panel.links }}
+            </div>
             {% for link in site.links %}
                 <a href="{{ link[1] }}" target="_blank" class="tag" rel="noreferrer"> {{ link[0] }} </a>
             {% endfor %}
@@ -84,7 +96,12 @@
 
         <section class="tags-card">
             {% assign posts = site.posts | sort: "date" | reverse %}
-            <div class="links">{{ panel.update }}</div>
+            <div class="links">
+                <svg class="icon" aria-hidden="true">
+                    <use xlink:href="#icon-new"></use>
+                </svg>       
+                {{ panel.update }}
+            </div>
             <ul class="latest-articles">
                 {% for post in posts limit:3 %}
                     <li>