Bump version to 3.1.1

also:
- improve its responsive design
- fix the js path in gulp

.travis.yml

@@ -1,50 +1,36 @@
 os: linux
 dist: bionic
 
-language: minimal
+language: ruby
+rvm: 2.7.0
 
-jobs:
-  include:
+cache:
+  directories:
+    - $TRAVIS_BUILD_DIR/vendor/bundle
 
-    - name: CD
-      language: ruby
-      rvm: 2.7.0
+before_install:
+  - gem install bundler:2.2.4   # match the Gemfile.lock, travis' bundle is 2.1.2
+  - bundle config path 'vendor/bundle'
 
-      addons:
-        apt:
-          packages:
-            # required to avoid SSL error (for htmlproofer)
-            - libcurl4-openssl-dev
+install:
+  # overriding to drop the travis `--development` flag
+  - bundle install --jobs=3 --retry=3
 
-      cache:
-        directories:
-          - $TRAVIS_BUILD_DIR/vendor/bundle
+addons:
+  apt:
+    packages:
+      - libcurl4-openssl-dev  # required to avoid SSL error (for htmlproofer)
 
-      before_install:
-        # match the Gemfile.lock, travis' bundler is 2.1.2
-        - gem install bundler:2.2.4
-        - bundle config path 'vendor/bundle'
-
-      install:
-        # overriding to drop the travis `--development` flag
-        - bundle install --jobs=3 --retry=3
-
-      script:
-        - eval "$BUILD_CMD"
-
-      git:
-        depth: false # for posts' lastmod
-
-    - name: Flush Starter
-      script:
-        - eval "$FLUSH_STARTER"
-
-before_script:
+script:
   - git -C "$HOME" clone "$BUILDER_REPO" --depth=1 -q
+  - eval "$BUILD_CMD"
 
 branches:
   only: /.*-stable$/
 
+git:
+  depth: false # for posts lastmod
+
 notifications:
   email:
     recipients:

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jekyll-theme-chirpy (3.2.0)
+    jekyll-theme-chirpy (3.1.1)
       jekyll (~> 4.1)
       jekyll-archives (~> 2.2)
       jekyll-paginate (~> 1.1)
@@ -33,7 +33,7 @@ GEM
       typhoeus (~> 1.3)
       yell (~> 2.0)
     http_parser.rb (0.6.0)
-    i18n (1.8.8)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
     jekyll (4.2.0)
       addressable (~> 2.4)

README.md

@@ -5,7 +5,7 @@ Language: English | [简体中文](https://github.com/cotes2020/jekyll-theme-chi
 [![Gem Version](https://img.shields.io/gem/v/jekyll-theme-chirpy?color=brightgreen)](https://rubygems.org/gems/jekyll-theme-chirpy)
 [![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)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/8220b926db514f13afc3f02b7f884f4b)](https://app.codacy.com/manual/cotes2020/jekyll-theme-chirpy?utm_source=github.com&utm_medium=referral&utm_content=cotes2020/jekyll-theme-chirpy&utm_campaign=Badge_Grade_Dashboard)
-[![GitHub license](https://img.shields.io/github/license/cotes2020/jekyll-theme-chirpy.svg)](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/LICENSE)
+[![GitHub license](https://img.shields.io/github/license/cotes2020/jekyll-theme-chirpy.svg?color=blue)](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)
 
 A minimal, sidebar, responsive web design Jekyll theme that focuses on text presentation. Designed to help you record and share your knowledge easily. [Live Demo »](https://chirpy.cotes.info)
@@ -21,7 +21,7 @@ A minimal, sidebar, responsive web design Jekyll theme that focuses on text pres
 - [Documentation](#documentation)
 - [Contributing](#contributing)
 - [Credits](#credits)
-- [Support](#support)
+- [Supporting](#supporting)
 - [License](#license)
 
 ## Features
@@ -50,10 +50,10 @@ Follow the [Jekyll Docs](https://jekyllrb.com/docs/installation/) to complete th
 
 There are two ways to get the theme:
 
-- **Install from RubyGems** - Easy to update, isolate irrelevant project files so you can focus on writing.
-- **Fork on GitHub** - Convenient for custom development, but difficult to update, only suitable for web developers.
+- **Install from RubyGems** - Easy to upgrade, isolate irrelevant project files so you can focus on writing.
+- **Fork from GitHub** - Convenient for custom development, but difficult to upgrade, only suitable for web developers.
 
-### Installing the Theme Gem
+### Install From RubyGems
 
 Add this line to your Jekyll site's `Gemfile`:
 
@@ -77,15 +77,15 @@ Finally, copy the required files from the theme's gem (for detailed files, see [
 
 > **Hint**: To locate the installed theme’s gem, execute:
 >
-> ```console
-> $ bundle info --path jekyll-theme-chirpy
-> ```
+```console
+$ bundle info --path jekyll-theme-chirpy
+```
 
 Or you can [**use the starter template**][use-starter] to create a Jekyll site to save time copying files from theme's gem. We have prepared everything for you there!
 
-### Fork on GitHub
+### Fork From GitHub
 
-[Fork **Chirpy**](https://github.com/cotes2020/jekyll-theme-chirpy/fork) on GitHub and then clone your fork to local. (Please note that the default branch code is in development.  If you want the blog to be stable, please switch to the [latest tag](https://github.com/cotes2020/jekyll-theme-chirpy/tags) and start writing.)
+[Fork **Chirpy**](https://github.com/cotes2020/jekyll-theme-chirpy/fork) from GitHub and clone your fork to local.
 
 Install gem dependencies by:
 
@@ -209,13 +209,9 @@ Also, thank [JetBrains][jb] for providing the open source license.
 
 [![JB-logo](https://cdn.jsdelivr.net/gh/cotes2020/chirpy-images/commons/jetbrains.svg)][jb]
 
-## Support
+## Supporting
 
-If you like this theme or find it helpful, please consider sponsoring me, because it will encourage and help me better maintain the project, I will be very grateful!
-
-[![Buy Me a Coffee](https://img.shields.io/badge/Buy%20Me%20a%20Coffee-orange?logo=buy-me-a-coffee&logoColor=white)](https://www.buymeacoffee.com/coteschung)
-[![Wechat Pay](https://img.shields.io/badge/WeChat%20Pay-brightgreen?logo=wechat&logoColor=white)][cn-donation]
-[![Alipay](https://img.shields.io/badge/Alipay-blue?logo=alipay&logoColor=white)][cn-donation]
+If you enjoy this theme or find it helpful, please consider becoming my sponsor, I'd really appreciate it! Click the button <kbd>:heart: Sponsor</kbd> at the top of the [Home Page](https://github.com/cotes2020/jekyll-theme-chirpy) and choose a link that suits you to donate; this will encourage and help me better maintain the project.
 
 ## License
 
@@ -224,9 +220,5 @@ This work is published under [MIT](https://github.com/cotes2020/jekyll-theme-chi
 [starter]: https://github.com/cotes2020/chirpy-starter
 [use-starter]: https://github.com/cotes2020/chirpy-starter/generate
 [workflow]: https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/.github/workflows/pages-deploy.yml.hook
-
-<!-- ReadMe links -->
-
 [jb]: https://www.jetbrains.com/?from=jekyll-theme-chirpy
-[cn-donation]: https://cotes.gitee.io/alipay-wechat-donation/
 

_config.yml

@@ -154,8 +154,7 @@ exclude:
   - vendor
   - Gemfile
   - Gemfile.lock
-  - '*.gem'
-  - '*.gemspec'
+  - jekyll-theme-chirpy.gemspec
   - tools
   - docs
   - README.md

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

@@ -15,10 +15,10 @@ Follow the [Jekyll Docs](https://jekyllrb.com/docs/installation/) to complete th
 
 There are two ways to get the theme:
 
-- **Install from RubyGems** - Easy to update, isolate irrelevant project files so you can focus on writing.
-- **Fork on GitHub** - Convenient for custom development, but difficult to update, only suitable for web developers.
+- **Install from RubyGems** - Easy to upgrade, isolate irrelevant project files so you can focus on writing.
+- **Fork from GitHub** - Convenient for custom development, but difficult to upgrade, only suitable for web developers.
 
-### Installing the Theme Gem
+### Install From RubyGems
 
 Add this line to your Jekyll site's `Gemfile`:
 
@@ -42,15 +42,15 @@ Finally, copy the required files from the theme's gem (for detailed files, see [
 
 > **Hint**: To locate the installed theme’s gem, execute:
 >
-> ```console
-> $ bundle info --path jekyll-theme-chirpy
-> ```
+```console
+$ bundle info --path jekyll-theme-chirpy
+```
 
 Or you can [**use the starter template**][use-starter] to create a Jekyll site to save time copying files from theme's gem. We have prepared everything for you there!
 
-### Fork on GitHub
+### Fork From GitHub
 
-[Fork **Chirpy**](https://github.com/cotes2020/jekyll-theme-chirpy/fork) on GitHub and then clone your fork to local. (Please note that the default branch code is in development.  If you want the blog to be stable, please switch to the [latest tag](https://github.com/cotes2020/jekyll-theme-chirpy/tags) and start writing.)
+[Fork **Chirpy**](https://github.com/cotes2020/jekyll-theme-chirpy/fork) from GitHub and clone your fork to local.
 
 Install gem dependencies by:
 

_sass/addon/commons.scss

@@ -941,7 +941,7 @@ $sidebar-display: "sidebar-display";
   }
 
   > div {
-    width: 100%;
+    max-width: 100%;
 
     &:not(:last-child) {
       margin-bottom: 1rem;
@@ -1390,7 +1390,7 @@ $sidebar-display: "sidebar-display";
   }
 
   #search-results > div {
-    width: 46%;
+    max-width: 46%;
     &:nth-child(odd) {
       margin-right: 1.5rem;
     }

_sass/addon/syntax.scss

@@ -157,7 +157,7 @@ div {
 div[class^='language-']::before {
   content: attr(lang);
   position: absolute;
-  right: 2rem;
+  right: 1.8rem;
   margin-top: 3px;
   font-size: 0.7rem;
   font-weight: 600;
@@ -170,9 +170,3 @@ div[class^='language-']::before {
     right: 3.1rem;
   }
 }
-
-@media (min-width: 1650px) {
-  div[class^='language-']::before {
-    right: 3.5rem;
-  }
-}

_sass/jekyll-theme-chirpy.scss

@@ -1,7 +1,7 @@
 /*!
  * The styles for Jekyll theme Chirpy
  *
- * Chirpy v3.2.0 (https://github.com/cotes2020/jekyll-theme-chirpy)
+ * Chirpy v3.1.1 (https://github.com/cotes2020/jekyll-theme-chirpy)
  * © 2019 Cotes Chung
  * MIT Licensed
  */

assets/js/.copyright

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

assets/js/dist/categories.min.js

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

assets/js/dist/home.min.js

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

assets/js/dist/page.min.js

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

assets/js/dist/post.min.js

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

assets/js/dist/pvreport.min.js

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

docs/README.zh-CN.md

@@ -5,7 +5,7 @@ Language: [English](https://github.com/cotes2020/jekyll-theme-chirpy#readme) |
 [![Gem Version](https://img.shields.io/gem/v/jekyll-theme-chirpy?color=brightgreen)](https://rubygems.org/gems/jekyll-theme-chirpy)
 [![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)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/8220b926db514f13afc3f02b7f884f4b)](https://app.codacy.com/manual/cotes2020/jekyll-theme-chirpy?utm_source=github.com&utm_medium=referral&utm_content=cotes2020/jekyll-theme-chirpy&utm_campaign=Badge_Grade_Dashboard)
-[![GitHub license](https://img.shields.io/github/license/cotes2020/jekyll-theme-chirpy.svg)](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/LICENSE)
+[![GitHub license](https://img.shields.io/github/license/cotes2020/jekyll-theme-chirpy.svg?color=blue)](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)
 
 一个不一样的 Jekyll 主题，采用响应式设计，方便记录、管理、分享您的知识和经验。[懂的进 »](https://chirpy.cotes.info)
@@ -90,7 +90,7 @@ $ bundle info --path jekyll-theme-chirpy
 
 ### 在 GitHub 上 Fork
 
-[Fork **Chirpy**](https://github.com/cotes2020/jekyll-theme-chirpy/fork) 然后克隆到本地。(友情提示：默认分支的代码处于开发状态，如果您想博客更加稳定，请切换到最新的 [Tag](https://github.com/cotes2020/jekyll-theme-chirpy/tags) 开始写作。)
+[Fork **Chirpy**](https://github.com/cotes2020/jekyll-theme-chirpy/fork) 然后克隆到本地。
 
 安装依赖：
 
@@ -214,11 +214,7 @@ $ docker run -it --rm \
 
 ## 赞助
 
-如果您喜欢这个主题或者它对您有帮助，请考虑打赏作者，您的支持将会极大地鼓励作者，并帮助作者更好地维护项目！
-
-[![Buy Me a Coffee](https://img.shields.io/badge/Buy%20Me%20a%20Coffee-orange?logo=buy-me-a-coffee&logoColor=white)](https://www.buymeacoffee.com/coteschung)
-[![Wechat Pay](https://img.shields.io/badge/WeChat%20Pay-brightgreen?logo=wechat&logoColor=white)][cn-donation]
-[![Alipay](https://img.shields.io/badge/Alipay-blue?logo=alipay&logoColor=white)][cn-donation]
+如果您喜欢这个主题或者它对您有帮助，请考虑打赏作者：在 [项目主页](https://github.com/cotes2020/jekyll-theme-chirpy) 点击按钮 <kbd>:heart: Sponsor</kbd> 选择适合的链接即可完成（国内一般选第二个链接，支付宝/微信赞助），您的打赏将会极大地鼓励作者，并帮助作者更好地维护项目！
 
 ## 许可证书
 
@@ -227,8 +223,4 @@ $ docker run -it --rm \
 [starter]: https://github.com/cotes2020/chirpy-starter
 [use-starter]: https://github.com/cotes2020/chirpy-starter/generate
 [workflow]: https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/.github/workflows/pages-deploy.yml.hook
-
-<!-- ReadMe links -->
-
 [jb]: https://www.jetbrains.com/?from=jekyll-theme-chirpy
-[cn-donation]: https://cotes.gitee.io/alipay-wechat-donation/

jekyll-theme-chirpy.gemspec

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jekyll-theme-chirpy",
-  "version": "3.2.0",
+  "version": "3.1.1",
   "description": "A minimal, sidebar, responsive web design Jekyll theme that focuses on text presentation.",
   "main": "index.js",
   "directories": {

tools/bump.sh

@@ -10,14 +10,14 @@
 #
 # 2. Create a git-tag on release branch
 #
-# 3. Build a RubyGems package base on the latest git-tag
+# 3. Build a rubygem package
 #
 #
-# Requires: Git, Gulp, RubyGems
+# Requires: gulp, rubygem
 
 set -eu
 
-manual_release=false
+auto_release=true
 
 ASSETS=(
   "_sass/jekyll-theme-chirpy.scss"
@@ -58,8 +58,9 @@ check() {
 }
 
 _bump_assets() {
+  _version="$1"
   for i in "${!ASSETS[@]}"; do
-    sed -i "s/v[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+/v$1/" "${ASSETS[$i]}"
+    sed -i "s/v[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+/v$_version/" "${ASSETS[$i]}"
   done
 
   gulp
@@ -117,33 +118,21 @@ release() {
 
   _release_branch="$_major-$_minor-stable"
 
-  if $manual_release; then
-    echo -e "Bump version to $_version (manual release)\n"
-    bump "$_version"
-    exit 0
-  fi
-
   if [[ -z $(git branch -v | grep "$_release_branch") ]]; then
     git checkout -b "$_release_branch"
   else
     git checkout "$_release_branch"
-    # cherry-pick the latest commit from master branch to release branch
-    git cherry-pick "$(git rev-parse master)"
+    # cherry-pick the latest 2 commit from master to release branch
+    git cherry-pick "$(git rev-parse master~1)" "$(git rev-parse master)"
   fi
 
-  echo -e "Bump version to $_version\n"
-  bump "$_version"
-
   echo -e "Create tag v$_version\n"
   git tag "v$_version"
 
-  echo -e "Build the gem pakcage for v$_version\n"
   build_gem
 
   # head back to master branch
   git checkout master
-  # cherry-pick the latest commit from release branch to master branch
-  git cherry-pick "$_release_branch" -x
 
 }
 
@@ -163,10 +152,16 @@ main() {
       exit -1
     fi
 
-    release "$_version"
+    echo -e "Bump version to $_version\n"
+    bump "$_version"
+
+    echo -e "Release to v$_version\n"
+
+    if $auto_release; then
+      release "$_version"
+    fi
 
   else
-
     echo "Error: Illegal version number: '$_version'"
   fi
 
@@ -176,7 +171,7 @@ while (($#)); do
   opt="$1"
   case $opt in
     -m | --manual)
-      manual_release=true
+      auto_release=false
       shift
       ;;
     *)