Merge branch 'hotfix/2.4.2'

Code improvement

.github/CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at cotes.chung@gmail.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

.github/CONTRIBUTING.md

@@ -2,15 +2,21 @@
 
 I want to thank you for sparing a time to improve this project! Here are some guidelines for contributing：
 
-To ensure that the blog design is not confused, this project does not accept suggestions for design changes, such as color scheme, fonts, typography, etc. If your request is about an enhancement, it is recommended to first submit a `Feature Request` type issue to discuss whether your idea fits the project. 
+To ensure that the blog design is not confused, this project does not accept suggestions for design changes, such as color scheme, fonts, typography, etc. If your request is about an enhancement, it is recommended to first submit a [`Feature Request`](https://github.com/cotes2020/jekyll-theme-chirpy/issues/new?labels=enhancement&template=feature_request.md) issue to discuss whether your idea fits the project. 
 
 Generally, contribute to the project by:
 
-1. Fork this project.
-2. Create a new branch `my-new-feature`(or `fix-a-bug`), then complete the development, commit and push.
-3. Submit a new `Pull Request`.
+1. Fork this project on GitHub and clone it locally.
+2. Create a new branch named `feature/my-feature` (or `feature/fix-a-bug`), which branch from `develop`:
 
+    ```console
+    $ git checkout -b feature/<my-feature> develop
+    ```
+    > Please note that the new branch name must include the prefix `feature/`.
+
+3. After completing the development, commit and push to remote.
+4. Submit a new **pull request** to the `develop` branch of upstream, i.e., `cotes2020/jekyll-theme-chirpy:develop`.
 
 ---
 
-:tada:Your volunteering will make the open source world more beautiful, thanks again!:tada:
+:tada: Your volunteering will make the open source world more beautiful, thanks again! :tada:

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,19 +4,27 @@ about: Create a report to help us improve
 labels: bug
 ---
 
-<!-- Please make sure you have read the README or Wiki, and your question does not appear in other existing issues (including closed ones). Thanks for your cooperation! Now let's start it. -->
+<!-- Note: Please follow the template to open a new issue, otherwise your question will probably be ignored. -->
 
-**Describe the bug**
+## Checklist
+<!-- Please complete the following list of tasks, and then check it by change the "[ ]" to "[x]" -->
+- [ ] I have read the [tutorials](https://chirpy.cotes.info/categories/tutorial/) and know the correct effect of the functional design.
+- [ ] There are no similar reports on existing issues (including closed ones).
+- [ ] I found the bug on the latest code of `master` branch.
+
+
+## Describe the bug
 <!-- A clear and concise description of what the bug is. -->
 
 **To Reproduce**
-<!--
+
 Steps to reproduce the behavior:
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
--->
+
 
 **Expected behavior**
 <!-- A clear and concise description of what you expected to happen. -->
@@ -24,12 +32,14 @@ Steps to reproduce the behavior:
 **Screenshots**
 <!-- If applicable, add screenshots to help explain your problem. -->
 
-**Desktop (please complete the following information):**
+**Desktop**
+<!-- Please complete the following information -->
  - OS: [e.g. iOS]
  - Browser: [e.g. chrome, safari]
  - Version: [e.g. 22]
 
-**Smartphone (please complete the following information):**
+**Smartphone**
+<!-- please complete the following information -->
  - Device: [e.g. iPhone6]
  - OS: [e.g. iOS8.1]
  - Browser: [e.g. stock browser, safari]

.github/ISSUE_TEMPLATE/feature_request.md

@@ -4,18 +4,27 @@ about: Suggest an idea for this project
 labels: enhancement
 ---
 
-<!-- Please make sure your request does not appear in other existing issues (including closed ones). Thanks for your cooperation. Now, I can't wait to listen your idea! -->
+<!-- Note: Please follow the template to open a new issue, otherwise your question will probably be ignored. -->
+
+## Checklist
+<!-- Please complete the following list of tasks, and then check it by change the "[ ]" to "[x]" -->
+- [ ] I have read the [contributing guidelines](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/.github/CONTRIBUTING.md).
+- [ ] There are no similar request on existing issues (including closed ones).
+- [ ] I have read the [project progress](https://github.com/cotes2020/jekyll-theme-chirpy/projects) and know the current progress of the project.
+- [ ] I was in the `develop` branch of the latest code.
 
 
-**Is your feature request related to a problem? Please describe.**
+## Is your feature request related to a problem? Please describe
 <!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
 
-**Describe the solution you'd like**
+
+## Describe the solution you'd like
 <!-- A clear and concise description of what you want to happen. -->
 
-**Describe alternatives you've considered**
+
+## Describe alternatives you've considered
 <!-- A clear and concise description of any alternative solutions or features you've considered. -->
 
 
-**Additional context**
+## Additional context
 <!-- Add any other context or screenshots about the feature request here. -->

.github/ISSUE_TEMPLATE/question.md

@@ -4,54 +4,17 @@ about: Ask what ever you want
 labels: question
 ---
 
-<!-- Please make sure you have read the README or Wiki, and your question does not appear in other existing issues (including closed ones). Thanks for your cooperation. Now, uncomment the relevant part to describe the situation. -->
+<!-- Note: Please follow the template to open a new issue, otherwise your question will probably be ignored. -->
 
-<!-- 
-**Don't understand what the README or Wiki says.**
-Point out the parts that are hard for you to understand. 
--->
+## Checklist
 
-<!-- 
-**Want to complain about my bad days.**
-Don't hesitate to share your story!
--->
+<!-- Please complete the following list of tasks, and then check it by change the "[ ]" to "[x]" -->
 
-<!--
-**Just wanted to say hi to the author.**
-Hi, I'm ..., have a nice day ! 
--->
+- [ ] I have read the [tutorials](https://chirpy.cotes.info/categories/tutorial/) and know the correct effect of the functional design.
+- [ ] There are no similar question on existing issues (including closed ones).
+- [ ] I searched the Internet for related problems, but still couldn't solve it.
+- [ ] My question is based on the latest code of `master` branch.
 
 
-<!-- 
-**Not sure if it's a bug**
-Please try to describe the problem
-
-**To Reproduce**
-
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser: [e.g. chrome, safari]
- - Version: [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser: [e.g. stock browser, safari]
- - Version: [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here. 
--->
+## Description
+<!-- Please describe your question. -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,45 @@
+## Description
+
+<!-- 
+Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
+-->
+
+e.g. Fixes #(issue)
+
+## Type of change
+
+<!-- 
+Please select the desired item checkbox and change it to "[x]", then delete options that are not relevant.
+-->
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] Documentation update
+
+## How has this been tested?
+
+<!-- 
+Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
+-->
+
+- [ ] I have run `bash ./tools/build.sh && bash ./tools/test.sh` (at the root of the project) locally and passed
+- [ ] I have tested this feature in the browser
+
+**Test Configuration**
+
+* Browerser type & version:
+* Operating system:
+* Bundler version:
+* Ruby version:
+* Jekyll version:
+
+
+## Checklist:
+<!-- Select checkboxes by change the "[ ]" to "[x]" -->
+- [ ] My code follows the [Google style guidelines](https://google.github.io/styleguide/)
+- [ ] I have performed a self-review of my own code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation
+- [ ] My changes generate no new warnings
+- [ ] I have added tests that prove my fix is effective or that my feature works
+- [ ] Any dependent changes have been merged and published in downstream modules

.github/workflows/ci.yml

@@ -1,13 +1,13 @@
 name: 'Continuous Integration'
 on:
   push:
-    branches-ignore:
-      - stable
+    branches:
+      - '*'
     tags-ignore:
       - '*'
     paths-ignore:
       - '.github/**'
-      - '!.github/workflows/**'
+      - '!.github/workflows/ci.yml'
       - '.travis.yml'
       - '.gitignore'
       - 'docs/**'
@@ -15,7 +15,7 @@ on:
       - 'LICENSE'
   pull_request:
     paths:
-      - "**"
+      - '**'
 
 jobs:
   ci:

.github/workflows/issues-cleaner.yml

@@ -13,11 +13,12 @@ jobs:
       uses: actions/stale@v3
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: 'This issue is stale because it has been open ${{ env.DAYS_TO_STALE }} days with no activity. Remove stale label or comment or this will be closed in ${{ env.DAYS_TO_STALE }} days'
-        stale-pr-message: 'Stale pull request message'
-        stale-issue-label: 'no-activity'
-        exempt-issue-labels: 'pending,in-progress'
-        stale-pr-label: 'no-activity'
-        exempt-pr-labels: 'pending,in-progress'
+        stale-issue-message: 'This issue is stale because it has been open ${{ env.DAYS_TO_STALE }} days with no activity. Remove stale label or comment or this will be closed in ${{ env.DAYS_TO_CLOSE }} days'
+        stale-issue-label: 'stale'
+        exempt-issue-labels: 'pending, in progress'
+        stale-pr-message: 'This PR is stale because it has been open ${{ env.DAYS_TO_STALE }} days with no activity. Remove stale label or comment or this will be closed in ${{ env.DAYS_TO_CLOSE }} days'
+        stale-pr-label: 'stale'
+        exempt-pr-labels: 'pending, in progress'
         days-before-stale: ${{ env.DAYS_TO_STALE }}
         days-before-close: ${{ env.DAYS_TO_CLOSE }}
+        # debug-only: true

.travis.yml

@@ -23,7 +23,7 @@ script:
   - bash _cibuild.sh
 
 branches:
-  only: stable
+  only: master
 
 git:
   depth: false # for posts lastmod

README.md

@@ -2,7 +2,7 @@
 
 🌏 English • [简体中文](docs/README_zh-CN.md)
 
-[![Build Status](https://github.com/cotes2020/jekyll-theme-chirpy/workflows/build/badge.svg?event=push)](https://github.com/cotes2020/jekyll-theme-chirpy/actions?query=event%3Apush)
+[![Build Status](https://github.com/cotes2020/jekyll-theme-chirpy/workflows/build/badge.svg?branch=master&event=push)](https://github.com/cotes2020/jekyll-theme-chirpy/actions?query=branch%3Amaster+event%3Apush)
 [![GitHub license](https://img.shields.io/github/license/cotes2020/jekyll-theme-chirpy.svg)](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/LICENSE)
 [![996.icu](https://img.shields.io/badge/link-996.icu-%23FF4D5B.svg)](https://996.icu)
 
@@ -22,8 +22,9 @@ A minimal, sidebar, responsive web design Jekyll theme, focusing on text present
 
 ## Features
 
+* Pinned Posts
 * Configurable theme mode
-* Two-level Categories
+* Double-level Categories
 * Last modified date for posts
 * Table of Contents
 * Automatically recommend related posts
@@ -46,15 +47,15 @@ To improve the writing experience, we need to use some script tools. If your mac
 
 * Debian
 
-```console
-$ sudo apt-get install coreutils
-```
+  ```console
+  $ sudo apt-get install coreutils
+  ```
 
 * macOS
 
-```console
-$ brew install coreutils
-```
+  ```console
+  $ brew install coreutils
+  ```
 
 
 ### Jekyll Plugins
@@ -65,7 +66,7 @@ $ brew install coreutils
 $ git clone git@github.com:USER/jekyll-theme-chirpy.git -b master
 ```
 
-and replace the `USER` above to your GitHub username.
+And replace the `USER` above to your GitHub username.
 
 The first time you run or build the project on local machine, perform the installation of Jekyll plugins. Go to the root of repo and run:
 
@@ -81,7 +82,7 @@ $ bundle install
 
 ### Directory Structure
 
-The main files and related brief introductions are listed below.
+The main files and related brief introductions are listed below:
 
 ```sh
 jekyll-theme-chirpy/
@@ -112,8 +113,9 @@ jekyll-theme-chirpy/
 
 As mentioned above, some files or directories should be removed from your repo:
 
-- .travis.yml
-- .github
+```terminal
+$ rm -rf .travis.yml .github _posts/* 
+```
 
 
 ### Configuration
@@ -163,7 +165,7 @@ Before the deployment begins, checkout the file `_config.yml` and make sure that
 
 By deploying the site in this way, you're allowed to push the source code directly to the remote.
 
-> **Note**: If you want to use any third-party Jekyll plugins that not in [this list](https://pages.github.com/versions/), stop reading the current approach and go to [*Option 2: Build locally*](#option-2-build-locally).
+> **Note**: If you want to use any third-party Jekyll plugins that not on [this list](https://pages.github.com/versions/), stop reading the current approach and go to [*Option 2: Build locally*](#option-2-build-locally).
 
 **1**. Rename the repository to:
 
@@ -172,27 +174,24 @@ By deploying the site in this way, you're allowed to push the source code direct
 |User or Organization | `<username>.github.io`|
 |Project| Any one except `<username>.github.io`, let's say `project`|
 
-**2**. Commit the changes of the repo first, then run the initialization script:
+**2**. Commit the changes of the repo first, then run the publish script:
 
-```terminal
-$ bash tools/init.sh
+```console
+$ bash tools/publish.sh
 ```
 
->**Note**: The *Recent Update* requires the posts' latest git-log date, so make sure the changes in `_posts` have been committed before running this command.
+> Please note that the *Recent Update* list requires the latest git-log date of posts, thus make sure the changes in `_posts` have been committed before running this command.
 
-it will automatically generates the *Latest Modified Date* and *Categories / Tags* page for the posts and submit a commit. Its output is similar to the following log:
+it will automatically generates the *Latest Modified Date* and *Categories / Tags* page for the posts and submit a commit, and then push to `origin/master`. Its output is similar to the following log:
 
 ```terminal
 [INFO] Success to update lastmod for 4 post(s).
 [INFO] Succeed! 3 category-pages created.
 [INFO] Succeed! 4 tag-pages created.
-[Automation] Updated the Categories, Tags, Lastmod for post(s).
- 11 files changed, 46 insertions(+), 3 deletions(-)
- ...
-Updated the Categories, Tags, Lastmod for post(s).
+[INFO] Published successfully!
 ```
 
-**3**. Push the changes to `origin/master` then go to GitHub website and enable GitHub Pages service for the repo.
+**3**. Go to GitHub website and enable GitHub Pages service for the repo.
 
 **4**. Check it out:
 
@@ -204,7 +203,7 @@ Updated the Categories, Tags, Lastmod for post(s).
 
 #### Option 2: Build Locally
 
-For security reasons, GitHub Pages runs on `safe` mode, which means the third-party Jekyll plugins or custom scripts won't work. If you want to use any another plugins that not in the [whitelist](https://pages.github.com/versions/), **you have to generate the site locally rather than on GitHub Pages**.
+For security reasons, GitHub Pages runs on `safe` mode, which means the third-party Jekyll plugins or custom scripts won't work. If you want to use any other plugin that not on the [whitelist](https://pages.github.com/versions/), **you have to generate the site locally rather than on GitHub Pages**.
 
 **1**. Browse to GitHub website, create a brand new repo named: 
 
@@ -234,7 +233,7 @@ The generated static files will be placed in the root of `/path/to/local/project
 
 #### Finishing work
 
-No matter which way you choose to deploy the website on GitHub, please enforce the `HTTPS` for it. See official docs: [Configuring a publishing source for your GitHub Pages site](https://help.github.com/en/github/working-with-github-pages/securing-your-github-pages-site-with-https).
+No matter which way you choose to deploy the website on GitHub, please enforce the `HTTPS` for it. See official docs: [Securing your GitHub Pages site with HTTPS](https://help.github.com/en/github/working-with-github-pages/securing-your-github-pages-site-with-https).
 
 
 ### Documentation

_config.yml

@@ -45,18 +45,18 @@ google_site_verification: google_meta_tag_verification # change to your verifica
 
 #--------------------------
 
-# if your site type is Project Pages site, change below value to '/projectname'
+
+# Only if your site type is GitHub Project sites and doesn't have a custom domain,
+# change below value to '/projectname'.
 baseurl: ''
 
 # Change to your timezone › http://www.timezoneconverter.com/cgi-bin/findzone/findzone
 timezone: Asia/Shanghai
 
 google_analytics:
-  # Fill with your Google Analytics ID
-  id: ''
-  # The Google Analytics pageviews switch.
-
+  id: ''          # Fill with your Google Analytics ID
   pv:
+    # The Google Analytics pageviews switch.
     # DO NOT enable it unless you know how to deploy the Google Analytics superProxy.
     enabled: false
     # the next options only valid when `google_analytics.pv` is enabled.
@@ -101,6 +101,8 @@ kramdown:
       line_numbers: true
       start_line: 1
 
+# DO NOT change this unless you're a Pro user on Jekyll and Web development,
+# or you think you're smart enough to change other relevant URLs within this template.
 permalink: /posts/:title/
 
 defaults:
@@ -182,6 +184,7 @@ exclude:
   - tools
   - docs
   - README.md
+  - LICENSE
 
 sitemap_exclude:  # Sitemap will exclude the following items.
   fuzzy:

_data/contact.yml

@@ -19,10 +19,13 @@
   icon: 'fas fa-rss'
   noblank: true
 
-# Complete the url below to enable more contact options
--
-  icon: 'fab fa-linkedin'   # icons powered by <https://fontawesome.com/>
-  url:  ''                  # Fill with your Linkedin homepage
--
-  icon: 'fab fa-stack-overflow'
-  url:  ''                  # Fill with your stackoverflow homepage
+# Uncomment and complete the url below to enable more contact options
+# -
+#   icon: 'fab fa-mastodon'   # icons powered by <https://fontawesome.com/>
+#   url:  ''                  # Fill with your mastodon account page
+# -
+#   icon: 'fab fa-linkedin'   # icons powered by <https://fontawesome.com/>
+#   url:  ''                  # Fill with your Linkedin homepage
+# -
+#   icon: 'fab fa-stack-overflow'
+#   url:  ''                  # Fill with your stackoverflow homepage

_data/date_format.yml

@@ -6,4 +6,6 @@
 
 
 tooltip: "%a, %b %e, %Y, %l:%M %p %z"
-post: "%b %e, %Y"
+post:
+  long: "%b %e, %Y"
+  short: "%b %e"

_includes/css-selector.html

@@ -12,17 +12,17 @@
 
 {% elsif page.layout == 'page' %}
 
-  {% if page.title == 'Categories' %}
+  {% if page.type == 'categories' %}
 
     <link rel="preload" href="{{ '/assets/css/categories.css' | relative_url }}" as="style">
     <link rel="stylesheet" href="{{ '/assets/css/categories.css' | relative_url }}">
 
-  {% elsif page.title == 'Tags' %}
+  {% elsif page.type == 'tags' %}
 
     <link rel="preload" href="{{ '/assets/css/tags.css' | relative_url }}" as="style">
     <link rel="stylesheet" href="{{ '/assets/css/tags.css' | relative_url }}">
 
-  {% elsif page.title == 'Archives' %}
+  {% elsif page.type == 'archives' %}
 
     <link rel="preload" href="{{ '/assets/css/archives.css' | relative_url }}" as="style">
     <link rel="stylesheet" href="{{ '/assets/css/archives.css' | relative_url }}">

_includes/disqus.html

@@ -8,7 +8,7 @@
 -->
 
 <div id="disqus" class="pt-2 pb-4">
-  <p class="font-italic text-muted small">Comments powered by <a href="https://disqus.com/">Disqus</a>.</p>
+  <p class="font-italic text-center text-muted small">Comments powered by <a href="https://disqus.com/">Disqus</a>.</p>
 </div>
 
 <script src="{{ site.baseurl }}/assets/js/lib/jquery.disqusloader.min.js"></script>

_includes/fixlinenos.html

@@ -3,7 +3,10 @@
   https://github.com/penibelst/jekyll-compress-html/issues/101
   https://github.com/penibelst/jekyll-compress-html/issues/71#issuecomment-188144901
 -->
-{% if _content contains '<pre class="highlight">' %}
-  {% assign _content = _content | replace: '<pre class="highlight"><code', '<code' %}
-  {% assign _content = _content | replace: '</code></pre>', '</code>' %}
-{% endif %}
+{% if include.content contains '<pre class="highlight">' %}
+  {% assign content = include.content | replace: '<pre class="highlight"><code', '<code' %}
+  {% assign content = content | replace: '</code></pre>', '</code>' %}
+  {{ content }}
+{% else %}
+  {{ include.content }}
+{% endif %}

_includes/js-selector.html

@@ -22,7 +22,7 @@
 
 {% elsif page.layout == 'page' %}
 
-  {% if page.title == 'Categories' %}
+  {% if page.type == 'categories' %}
     <script src="{{ '/assets/js/categories.min.js' | relative_url }}" async></script>
   {% else %}
     <script src="{{ '/assets/js/page.min.js' | relative_url }}" async></script>

_includes/no-linenos.html

@@ -1,12 +1,14 @@
 {% comment %}
-  Remove line numbers from code snippets.
+  Remove the line number of the code snippet.
   v2.2
   https://github.com/cotes2020/jekyll-theme-chirpy
   © 2020 Cotes Chung
   Published under the MIT License
 {% endcomment %}
 
-{% if _content contains '<td class="rouge-gutter gl"><pre class="lineno">' %}
-  {% assign _content = _content | replace: '<td class="rouge-gutter gl"><pre class="lineno">', '<!-- <td class="rouge-gutter gl"><pre class="lineno">'%}
-  {% assign _content = _content | replace: '</td><td class="rouge-code">', '</td> --><td class="rouge-code">' %}
+{% assign content = include.content %}
+
+{% if content contains '<td class="rouge-gutter gl"><pre class="lineno">' %}
+  {% assign content = content | replace: '<td class="rouge-gutter gl"><pre class="lineno">', '<!-- <td class="rouge-gutter gl"><pre class="lineno">'%}
+  {% assign content = content | replace: '</td><td class="rouge-code">', '</td> --><td class="rouge-code">' %}
 {% endif %}

_includes/panel.html

@@ -12,7 +12,7 @@
 
   {% if site.data.updates %}
 
-    {% include update_list.html %}
+    {% include update-list.html %}
 
     {% if update_list.size > 0 %}
 
@@ -23,17 +23,12 @@
       <ul class="post-content pl-0 pb-1 ml-1 mt-2">
 
       {% for item in update_list %}
-        {% assign post_url = item | split: "::" | last | prepend: "/posts/" | append: "/" %}
+        {% assign post_url = item | split: "::" | last | url_encode | prepend: "/posts/" | append: "/" %}
         {% assign post = site.posts | where: "url", post_url | first %}
 
         {% if post %}
           {% assign url = post.url | relative_url %}
-
           <li><a href="{{ url }}">{{ post.title }}</a></li>
-
-          {% assign sum = sum | plus: 1 %}
-          {% if sum >= MAX_SIZE %} {% break %} {% endif %}
-
         {% endif %}
 
       {% endfor %}
@@ -45,7 +40,7 @@
 
   {% endif %} <!-- site.data.updates -->
 
-  {% include trending_tags.html %}
+  {% include trending-tags.html %}
 
   {% if trending_tags.size > 0 %}
     <div id="access-tags">
@@ -57,16 +52,15 @@
       {% for tag in trending_tags %}
         {% capture url %}/tags/{{ tag | downcase | url_encode }}/{% endcapture %}
         <a class="post-tag" href="{{ url | relative_url }}">{{ tag | replace: '-', ' ' }}</a>
-       {% endfor %}
+      {% endfor %}
       </div>
     </div>
   {% endif %}
-
   </div> <!-- .access -->
 
   {% if page.layout == 'post' and site.toc and page.toc %}
   <div id="toc-wrapper" class="pl-0 pr-4 mb-5">
-    <h3 data-toc-skip class="pl-3 pt-2 mb-3">
+    <h3 data-toc-skip class="pl-3 pt-2 mb-2">
       {{- site.data.label.panel.toc -}}
     </h3>
     <nav id="toc" data-toggle="toc"></nav>

_includes/related-posts.html

@@ -1,75 +1,110 @@
 <!--
- The related posts of current post.
- Placed in the bottom of every single post.
+ Recommend the other 3 posts according to the tags and categories of the current post,
+ if the number is not enough, use the other latest posts to supplement.
+
  v2.0
  https://github.com/cotes2020/jekyll-theme-chirpy
  © 2019 Cotes Chung
  Published under the MIT License
 -->
 
-{% assign MAX_SIZE = 3 %}
+<!-- The total size of related posts  -->
+{% assign TOTAL_SIZE = 3 %}
+
+<!-- An random integer that bigger than 0  -->
 {% assign TAG_SCORE = 1 %}
+
+<!-- Equals to TAG_SCORE / {max_categories_hierarchy}  -->
 {% assign CATEGORY_SCORE = 0.5 %}
 
+{% assign SEPARATOR = ":" %}
+
 {% assign score_list = "" | split: "" %}
-{% assign post_index = 0 %}
+{% assign last_index = site.posts.size | minus: 1 %}
 
-{% for post in site.posts %}
-  {% if post.url != page.url %}
-    {% assign score = 0 %}
-
-    {% for tag in post.tags %}
-      {% if page.tags contains tag %}
-        {% assign score = score | plus: TAG_SCORE %}
-      {% endif %}
-    {% endfor %}
-
-    {% for category in post.categories %}
-      {% if page.categories contains category %}
-        {% assign score = score | plus: CATEGORY_SCORE %}
-      {% endif %}
-    {% endfor %}
-
-    {% if score > 0 %}
-      {% capture score_item %}{{ score }}:{{ post_index }}{% endcapture %}
-      {% assign score_list = score_list | push: score_item %}
-    {% endif %}
+{% for i in (0..last_index) %}
+  {% assign post = site.posts[i] %}
 
+  {% if post.url == page.url %}
+    {% continue %}
   {% endif %}
-  {% assign post_index = post_index | plus: 1 %}
+
+  {% assign score = 0 %}
+
+  {% for tag in post.tags %}
+    {% if page.tags contains tag %}
+      {% assign score = score | plus: TAG_SCORE %}
+    {% endif %}
+  {% endfor %}
+
+  {% for category in post.categories %}
+    {% if page.categories contains category %}
+      {% assign score = score | plus: CATEGORY_SCORE %}
+    {% endif %}
+  {% endfor %}
+
+  {% if score > 0 %}
+    {% capture score_item %}{{ score }}{{ SEPARATOR }}{{ i }}{% endcapture %}
+    {% assign score_list = score_list | push: score_item %}
+  {% endif %}
+
 {% endfor %}
 
+
+{% assign index_list = "" | split: "" %}
+
 {% if score_list.size > 0 %}
   {% assign score_list = score_list | sort | reverse %}
-  {% assign count = 0 %}
+  {% for entry in score_list limit: TOTAL_SIZE %}
+    {% assign index = entry | split: SEPARATOR | last %}
+    {% assign index_list = index_list | push: index %}
+  {% endfor %}
+{% endif %}
+
+<!-- Fill with the other newlest posts  -->
+{% assign less = TOTAL_SIZE | minus: index_list.size %}
+
+{% if less > 0 %}
+
+  {% for i in (0..last_index) %}
+    {% assign post = site.posts[i] %}
+    {% if post.url != page.url  %}
+      {% capture cur_index %}{{ i }}{% endcapture %}
+      {% unless index_list contains cur_index %}
+        {% assign index_list = index_list | push: cur_index %}
+        {% assign less = less | minus: 1 %}
+        {% if less <= 0 %}
+          {% break %}
+        {% endif %}
+      {% endunless %}
+    {% endif %}
+  {% endfor %}
+
+{% endif %}
+
+
+{% if index_list.size > 0 %}
   <div id="related-posts" class="mt-4 mb-2 mb-sm-4 pb-2">
     <h3 class="pt-2 mt-1 mb-4 ml-1" data-toc-skip>{{ site.data.label.post.relate_posts }}</h3>
     <div class="card-deck mb-4">
-    {% for score_item in score_list %}
-      {% assign data = score_item | split: ":" %}
-      {% assign index = data[1] | plus: 0 %}
+    {% for entry in index_list %}
+      {% assign index = entry | plus: 0 %}
       {% assign post = site.posts[index] %}
       <div class="card">
         <a href="{{ post.url | relative_url }}">
           <div class="card-body">
-            <span class="timeago small">
-                {{ post.date | date: site.data.date_format.post }}
-                <i class="unloaded">{{ post.date | date_to_xmlschema }}</i>
-            </span>
+            {% include timeago.html date=post.date class="small" %}
             <h3 class="pt-0 mt-1 mb-3" data-toc-skip>{{ post.title }}</h3>
             <div class="text-muted small">
-              {% assign content = post.content %}
-              {% include no-linenos.html %}
-              <p>{{ content | markdownify | strip_html | truncate: 200 | replace: '&', '&amp;' }}</p>
+              <p>
+                {% include no-linenos.html content=post.content %}
+                {{ content | markdownify | strip_html | truncate: 200 }}
+              </p>
             </div>
           </div>
         </a>
       </div>
-      {% assign count = count | plus: 1 %}
-      {% if count >= MAX_SIZE %}
-        {% break %}
-      {% endif %}
     {% endfor %}
     </div> <!-- .card-deck -->
-  </div>
-{% endif %}
+  </div> <!-- #related-posts -->
+{% endif %}

_includes/search-results.html

@@ -9,11 +9,14 @@
   <div class="col-12 col-xl-11 post-content">
     <div id="search-hints">
       <h4 class="text-muted mb-4">{{ site.data.label.panel.trending_tags }}</h4>
-      {% include trending_tags.html %}
+
+      {% include trending-tags.html %}
+
       {% for tag in trending_tags %}
         {% capture url %}/tags/{{ tag | downcase | url_encode }}/{% endcapture %}
         <a class="post-tag" href="{{ url | relative_url }}">{{ tag | replace: '-', ' ' }}</a>
-       {% endfor %}
+      {% endfor %}
+
     </div>
     <div id="search-results" class="d-flex flex-wrap justify-content-center text-muted mt-3"></div>
   </div>

_includes/sidebar.html

@@ -15,7 +15,7 @@
         {% if start == '/' %}
           {% assign avatar_url = avatar_url | prepend: site.baseurl %}
         {% endif %}
-        <img src="{{ avatar_url }}" alt="avatar">
+        <img src="{{ avatar_url }}" alt="avatar" onerror="this.style.display='none'">
       </a>
     </div>
 
@@ -45,7 +45,7 @@
         or item.name == page.tab_active
         or item.name == "Home" and page.layout == "home" %}active{% endif %}">
       <a href="{{ ref }}" class="nav-link d-flex justify-content-center align-items-center w-100">
-        <i class="fa-fw {{ item.icon }} ml-3 mr-3 unloaded"></i>
+        <i class="fa-fw {{ item.icon }} ml-xl-3 mr-xl-3 unloaded"></i>
         <span>{{ item.name | upcase }}</span>
       </a>
     </li> <!-- .nav-item -->

_includes/timeago.html

@@ -0,0 +1,27 @@
+<!--
+  Date format snippet
+
+  v2.4.1
+  https://github.com/cotes2020/jekyll-theme-chirpy
+  © 2020 Cotes Chung
+  MIT License
+-->
+<span class="timeago {% if include.class %}{{ include.class }}{% endif %}"
+  {% if include.tooltip %}
+    data-toggle="tooltip"
+    data-placement="bottom"
+    title="{{ include.date | date: site.data.date_format.tooltip }}"
+  {% endif %}>
+
+  {% assign this_year = site.time | date: "%Y" %}
+  {% assign post_year = include.date | date: "%Y" %}
+
+  {% if post_year == this_year %}
+    {{ include.date | date: site.data.date_format.post.short }}
+  {% else %}
+    {{ include.date | date: site.data.date_format.post.long }}
+  {% endif %}
+
+  <i class="unloaded">{{ include.date | date_to_xmlschema }}</i>
+
+</span>

_includes/update-list.html

@@ -1,5 +1,5 @@
 {% comment %}
-  Get the last 5 post from lastmod list.
+  Get the last 5 posts from lastmod list.
   v2.2
   https://github.com/cotes2020/jekyll-theme-chirpy
   © 2020 Cotes Chung
@@ -7,15 +7,20 @@
 {% endcomment %}
 
 {% assign MAX_SIZE = 5 %}
-{% assign sum = 0 %}
-{% assign update_list = "" | split: "" %}
+
+{% assign all_list = "" | split: "" %}
 
 {% for entry in site.data.updates %}
   {% capture elem %}
     {{- entry.lastmod -}}::{{- entry.filename -}}
   {% endcapture %}
-
-  {% assign update_list = update_list | push: elem %}
+  {% assign all_list = all_list | push: elem %}
 {% endfor %}
 
-{% assign update_list = update_list | sort | reverse %}
+{% assign all_list = all_list | sort | reverse %}
+
+{% assign update_list = "" | split: "" %}
+
+{% for entry in all_list limit:MAX_SIZE %}
+  {% assign update_list = update_list | push: entry %}
+{% endfor %}

_layouts/category.html

@@ -18,7 +18,7 @@ layout: page
     <li class="d-flex justify-content-between pl-md-3 pr-md-3">
       <a href="{{ post.url | relative_url }}">{{ post.title }}</a>
       <span class="dash flex-grow-1"></span>
-      <span class="text-muted small">{{ post.date | date: site.data.date_format.post }}</span>
+      <span class="text-muted small">{{ post.date | date: site.data.date_format.post.long }}</span>
     </li>
     {% endfor %}
   </ul>

_layouts/default.html

@@ -36,15 +36,12 @@ layout: compress
     <div id="main-wrapper">
       <div id="main">
 
-        {% capture _content %}
-          {{ content }}
-        {% endcapture %}
-
-        {% include fixlinenos.html %}
-        {{ _content }}
+        {% include fixlinenos.html content=content %}
 
         {% include footer.html %}
+
       </div>
+
       {% include search-results.html %}
 
     </div> <!-- #main-wrapper -->

_layouts/home.html

@@ -7,28 +7,67 @@ layout: page
 # MIT Licensed
 ---
 
+
+{% assign pinned = site.posts | where_exp: "item", "item.pin == true"  %}
+{% assign default = site.posts | where_exp: "item", "item.pin == nil "  %}
+{% assign posts = "" | split: "" %}
+
+<!-- Get pinned posts -->
+
+{% assign offset = paginator.page | minus: 1 | times: paginator.per_page %}
+{% assign pinned_num = pinned.size | minus: offset %}
+
+{% if pinned_num > 0 %}
+  {% for i in (offset..pinned.size) limit: pinned_num %}
+    {% assign posts = posts | push: pinned[i] %}
+  {% endfor %}
+{% else %}
+  {% assign pinned_num = 0 %}
+{% endif %}
+
+
+<!-- Get default posts -->
+
+{% assign default_beg = offset | minus: pinned.size %}
+
+{% if default_beg < 0 %}
+  {% assign default_beg = 0 %}
+{% endif %}
+
+{% assign default_num = paginator.posts | size | minus: pinned_num  %}
+{% assign default_end = default_beg | plus: default_num | minus: 1 %}
+
+{% if default_num > 0 %}
+  {% for i in (default_beg..default_end) %}
+    {% assign posts = posts | push: default[i] %}
+  {% endfor %}
+{% endif %}
+
+
 <div id="post-list">
-  {% for post in paginator.posts %}
+
+{% for post in posts %}
+
   <div class="post-preview">
-    <h1>
-      <a href="{{ post.url | relative_url }}">{{ post.title }}</a>
-    </h1>
+    <div class="d-flex justify-content-between pr-xl-2">
+      <h1><a href="{{ post.url | relative_url }}">{{ post.title }}</a></h1>
+      {% if post.pin %}
+        <i class="fas fa-thumbtack fa-fw text-muted mt-1 ml-2 mt-xl-2" data-toggle="tooltip" data-placement="left"
+        title="Pinned"></i>
+      {% endif %}
+    </div>
     <div class="post-content">
       <p>
-      {% assign _content = post.content %}
-      {% include no-linenos.html %}
-      {{ _content | markdownify | strip_html | truncate: 200 }}
+        {% include no-linenos.html content=post.content %}
+        {{ content | markdownify | strip_html | truncate: 200 }}
       </p>
     </div>
 
     <div class="post-meta text-muted">
       <!-- posted date -->
       <i class="far fa-clock fa-fw"></i>
-      <span class="timeago" data-toggle="tooltip" data-placement="bottom"
-        title="{{ post.date | date: site.data.date_format.tooltip }}">
-      {{ post.date | date: site.data.date_format.post }}
-      <i class="unloaded">{{ post.date | date_to_xmlschema }}</i>
-      </span>
+      {% include timeago.html date=post.date tooltip=true %}
+
       <!-- page views -->
       {% if site.google_analytics.pv.enabled %}
       <i class="far fa-eye fa-fw"></i>
@@ -38,7 +77,9 @@ layout: page
       {% endif %}
     </div>
   </div> <!-- .post-review -->
-  {% endfor %}
+
+{% endfor %}
+
 </div> <!-- #post-list -->
 
 {% if paginator.total_pages > 0 %}

_layouts/post.html

@@ -19,16 +19,12 @@ layout: default
         <!-- Published date and author -->
         <div>
           Posted
-          <span class="timeago" data-toggle="tooltip" data-placement="bottom"
-           title="{{ page.date | date: site.data.date_format.tooltip }}">
-            {{ page.date | date: site.data.date_format.post }}
-            <i class="unloaded">{{ page.date | date_to_xmlschema }}</i>
-          </span>
+          {% include timeago.html date=page.date tooltip=true %}
           by
           <span class="author">
           {% if page.author %}
             {{ page.author }}
-          {% else%}
+          {% else %}
             {{ site.author }}
           {% endif %}
           </span>
@@ -39,17 +35,18 @@ layout: default
           {{ page.url | split: "/" | last }}
         {%- endcapture -%}
 
-        {% assign record = site.data.updates | where: "filename", filename | first %}
+        {% for item in site.data.updates %}
+          {% assign encode_filename = item.filename | url_encode %}
+          {% if filename == encode_filename %}
+            {% assign lastmod = item.lastmod %}
+            {% break %}
+          {% endif %}
+        {% endfor %}
 
-        {% if record %}
+        {% if lastmod %}
         <div>
           Updated
-          <span class="timeago lastmod"
-            data-toggle="tooltip" data-placement="bottom"
-             title="{{ record.lastmod | date: site.data.date_format.tooltip }}">
-            {{ record.lastmod | date: site.data.date_format.post }}
-            <i class="unloaded">{{ record.lastmod | date_to_xmlschema}}</i>
-          </span>
+          {% include timeago.html date=lastmod class="lastmod" tooltip=true %}
         </div>
         {% endif %}
 

_layouts/tag.html

@@ -18,7 +18,7 @@ layout: page
     <li class="d-flex justify-content-between pl-md-3 pr-md-3">
       <a href="{{ post.url | relative_url }}">{{ post.title }}</a>
       <span class="dash flex-grow-1"></span>
-      <span class="text-muted small">{{ post.date | date: site.data.date_format.post }}</span>
+      <span class="text-muted small">{{ post.date | date: site.data.date_format.post.long }}</span>
     </li>
     {% endfor %}
   </ul>

_posts/2019-08-08-write-a-new-post.md

@@ -73,7 +73,7 @@ tag: TAG_NAME               # e.g. bee
 ---
 ```
 
-With the increasing number of posts, the number of categories and tags will increase several times!  If we still manually create these *category*/*tag* type files, it will obviously be a super time-consuming job, and it is very likely to miss some of them(i.e. when you click on the missing `category` or `tag` link from a post or somewhere, it will complain to you '404'). The good news is that we got a lovely script tool `_scripts/sh/create_pages.sh` to finish the boring task. Basically we will use it via `tools/init.sh` instead of running it separately. Check out its use case [here]({{ "/posts/getting-started/#option-1-built-by-github-pages" | relative_url }}).
+With the increasing number of posts, the number of categories and tags will increase several times!  If we still manually create these *category*/*tag* type files, it will obviously be a super time-consuming job, and it is very likely to miss some of them(i.e. when you click on the missing `category` or `tag` link from a post or somewhere, it will complain to you '404'). The good news is that we got a lovely script tool `_scripts/sh/create_pages.sh` to finish the boring task. Basically we will use it via `tools/publish.sh` instead of running it separately. Check out its use case [here]({{ "/posts/getting-started/#option-1-built-by-github-pages" | relative_url }}).
 
 ## Last modified date
     
@@ -87,7 +87,7 @@ The last modified date of a post is obtained according to its latest git commit
   ... 
 ```
 
-You can choose to create this file manually, but as you may notice, the better approach is to let it be automatically generated by a tool script. And `_scripts/sh/dump_lastmod.sh` was born for this! Similar to the another script `_scripts/sh/create_pages.sh` mentioned above, it is also be called from `tools/init.sh`, so it doesn't have to be used separately.
+You can choose to create this file manually, but as you may notice, the better approach is to let it be automatically generated by a tool script. And `_scripts/sh/dump_lastmod.sh` was born for this! Similar to the another script `_scripts/sh/create_pages.sh` mentioned above, it is also be called from `tools/publish.sh`, so it doesn't have to be used separately.
 
 When some posts have been modified since their published date and also the file `_data/updates.yml` was created correctly, a list with the label **Recent Updates** will be displayed in the right panel of the desktop view, which records the five most recently modified articles.
 
@@ -124,6 +124,17 @@ math: true
 ```
 
 
+## Pinned Posts
+
+You can pin one or more posts to the top of the home page, and the fixed posts are sorted in reverse order according to their release date. Enable by:
+
+```yaml
+---
+pin: true
+---
+```
+
+
 ## Code Block
 
 Markdown symbols <code class="highlighter-rouge">```</code> can easily create a code block as following examples.

_posts/2019-08-09-getting-started.md

@@ -4,6 +4,7 @@ author: Cotes Chung
 date: 2019-08-09 20:55:00 +0800
 categories: [Blogging, Tutorial]
 tags: [getting started]
+pin: true
 ---
 
 ## Prerequisites
@@ -14,15 +15,15 @@ To improve the writing experience, we need to use some script tools. If your mac
 
 * Debian
 
-```console
-$ sudo apt-get install coreutils
-```
+  ```console
+  $ sudo apt-get install coreutils
+  ```
 
 * macOS
 
-```console
-$ brew install coreutils
-```
+  ```console
+  $ brew install coreutils
+  ```
 
 
 ## Jekyll Plugins
@@ -33,7 +34,7 @@ $ brew install coreutils
 $ git clone git@github.com:USER/jekyll-theme-chirpy.git -b master
 ```
 
-and replace the `USER` above to your GitHub username.
+And replace the `USER` above to your GitHub username.
 
 The first time you run or build the project on local machine, perform the installation of Jekyll plugins. Go to the root of repo and run:
 
@@ -46,7 +47,7 @@ $ bundle install
 
 ## Directory Structure
 
-The main files and related brief introductions are listed below.
+The main files and related brief introductions are listed below:
 
 ```sh
 jekyll-theme-chirpy/
@@ -76,9 +77,9 @@ jekyll-theme-chirpy/
 
 As mentioned above, some files or directories should be removed from your repo:
 
-- .travis.yml
-- .github
-
+```terminal
+$ rm -rf .travis.yml .github _posts/* 
+```
 
 ## Configuration
 
@@ -128,7 +129,7 @@ Before the deployment begins, checkout the file `_config.yml` and make sure that
 
 By deploying the site in this way, you're allowed to push the source code directly to the remote.
 
-> **Note**: If you want to use any third-party Jekyll plugins that not in [this list](https://pages.github.com/versions/), stop reading the current approach and go to [*Option 2: Build locally*](#option-2-build-locally).
+> **Note**: If you want to use any third-party Jekyll plugins that not on [this list](https://pages.github.com/versions/), stop reading the current approach and go to [*Option 2: Build locally*](#option-2-build-locally).
 
 **1**. Rename the repository to:
 
@@ -137,28 +138,24 @@ By deploying the site in this way, you're allowed to push the source code direct
 |User or Organization | `<username>.github.io`|
 |Project| Any one except `<username>.github.io`, let's say `project`|
 
-**2**. Commit the changes of the repo first, then run the initialization script:
+**2**. Commit the changes of the repo first, then run the publish script:
 
 ```console
-$ bash tools/init.sh
+$ bash tools/publish.sh
 ```
 
 > Please note that the *Recent Update* list requires the latest git-log date of posts, thus make sure the changes in `_posts` have been committed before running this command.
 
-it will automatically generates the *Latest Modified Date* and *Categories / Tags* page for the posts and submit a commit. Its output is similar to the following log:
+it will automatically generates the *Latest Modified Date* and *Categories / Tags* page for the posts and submit a commit, and then push to `origin/master`. Its output is similar to the following log:
 
 ```terminal
 [INFO] Success to update lastmod for 4 post(s).
 [INFO] Succeed! 3 category-pages created.
 [INFO] Succeed! 4 tag-pages created.
-[Automation] Updated the Categories, Tags, Lastmod for post(s).
- 11 files changed, 46 insertions(+), 3 deletions(-)
- ...
-Updated the Categories, Tags, Lastmod for post(s).
+[INFO] Published successfully!
 ```
 
-
-**3**. Push the changes to `origin/master` then go to GitHub website and enable GitHub Pages service for the repo.
+**3**. Go to GitHub website and enable GitHub Pages service for the repo.
 
 **4**. Check it out:
 
@@ -170,7 +167,7 @@ Updated the Categories, Tags, Lastmod for post(s).
 
 ### Option 2: Build Locally
 
-For security reasons, GitHub Pages runs on `safe` mode, which means the third-party Jekyll plugins or custom scripts won't work. If you want to use any another plugins that not in the [whitelist](https://pages.github.com/versions/), **you have to generate the site locally rather than on GitHub Pages**.
+For security reasons, GitHub Pages runs on `safe` mode, which means the third-party Jekyll plugins or custom scripts won't work. If you want to use any other plugin that not on the [whitelist](https://pages.github.com/versions/), **you have to generate the site locally rather than on GitHub Pages**.
 
 **1**. Browse to GitHub website, create a brand new repo named: 
 
@@ -200,4 +197,4 @@ The generated static files will be placed in the root of `/path/to/local/project
 
 ### Finishing work
 
-No matter which way you choose to deploy the website on GitHub, please enforce the `HTTPS` for it. See official docs: [Configuring a publishing source for your GitHub Pages site](https://help.github.com/en/github/working-with-github-pages/securing-your-github-pages-site-with-https).
+No matter which way you choose to deploy the website on GitHub, please enforce the `HTTPS` for it. See official docs: [Securing your GitHub Pages site with HTTPS](https://help.github.com/en/github/working-with-github-pages/securing-your-github-pages-site-with-https).

_scripts/sh/create_pages.sh

@@ -31,20 +31,21 @@ read_categories() {
   local _category=$(echo "$_yaml" | grep "^category:")
 
   if [[ ! -z "$_categories" ]]; then
-    echo "$_categories" | sed "s/categories: *//;s/\[//;s/\]//;s/, */,/g;s/\"//g;s/'//g"
+    echo "$_categories" | sed "s/categories: *//;s/\[//;s/\].*//;s/, */,/g;s/\"//g;s/'//g"
   elif [[ ! -z "_category" ]]; then
-    echo "$_category" | sed "s/category: *//;s/\[//;s/\]//;s/, */,/g;s/\"//g;s/'//g"
+    echo "$_category" | sed "s/category: *//;s/\[//;s/\].*//;s/, */,/g;s/\"//g;s/'//g"
   fi
 }
 
 
 read_tags() {
   local _yaml=$(_read_yaml $1)
-  echo "$_yaml" | grep "^tags:" | sed "s/tags: *//;s/\[//;s/\]//;s/, */,/g;s/\"//g;s/'//g"
+  echo "$_yaml" | grep "^tags:" | sed "s/tags: *//;s/\[//;s/\].*//;s/, */,/g;s/\"//g;s/'//g"
 }
 
 
 init() {
+
   if [[ -d categories ]]; then
     rm -rf categories
   fi
@@ -53,39 +54,47 @@ init() {
     rm -rf tags
   fi
 
+  if [[ ! -d _posts ]]; then
+    exit 0
+  fi
+
   mkdir categories tags
 }
 
 
 create_category() {
-  local _name=$1
-  local _filepath="categories/$(echo $_name | sed 's/ /-/g' | awk '{print tolower($0)}').html"
+  if [[ ! -z $1 ]]; then
+    local _name=$1
+    local _filepath="categories/$(echo $_name | sed 's/ /-/g' | awk '{print tolower($0)}').html"
 
-  if [[ ! -f $_filepath ]]; then
-    echo "---" > $_filepath
-    echo "layout: category" >> $_filepath
-    echo "title: $_name" >> $_filepath
-    echo "category: $_name" >> $_filepath
-    echo "---" >> $_filepath
+    if [[ ! -f $_filepath ]]; then
+      echo "---" > $_filepath
+      echo "layout: category" >> $_filepath
+      echo "title: $_name" >> $_filepath
+      echo "category: $_name" >> $_filepath
+      echo "---" >> $_filepath
 
-    ((category_count=category_count+1))
+      ((category_count=category_count+1))
+    fi
   fi
 }
 
 
 create_tag() {
-  local _name=$1
-  local _filepath="tags/$( echo $_name | sed "s/ /-/g;s/'//g" | awk '{print tolower($0)}' ).html"
+  if [[ ! -z $1 ]]; then
+    local _name=$1
+    local _filepath="tags/$( echo $_name | sed "s/ /-/g;s/'//g" | awk '{print tolower($0)}' ).html"
 
-  if [[ ! -f $_filepath ]]; then
+    if [[ ! -f $_filepath ]]; then
 
-    echo "---" > $_filepath
-    echo "layout: tag" >> $_filepath
-    echo "title: $_name" >> $_filepath
-    echo "tag: $_name" >> $_filepath
-    echo "---" >> $_filepath
+      echo "---" > $_filepath
+      echo "layout: tag" >> $_filepath
+      echo "title: $_name" >> $_filepath
+      echo "tag: $_name" >> $_filepath
+      echo "---" >> $_filepath
 
-    ((tag_count=tag_count+1))
+      ((tag_count=tag_count+1))
+    fi
   fi
 }
 
@@ -97,46 +106,45 @@ create_tag() {
 #   $2 - type specified option
 #########################################
 create_pages() {
-  if [[ $1 == '' ]]; then
-    exit 0
+  if [[ ! -z $1 ]]; then
+    # split string to array
+    IFS_BAK=$IFS
+    IFS=','
+    local _string=$1
+
+    case $2 in
+
+      $TYPE_CATEGORY)
+        for i in ${_string#,}; do
+          create_category $i
+        done
+        ;;
+
+      $TYPE_TAG)
+        for i in ${_string#,}; do
+          create_tag $i
+        done
+        ;;
+
+      *)
+        ;;
+
+      esac
+
+      IFS=$IFS_BAK
   fi
 
-  # split string to array
-  IFS_BAK=$IFS
-  IFS=','
-  local _string=$1
-
-  case $2 in
-
-    $TYPE_CATEGORY)
-      for i in ${_string#,}; do
-        create_category $i
-      done
-      ;;
-
-    $TYPE_TAG)
-      for i in ${_string#,}; do
-        create_tag $i
-      done
-      ;;
-
-    *)
-      ;;
-
-    esac
-
-    IFS=$IFS_BAK
-  }
+}
 
 
 main() {
+
   init
 
-  for _file in $(ls "_posts")
+  for _file in $(find "_posts" -type f \( -iname \*.md -o -iname \*.markdown \))
   do
-    local _path="_posts/$_file"
-    local _categories=$(read_categories "$_path")
-    local _tags=$(read_tags "$_path")
+    local _categories=$(read_categories "$_file")
+    local _tags=$(read_tags "$_file")
 
     create_pages "$_categories" $TYPE_CATEGORY
     create_pages "$_tags" $TYPE_TAG

_scripts/sh/dump_lastmod.sh

@@ -19,6 +19,7 @@ OUTPUT_FILE=updates.yml
 
 
 _init() {
+
   if [[ ! -d "$OUTPUT_DIR" ]]; then
     mkdir "$OUTPUT_DIR"
   fi
@@ -27,7 +28,9 @@ _init() {
     rm -f "$OUTPUT_DIR/$OUTPUT_FILE"
   fi
 
-  touch "$OUTPUT_DIR/$OUTPUT_FILE"
+  if [[ ! -d $POST_DIR ]]; then
+    exit 0
+  fi
 }
 
 
@@ -55,6 +58,10 @@ _has_changed() {
 _dump() {
   local _lasmod="`git log -1 --pretty=%ad --date=iso $2`"
 
+  if [[ ! -f "$OUTPUT_DIR/$OUTPUT_FILE" ]]; then
+    touch "$OUTPUT_DIR/$OUTPUT_FILE"
+  fi
+
   echo "-" >> "$OUTPUT_DIR/$OUTPUT_FILE"
   echo "  filename: '$1'" >> "$OUTPUT_DIR/$OUTPUT_FILE"
   echo "  lastmod: '$_lasmod'" >> "$OUTPUT_DIR/$OUTPUT_FILE"
@@ -67,14 +74,12 @@ main() {
 
   local _count=0
 
-  for _file in $(ls -r "$POST_DIR")
+  for _file in $(find ${POST_DIR} -type f \( -iname \*.md -o -iname \*.markdown \))
   do
-    _filepath="$POST_DIR/$_file"
-    _filename="${_file%.*}"     # jekyll cannot read the extension of a file, so omit it.
-    _filename=${_filename:11}   # remove the date
+    _filename=$(basename $_file | sed 's/[0-9]\([0-9]*-\)//g;s/\..*//' ) # remove date and extension
 
-    if _has_changed "$_filepath"; then
-      _dump "$_filename" "$_filepath"
+    if _has_changed "$_file"; then
+      _dump "$_filename" "$_file"
       ((_count=_count+1))
     fi
 

assets/css/_addon/main.scss

@@ -755,6 +755,8 @@ a {
 div.post-content {
   >table, li>table {
     min-width: 60%;
+    display: block;
+    overflow-x: auto;
     border-collapse: collapse;
     border-spacing: 0;
     margin-bottom: 1.5rem;

assets/css/_addon/module.scss

@@ -50,11 +50,8 @@
 }
 
 %anchor {
-  .post-content>&,
-  #page>& {
-    padding-top: 3.5rem;
-    margin-top: -2.5rem;
-  }
+  padding-top: 3.5rem;
+  margin-top: -2.5rem;
 }
 
 /*---------- scss mixin ---------*/

assets/css/_addon/syntax.scss

@@ -39,7 +39,7 @@ html[mode=dark] {
 }
 
 .highlighter-rouge {
-  background: var(--highlight-bg-color);
+  background-color: var(--highlight-bg-color);
   @extend %code-snippet-radius;
   color: var(--highlighter-rouge-color);
   margin-bottom: 1.2em; /* Override BS Inline-code style */
@@ -94,16 +94,21 @@ code {
   -moz-hyphens: none;
   hyphens: none;
   &.highlighter-rouge {
-    padding: 2px 4px;
+    padding: 3px 5px;
     margin: 0 .15rem;
     border-radius: 4px;
+    background-color: var(--inline-code-bg);
   }
   @at-root a>&.highlighter-rouge {
     padding-bottom: 0; // show link's underlinke
+    color: inherit;
   }
   @at-root a:hover>&.highlighter-rouge {
     border-bottom: none;
   }
+  blockquote &.highlighter-rouge {
+    color: inherit;
+  }
 }
 
 td.rouge-code {
@@ -111,9 +116,10 @@ td.rouge-code {
   padding-right: 1rem;
 }
 
-/* Hide line numbers for defualt, console, and terminal code snippets */
+/* Hide line numbers for default, console, and terminal code snippets */
 div {
   &[class^='highlighter-rouge'],
+  &.language-plaintext.highlighter-rouge,
   &.language-console.highlighter-rouge,
   &.language-terminal.highlighter-rouge {
     pre.lineno {

assets/css/_colors/dark-syntax.scss

@@ -83,6 +83,8 @@
   --highlight-lineno-color: #6c6c6d;
   --highlight-lineno-border-color: #3c4042;
 
+  --inline-code-bg: var(--highlight-bg-color);
+
   .highlight {
     .gp { color: #818c96; }
   }

assets/css/_colors/dark-typography.scss

@@ -45,6 +45,7 @@
   /* Home page */
   --post-list-text-color: rgb(175, 176, 177);
   --btn-patinator-text-color: var(--text-color);
+  --btn-paginator-hover-color: rgb(64, 65, 66);
   --btn-active-bg: rgba(28, 52, 94, 1);
   --btn-active-border-color: rgb(66, 94, 138);
   --btn-text-color: var(--text-color);

assets/css/_colors/light-syntax.scss

@@ -76,4 +76,5 @@
   --highlight-lineno-color: #c2c6cc;
   --highlight-lineno-border-color: #e9ecef;
 
+  --inline-code-bg: #f3f3f3;
 } // light-syntax

assets/css/_colors/light-typography.scss

@@ -63,12 +63,14 @@
 
   --input-focus-border-color: var(--btn-border-color);
 
-  /* Home */
+  /* Home page */
 
   --post-list-text-color: dimgray;
 
   --btn-patinator-text-color: #555555;
 
+  --btn-paginator-hover-color: #e9ecef;
+
   --btn-active-bg: #2a408e;
 
   --btn-active-border-color: #007bff;

assets/css/home.scss

@@ -11,90 +11,101 @@
 #post-list {
   margin-top: 1rem;
   padding-right: .5rem;
-  .post-meta {
-    i:not(:first-child) { // post-meta icons on HOME
-      margin-left: 1.5rem;
+
+  .post-preview {
+    padding-top: 1.5rem;
+    padding-bottom: 1rem;
+    border-bottom: 1px solid var(--main-border-color);
+
+    h1 {
+      font-size: 1.4rem;
+      margin: 0;
+      ~i { // pinned icon
+        font-size: .86rem;
+      }
     }
-  }
-}
+
+    .post-meta {
+      i {
+        font-size: .73rem;
+        &:not(:first-child) { // post-meta icons on the homepage
+          margin-left: 1.5rem;
+        }
+      }
+    }
+
+    .post-content {
+      margin-top: .6rem;
+      margin-bottom: .6rem;
+      color: var(--post-list-text-color);
+      >p {
+        /* Make preview shorter on the homepage */
+        margin: 0;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical;
+      }
+    }
+
+  } // .post-preview
+
+} // #post-list
 
 .pagination {
   font-size: 1rem;
   a:hover {
     text-decoration: none;
   }
-}
 
-.post-preview {
-  padding-top: 1.5rem;
-  padding-bottom: 1rem;
-  border-bottom: 1px solid var(--main-border-color);
-  >h1 {
-    font-size: 1.4rem;
-    margin: 0;
-  }
-  i.far { /* fontawesome icons */
-    font-size: 86%;
-  }
-  .post-content {
-    margin-top: .6rem;
-    margin-bottom: .6rem;
-    color: var(--post-list-text-color);
-    >p { /* Make preview shorter in Home page*/
-      margin: 0;
-      overflow: hidden;
-      text-overflow: ellipsis;
+  .page-item {
+    .page-link {
+      color: var(--btn-patinator-text-color);
+      width: 2.5rem;
+      height: 2.5rem;
+      padding: 0;
+      text-align: center;
       display: -webkit-box;
-      -webkit-line-clamp: 2;
-      -webkit-box-orient: vertical;
-    }
-  }
-}
-
-.page-item {
-  .page-link {
-    color: var(--btn-patinator-text-color);
-    width: 2.5rem;
-    height: 2.5rem;
-    padding: 0;
-    text-align: center;
-    display: -webkit-box;
-    display: flex;
-    -webkit-box-pack: center;
-    justify-content: center;
-    -webkit-box-align: center;
-    align-items: center;
-    border-radius: 50%;
-    border: 1px solid var(--btn-paginator-border-color);
-    font-family: 'Lato', sans-serif;
-    background-color: var(--button-bg);
-  }
-  &.active {
-    .page-link {
-      background-color: var(--btn-active-bg);
-      border-color: var(--btn-active-border-color);
-      box-shadow: 0 0 8px 0 var(--btn-paginator-shadow) !important;
-      color: var(--btn-text-color);
-    }
-  }
-  &.disabled {
-    cursor: not-allowed;
-    .page-link {
-      color: rgba(108, 117, 125, 0.57);
-      border-color: var(--btn-paginator-border-color);
+      display: flex;
+      -webkit-box-pack: center;
+      justify-content: center;
+      -webkit-box-align: center;
+      align-items: center;
+      border-radius: 50%;
+      border: 1px solid var(--btn-paginator-border-color);
+      font-family: 'Lato', sans-serif;
       background-color: var(--button-bg);
+      &:hover {
+        background-color: var(--btn-paginator-hover-color)
+      }
     }
-  }
-  &:first-child .page-link,
-  &:last-child .page-link {
-    border-radius: 50%;
-  }
-  &:not(:last-child) {
-    margin-right: 0.6rem;
-  }
-
-} // .page-item
+    &.active {
+      .page-link {
+        background-color: var(--btn-active-bg);
+        border-color: var(--btn-active-border-color);
+        box-shadow: 0 0 8px 0 var(--btn-paginator-shadow) !important;
+        color: var(--btn-text-color);
+      }
+    }
+    &.disabled {
+      cursor: not-allowed;
+      .page-link {
+        color: rgba(108, 117, 125, 0.57);
+        border-color: var(--btn-paginator-border-color);
+        background-color: var(--button-bg);
+      }
+    }
+    &:first-child .page-link,
+    &:last-child .page-link {
+      border-radius: 50%;
+    }
+    &:not(:last-child) {
+      margin-right: 0.7rem;
+    }
+  } // .page-item
 
+} // .pagination
 
 @media all and (max-width: 576px) {
   #post-list .post-meta>span i:not(:first-child) {
@@ -118,12 +129,12 @@
 
   .pagination {
     font-size: .85rem;
+    .page-item .page-link {
+      width: 2.2rem;
+      height: 2.2rem;
+    }
   }
 
-  .page-item .page-link {
-    width: 2.2rem;
-    height: 2.2rem;
-  }
 }
 
 /* Pannel hidden */

assets/css/post.scss

@@ -56,7 +56,7 @@ $prompt-newer: "{{ site.data.label.post.button.next }}";
 
 .post-navigation {
   padding-top: 3rem;
-  padding-bottom: 2rem;
+  padding-bottom: 4rem;
 
   .btn {
     @include btn-post-nav;
@@ -127,6 +127,7 @@ $prompt-newer: "{{ site.data.label.post.button.next }}";
 }
 
 #toc-wrapper {
+  margin-top: 7rem;
   border-left: 1px solid rgba(158, 158, 158, 0.17);
   position: -webkit-sticky;
   position: sticky;

assets/js/_home-post.js

@@ -13,7 +13,7 @@
 
 {% if site.google_analytics.pv.enabled %}
 
-  {% include_relative data/pv-data.js %}
+  {% include_relative _pv-config.js %}
 
   {% include_relative _utils/pageviews.js %}
 

assets/js/_pv-config.js

@@ -0,0 +1,14 @@
+/*!
+  PV configuration and Javascript conversion.
+*/
+
+const proxyEndpoint = "{{ site.google_analytics.pv.proxy_endpoint }}";
+
+
+{% if site.google_analytics.pv.cache and site.google_analytics.pv.enabled %}
+  {% assign enabled = true %}
+{% else %}
+  {% assign enabled = false %}
+{% endif %}
+
+const pvCacheEnabled = {{ enabled }};

assets/js/_utils/pageviews.js

@@ -24,19 +24,13 @@ function countUp(min, max, destId) {
 
 
 function countPV(path, rows) {
-  /* path permalink looks like: '/posts/post-title/' */
-  var fileName = path.replace(/\/posts\//g, '').replace(/\//g, '.html'); /* e.g. post-title.html */
   var count = 0;
 
-  var _v2_url = path.replace(/posts\//g, ''); /* the v2.0+ blog permalink: "/post-title/" */
-
   for (var i = 0; i < rows.length; ++i) {
     var gaPath = rows[i][0];
-    if (gaPath == path ||
-      gaPath == _v2_url ||
-      gaPath.concat('/') == _v2_url ||
-      gaPath.slice(gaPath.lastIndexOf('/') + 1) === fileName) { /* old permalink record */
+    if (gaPath == path) { /* path format see: site.permalink */
       count += parseInt(rows[i][1]);
+      break;
     }
   }
 
@@ -69,7 +63,7 @@ function displayPageviews(data) {
 
   if ($("#post-list").length > 0) { /* the Home page */
     $(".post-preview").each(function() {
-      var path = $(this).children("h1").children("a").attr("href");
+      var path = $(this).children("div").children("h1").children("a").attr("href");
       tacklePV(rows, path, $(this).find('.pageviews'), hasInit);
     });
 
@@ -94,10 +88,10 @@ var getInitStatus = (function() {
 
 var PvCache = (function() {
   const KEY_PV = "pv";
-  const KEY_CREATION = "pv-created-date";
-  const KEY_PV_TYPE = "pv-type";
+  const KEY_CREATION = "pv_created_date";
+  const KEY_PV_SRC = "pv_source";
 
-  var PvType = {
+  var Source = {
     ORIGIN: "origin",
     PROXY: "proxy"
   };
@@ -116,29 +110,29 @@ var PvCache = (function() {
     },
     saveOriginCache: function(pv) {
       set(KEY_PV, pv);
-      set(KEY_PV_TYPE, PvType.ORIGIN );
+      set(KEY_PV_SRC, Source.ORIGIN );
       set(KEY_CREATION, new Date().toJSON() );
     },
     saveProxyCache: function(pv) {
       set(KEY_PV, pv);
-      set(KEY_PV_TYPE, PvType.PROXY );
+      set(KEY_PV_SRC, Source.PROXY );
       set(KEY_CREATION, new Date().toJSON() );
     },
-    isOriginCache: function() {
-      return get(KEY_PV_TYPE) == PvType.ORIGIN;
+    isFromOrigin: function() {
+      return get(KEY_PV_SRC) == Source.ORIGIN;
     },
-    isProxyCache: function() {
-      return get(KEY_PV_TYPE) == PvType.PROXY;
+    isFromProxy: function() {
+      return get(KEY_PV_SRC) == Source.PROXY;
     },
     isExpired: function() {
-      if (PvCache.isOriginCache() ) {
+      if (PvCache.isFromOrigin() ) {
         let date = new Date(get(KEY_CREATION));
-        date.setDate(date.getDate() + 1); /* fetch origin-data every day */
+        date.setDate(date.getDate() + 1); /* update origin records every day */
         return Date.now() >= date.getTime();
 
-      } else if (PvCache.isProxyCache() ) {
+      } else if (PvCache.isFromProxy() ) {
         let date = new Date(get(KEY_CREATION) );
-        date.setHours(date.getHours() + 1); /* proxy-data is updated every hour */
+        date.setHours(date.getHours() + 1); /* update proxy records per hour */
         return Date.now() >= date.getTime();
       }
       return false;
@@ -148,26 +142,46 @@ var PvCache = (function() {
     },
     newerThan: function(pv) {
       return PvCache.getAllPagevies() > pv.totalsForAllResults["ga:pageviews"];
+    },
+    inspectKeys: function() {
+      if (localStorage.getItem(KEY_PV) == null
+        || localStorage.getItem(KEY_PV_SRC) == null
+        || localStorage.getItem(KEY_CREATION) == null) {
+        localStorage.clear();
+      }
     }
   };
 
 })(); /* PvCache */
 
 
-function fetchOriginPageviews(pvData) {
-  if (pvData === undefined) {
-    return;
+function fetchPageviews(fetchOrigin = true, filterOrigin = false) {
+  /* pvCacheEnabled › see: /assets/js/_pv-config.js */
+  if (pvCacheEnabled && fetchOrigin) {
+    fetch('/assets/js/data/pageviews.json')
+      .then(response => response.json())
+      .then(data => {
+        if (filterOrigin) {
+          if (PvCache.newerThan(data)) {
+            return;
+          }
+        }
+        displayPageviews(data);
+        PvCache.saveOriginCache(JSON.stringify(data));
+      })
+      .then(() => fetchProxyPageviews());
+
+  } else {
+    fetchProxyPageviews();
   }
-  displayPageviews(pvData);
-  PvCache.saveOriginCache(JSON.stringify(pvData));
+
 }
 
 
 function fetchProxyPageviews() {
-  let proxy = JSON.parse(proxyData); /* see file '/assets/data/pv-data.json' */
   $.ajax({
     type: 'GET',
-    url: proxy.url,
+    url: proxyEndpoint, /* see: /assets/js/_pv-config.js */
     dataType: 'jsonp',
     jsonpCallback: "displayPageviews",
     success: function(data, textStatus, jqXHR) {
@@ -184,40 +198,25 @@ $(function() {
 
   if ($('.pageviews').length > 0) {
 
+    PvCache.inspectKeys();
     let cache = PvCache.getData();
 
     if (cache) {
+      displayPageviews(cache);
+
       if (PvCache.isExpired()) {
-        if (PvCache.isProxyCache() ) {
-          let originPvData = pageviews ? JSON.parse(pageviews) : undefined;
-          if (originPvData) {
-            if (PvCache.newerThan(originPvData)) {
-              displayPageviews(cache);
-            } else {
-              fetchOriginPageviews(originPvData);
-            }
-          }
+        fetchPageviews(true, PvCache.isFromProxy());
 
-          fetchProxyPageviews();
+      } else {
 
-        } else if (PvCache.isOriginCache() ) {
-          fetchOriginPageviews(originPvData);
-          fetchProxyPageviews();
-        }
-
-      } else { /* still valid */
-        displayPageviews(cache);
-
-        if (PvCache.isOriginCache() ) {
-          fetchProxyPageviews();
+        if (PvCache.isFromOrigin()) {
+          fetchPageviews(false);
         }
 
       }
 
     } else {
-      let originPvData = pageviews ? JSON.parse(pageviews) : undefined;
-      fetchOriginPageviews(originPvData);
-      fetchProxyPageviews();
+      fetchPageviews();
     }
 
   }

assets/js/_utils/timeago.js

@@ -8,37 +8,41 @@
 
 $(function() {
 
-  function timeago(date, isLastmod) {
-    var now = new Date();
-    var past = new Date(date);
-    var seconds = Math.floor((now - past) / 1000);
+  function timeago(iso, isLastmod) {
+    let now = new Date();
+    let past = new Date(iso);
 
-    var year = Math.floor(seconds / 31536000);
-    if (year >= 1) {
-      return year + " year" + (year > 1 ? "s" : "") + " ago";
+    if (past.getFullYear() != now.getFullYear()) {
+      toRefresh -= 1;
+      return past.toLocaleString("en-US", {
+         year: 'numeric',
+         month: 'short',
+         day: 'numeric'
+      });
     }
 
-    var month = Math.floor(seconds / 2592000);
-    if (month >= 1) {
-      return month + " month" + (month > 1 ? "s" : "") + " ago";
+    if (past.getMonth() != now.getMonth()) {
+      toRefresh -= 1;
+      return past.toLocaleString("en-US", {
+         month: 'short',
+         day: 'numeric'
+      });
     }
 
-    var week = Math.floor(seconds / 604800);
-    if (week >= 1) {
-      return week + " week" + (week > 1 ? "s" : "") + " ago";
-    }
+    let seconds = Math.floor((now - past) / 1000);
 
-    var day = Math.floor(seconds / 86400);
+    let day = Math.floor(seconds / 86400);
     if (day >= 1) {
+      toRefresh -= 1;
       return day + " day" + (day > 1 ? "s" : "") + " ago";
     }
 
-    var hour = Math.floor(seconds / 3600);
+    let hour = Math.floor(seconds / 3600);
     if (hour >= 1) {
       return hour + " hour" + (hour > 1 ? "s" : "") + " ago";
     }
 
-    var minute = Math.floor(seconds / 60);
+    let minute = Math.floor(seconds / 60);
     if (minute >= 1) {
       return minute + " minute" + (minute > 1 ? "s" : "") + " ago";
     }
@@ -50,29 +54,30 @@ $(function() {
   function updateTimeago() {
     $(".timeago").each(function() {
       if ($(this).children("i").length > 0) {
+        var basic = $(this).text();
         var isLastmod = $(this).hasClass('lastmod');
         var node = $(this).children("i");
-        var date = node.text();   /* ISO Dates: 'YYYY-MM-DDTHH:MM:SSZ' */
+        var date = node.text();   /* ISO Date: 'YYYY-MM-DDTHH:MM:SSZ' */
         $(this).text(timeago(date, isLastmod));
         $(this).append(node);
       }
     });
 
-    if (vote == 0 && intervalId != undefined) {
+    if (toRefresh == 0 && intervalId != undefined) {
       clearInterval(intervalId);  /* stop interval */
     }
-    return vote;
+    return toRefresh;
   }
 
 
-  var vote = $(".timeago").length;
-  if (vote == 0) {
+  var toRefresh = $(".timeago").length;
+
+  if (toRefresh == 0) {
     return;
   }
 
-  if (updateTimeago() > 0) {      /* run immediately */
-    vote = $(".timeago").length;  /* resume */
-    var intervalId = setInterval(updateTimeago, 60000); /* loop every minutes */
+  if (updateTimeago() > 0) { /* run immediately */
+    var intervalId = setInterval(updateTimeago, 60000); /* run every minute */
   }
 
 });

assets/js/data/cache-list.js

@@ -42,19 +42,16 @@ const include = [
 
   /* The posts of first Home page and recent update list */
   {% assign post_list = "" | split: "" %}
-  {% assign sum = 0 %}
 
-  {% for post in site.posts %}
-    {% assign post_list = post_list | push: post.url %}
-    {% assign sum = sum | plus: 1 %}
-    {% if sum >= site.paginate %}
-      {% break %}
-    {% endif %}
+  {% for post in site.posts limit: site.paginate %}
+    {% capture post_url %}{{ post.url | relative_url }}{% endcapture %}
+    {% assign post_list = post_list | push: post_url %}
   {% endfor %}
 
-  {% include update_list.html %}
+  {% include update-list.html %}
+
   {% for item in update_list %}
-    {% assign url = item | split: "::" | last | prepend: "/posts/" | append: "/" %}
+    {% assign url = item | split: "::" | last | url_encode | prepend: "/posts/" | append: "/" | relative_url %}
     {% assign post_list = post_list | push: url %}
   {% endfor %}
 
@@ -65,7 +62,7 @@ const include = [
   {% endfor %}
 
   /* Trending tags */
-  {% include trending_tags.html %}
+  {% include trending-tags.html %}
   {% for tag in trending_tags %}
     {% capture tag_url %}/tags/{{ tag | downcase | url_encode }}/{% endcapture %}
     '{{ tag_url | relative_url }}',
@@ -106,6 +103,9 @@ const include = [
 ];
 
 const exclude = [
-  '/assets/js/data/pv-data.js',
+  {%- if site.google_analytics.pv.proxy_url and site.google_analytics.pv.enabled -%}
+    '{{ site.google_analytics.pv.proxy_url }}',
+  {%- endif -%}
+  '/assets/js/data/pageviews.json',
   '/img.shields.io/'
 ];

assets/js/data/pv-data.js

@@ -1,9 +0,0 @@
-const proxyData = '{"url": "{{ site.google_analytics.pv.proxy_endpoint }}"}';
-
-{%- capture pv_data -%}
-  {%- if site.google_analytics.pv.cache and site.google_analytics.pv.enabled -%}
-    {% include_relative data/_pageviews.json %}
-  {%- endif -%}
-{%- endcapture -%}
-
-const pageviews = '{{ pv_data }}';

assets/js/data/search.json

@@ -10,8 +10,7 @@ layout: compress
     "categories": "{{ post.categories | join: ', '}}",
     "tags": "{{ post.tags | join: ', ' }}",
     "date": "{{ post.date }}",
-    {% assign content = post.content %}
-    {% include no-linenos.html %}
+    {% include no-linenos.html content=post.content %}
     "snippet": "{{ content | strip_html | strip_newlines | remove_chars | escape | truncate: 300 | replace: '\', '\\\\' }}"
   }{% unless forloop.last %},{% endunless %}
   {% endfor %}

docs/README_zh-CN.md

@@ -2,7 +2,7 @@
 
 🌏 [English](../README.md) • 简体中文
 
-[![Build Status](https://github.com/cotes2020/jekyll-theme-chirpy/workflows/build/badge.svg?event=push)](https://github.com/cotes2020/jekyll-theme-chirpy/actions?query=event%3Apush)
+[![Build Status](https://github.com/cotes2020/jekyll-theme-chirpy/workflows/build/badge.svg?branch=master&event=push)](https://github.com/cotes2020/jekyll-theme-chirpy/actions?query=branch%3Amaster+event%3Apush)
 [![GitHub license](https://img.shields.io/github/license/cotes2020/jekyll-theme-chirpy.svg)](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/LICENSE)
 [![996.icu](https://img.shields.io/badge/link-996.icu-%23FF4D5B.svg)](https://996.icu)
 
@@ -24,7 +24,8 @@
 
 ## 功能预览
 
-* 自动暗夜模式
+* 文章置顶
+* 可配置的全局主题颜色
 * 文章最后修改日期
 * 文章目录
 * 自动推荐相关文章
@@ -113,10 +114,11 @@ jekyll-theme-chirpy/
 ```
 
 
-你需要将以下文件或目录删除:
+如备注所述，部分文件或目录需要被删除:
 
-- .travis.yml
-- .github
+```terminal
+$ rm -rf .travis.yml .github _posts/* 
+```
 
 
 ### 配置文件
@@ -176,25 +178,21 @@ $ bash tools/run.sh
 **2**. 提交本地更改，然后运行:
 
 ```console
-$ bash tools/init.sh
+$ bash tools/publish.sh
 ```
 
 >**注**: *最后更新* 列表根据文章的 git 修改记录生成，所以运行前先把 `_posts` 目录的修改提交。
 
-它会自动生成文章的 *最后修改日期* 和 *分类 / 标签* 页面，并自动提交一个 commit。输出日志类似如下：
+它会自动生成文章的 *最后修改日期* 和 *分类 / 标签* 页面，并自动提交一个 commit 并推送到 `origin/master` 。输出日志类似如下：
 
 ```terminal
 [INFO] Success to update lastmod for 4 post(s).
 [INFO] Succeed! 3 category-pages created.
 [INFO] Succeed! 4 tag-pages created.
-[Automation] Updated the Categories, Tags, Lastmod for post(s).
- 11 files changed, 46 insertions(+), 3 deletions(-)
- ...
-Updated the Categories, Tags, Lastmod for post(s).
+[INFO] Published successfully!
 ```
 
-
-**3**. 推送到 `origin/master` 然后到 GitHub 网页为该项目开启 Pages 服务。
+**3**. 到 GitHub 网页为该项目开启 Pages 服务。
 
 **4**. 网站将运行在：
 
@@ -237,7 +235,7 @@ $ bash tools/build.sh -d /path/to/local/project/
 
 #### 结束工作
 
-无论你选择了哪种方式部署网站到 GitHub Pages, 请开启 `HTTPS` 功能。具体细节参考官方说明：[Configuring a publishing source for your GitHub Pages site](https://help.github.com/en/github/working-with-github-pages/securing-your-github-pages-site-with-https)。
+无论你选择了哪种方式部署网站到 GitHub Pages, 请开启 `HTTPS` 功能。具体细节参考官方说明：[Securing your GitHub Pages site with HTTPS](https://help.github.com/en/github/working-with-github-pages/securing-your-github-pages-site-with-https)。
 
 ### 文档
 

tabs/archives.md

@@ -1,6 +1,6 @@
 ---
 title: Archives
-
+type: archives
 # The Archives of posts.
 # v2.0
 # https://github.com/cotes2020/jekyll-theme-chirpy

tabs/categories.md

@@ -1,6 +1,6 @@
 ---
 title: Categories
-
+type: categories
 # All the Categories of posts
 # v2.0
 # https://github.com/cotes2020/jekyll-theme-chirpy
@@ -8,6 +8,11 @@ title: Categories
 # MIT License
 ---
 
+{% assign HEAD_PREFIX = "h_" %}
+{% assign LIST_PREFIX = "l_" %}
+
+{% assign group_index = 0 %}
+
 {% assign sort_categories = site.categories | sort %}
 
 {% for category in sort_categories %}
@@ -32,7 +37,8 @@ title: Categories
 
   <div class="card categories">
     <!-- top-category -->
-    <div class="card-header d-flex justify-content-between hide-border-bottom" id="h_{{ category_name }}">
+    <div class="card-header d-flex justify-content-between hide-border-bottom"
+        id="{{ HEAD_PREFIX }}{{ group_index }}">
       <span>
       {% if sub_categories_size > 0 %}
         <i class="far fa-folder-open fa-fw"></i>
@@ -40,33 +46,39 @@ title: Categories
         <i class="far fa-folder fa-fw"></i>
       {% endif %}
         <a href="{{ site.baseurl }}/categories/{{ category_name | replace: ' ', '-' | downcase | url_encode }}/"
-          class="ml-1 mr-2">{{ category_name }}</a>
+          class="ml-1 mr-2">
+          {{ category_name }}
+        </a>
+
         <!-- content count -->
         {% assign top_posts_size = site.categories[category_name] | size %}
         <span class="text-muted small font-weight-light">
-        {% if sub_categories_size > 0 %}
-          {{ sub_categories_size }}
-          {% if sub_categories_size > 1 %}categories{% else %}category{% endif %},
-        {% endif %}
-          {{ top_posts_size }}
-          post{% if top_posts_size > 1 %}s{% endif %}
+          {% if sub_categories_size > 0 %}
+            {{ sub_categories_size }}
+            {% if sub_categories_size > 1 %}categories{% else %}category{% endif %},
+          {% endif %}
+            {{ top_posts_size }}
+            post{% if top_posts_size > 1 %}s{% endif %}
         </span>
       </span>
 
       <!-- arrow -->
-      <a href="#l_{{ category_name }}" data-toggle="collapse" aria-expanded="true" class="category-trigger hide-border-bottom">
-        {% if sub_categories_size > 0%}
+      {% if sub_categories_size > 0%}
+      <a href="#{{ LIST_PREFIX }}{{ group_index }}" data-toggle="collapse" aria-expanded="true"
+          class="category-trigger hide-border-bottom">
         <i class="fas fa-fw fa-angle-down"></i>
-        {% else %}
-        <i class="fas fa-fw fa-angle-right disabled"></i>
-        {% endif %}
       </a>
+      {% else %}
+      <span data-toggle="collapse" class="category-trigger hide-border-bottom disabled">
+        <i class="fas fa-fw fa-angle-right"></i>
+      </span>
+      {% endif %}
 
     </div> <!-- .card-header -->
 
     <!-- Sub-categories -->
     {% if sub_categories_size > 0 %}
-    <div id="l_{{ category_name }}" class="collapse show" aria-expanded="true">
+    <div id="{{ LIST_PREFIX }}{{ group_index }}" class="collapse show" aria-expanded="true">
       <ul class="list-group">
         {% for sub_category in sub_categories %}
         <li class="list-group-item">
@@ -85,5 +97,7 @@ title: Categories
 
   </div> <!-- .card -->
 
+    {% assign group_index = group_index | plus: 1 %}
+
   {% endif %}
 {% endfor %}

tabs/tags.md

@@ -1,6 +1,6 @@
 ---
 title: Tags
-
+type: tags
 # All the Tags of posts.
 # v2.0
 # https://github.com/cotes2020/jekyll-theme-chirpy

tools/publish.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 #
-# Initial the Categories/Tags pages and Lastmod for posts.
+# Initial the Categories/Tags pages and Lastmod for posts and then push to remote
+#
 # v2.0
 # https://github.com/cotes2020/jekyll-theme-chirpy
 # © 2019 Cotes Chung
@@ -15,19 +16,13 @@ LASTMOD=false
 WORK_DIR=$(dirname $(dirname $(realpath "$0")))
 
 check_status() {
-  local _watching_dirs=(
-    "_post"
-    "_data")
+  local _change=$(git status . -s)
 
-  for i in "${!_watching_dirs[@]}"
-  do
-    local _dir=${_watching_dirs[${i}]}
-    if [[ ! -z $(git status $_dir -s) ]]; then
-      echo "Warning: Commit the changes of the directory '$_dir' first."
-      git status -s | grep $_dir
-      exit 1
-    fi
-  done
+  if [[ ! -z ${_change} ]]; then
+    echo "Warning: Commit the following changes first:"
+    echo "$_change"
+    exit 1
+  fi
 }
 
 
@@ -72,12 +67,17 @@ commit() {
 
   if [[ $CATEGORIES = true || $TAGS = true || $LASTMOD = true ]]; then
     msg+=" for post(s)."
-    git commit -m "[Automation] $msg"
+    git commit -m "[Automation] $msg" -q
   else
     msg="Nothing changed."
   fi
 
-  echo $msg
+}
+
+
+push() {
+  git push origin master -q
+  echo "[INFO] Published successfully!"
 }
 
 
@@ -90,6 +90,9 @@ main() {
   update_files
 
   commit
+
+  push
 }
 
+
 main