From c28b6ce7d1afb44caf7b717fc8dff966cc9343fd Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Fri, 26 Nov 2021 23:29:51 +0800 Subject: [PATCH 1/4] Fix markdown indentation --- README.md | 10 +++++----- _posts/2019-08-09-getting-started.md | 4 ++-- _posts/2021-01-03-enable-google-pv.md | 15 ++++++++------- docs/README.zh-CN.md | 9 ++++----- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 47f693d..a405a18 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@
- EN / - [中文(简体)](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/docs/README.zh-CN.md) + EN / [中文](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/docs/README.zh-CN.md)
@@ -9,14 +8,14 @@ # Chirpy Jekyll Theme + A minimal, responsive, and powerful Jekyll theme for presenting professional writing. + [![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://app.codacy.com/project/badge/Grade/4e556876a3c54d5e8f2d2857c4f43894)](https://www.codacy.com/gh/cotes2020/jekyll-theme-chirpy/dashboard?utm_source=github.com&utm_medium=referral&utm_content=cotes2020/jekyll-theme-chirpy&utm_campaign=Badge_Grade) [![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) - A minimal, responsive, and powerful Jekyll theme for presenting professional writing. - [**Live Demo →**](https://chirpy.cotes.info) [![Devices Mockup](https://cdn.jsdelivr.net/gh/cotes2020/chirpy-images@0a003683c0c3ca549d12c309f9b3e03ea20981e5/commons/devices-mockup.png)](https://chirpy.cotes.info) @@ -158,7 +157,8 @@ Now publish your Jekyll site by: 1. Push any commit to remote to trigger the GitHub Actions workflow. Once the build is complete and successful, a new remote branch named `gh-pages` will appear to store the built site files. 2. Browse to your repository on GitHub. Select the tab _Settings_, then click _Pages_ in the left navigation bar, and then in the section **Source** of _GitHub Pages_, select the `/(root)` directory of branch `gh-pages` as the [publishing source][pages-src]. Remember to click Save before leaving. - ![gh-pages-sources](https://cdn.jsdelivr.net/gh/cotes2020/chirpy-images@0a003683c0c3ca549d12c309f9b3e03ea20981e5/posts/20190809/gh-pages-sources.png) + + ![gh-pages-sources](https://cdn.jsdelivr.net/gh/cotes2020/chirpy-images@0a003683c0c3ca549d12c309f9b3e03ea20981e5/posts/20190809/gh-pages-sources.png) 3. Visit your website at the address indicated by GitHub. diff --git a/_posts/2019-08-09-getting-started.md b/_posts/2019-08-09-getting-started.md index 107fb94..3596dde 100644 --- a/_posts/2019-08-09-getting-started.md +++ b/_posts/2019-08-09-getting-started.md @@ -39,7 +39,6 @@ $ bash tools/init.sh The above command will: 1. Removes some files or directories from your repository: - - `.travis.yml` - files under `_posts` - folder `docs` @@ -123,7 +122,8 @@ Now publish your Jekyll site by: 1. Push any commit to remote to trigger the GitHub Actions workflow. Once the build is complete and successful, a new remote branch named `gh-pages` will appear to store the built site files. 2. Browse to your repository on GitHub. Select the tab _Settings_, then click _Pages_ in the left navigation bar, and then in the section **Source** of _GitHub Pages_, select the `/(root)` directory of branch `gh-pages` as the [publishing source][pages-src]. Remember to click Save before leaving. - ![gh-pages-sources](/posts/20190809/gh-pages-sources.png){: width="850" height="153" } + + ![gh-pages-sources](/posts/20190809/gh-pages-sources.png){: width="850" height="153" } 3. Visit your website at the address indicated by GitHub. diff --git a/_posts/2021-01-03-enable-google-pv.md b/_posts/2021-01-03-enable-google-pv.md index 8b62aa4..de3c3f7 100644 --- a/_posts/2021-01-03-enable-google-pv.md +++ b/_posts/2021-01-03-enable-google-pv.md @@ -113,15 +113,16 @@ There is a detailed [tutorial](https://developers.google.com/analytics/solutions 1. Clone the **Google Analytics superProxy** project on Github: to your local. -2. Remove the first 2 lines in the [`src/app.yaml`](https://github.com/googleanalytics/google-analytics-super-proxy/blob/master/src/app.yaml#L1-L2) file: - ```diff -- application: your-project-id -- version: 1 - ``` +2. Remove the first 2 lines in the [`src/app.yaml`](https://github.com/googleanalytics/google-analytics-super-proxy/blob/master/src/app.yaml#L1-L2) file: + + ```diff + - application: your-project-id + - version: 1 + ``` 3. In `src/config.py`, add the `OAUTH_CLIENT_ID` and `OAUTH_CLIENT_SECRET` that you gathered from your App Engine Dashboard. -4. Enter any random key for `XSRF_KEY`, your `config.py` should look similar to this +4. Enter any random key for `XSRF_KEY`, your `config.py` should look similar to this ```python #!/usr/bin/python2.7 @@ -145,7 +146,7 @@ There is a detailed [tutorial](https://developers.google.com/analytics/solutions **Tip:** You can configure a custom domain instead of `https://PROJECT_ID.REGION_ID.r.appspot.com`. But, for the sake of keeping it simple, we will be using the Google provided default URL. -5. From inside the src/ directory, deploy the app +5. From inside the src/ directory, deploy the app ```console [root@bc96abf71ef8 src]# gcloud app deploy diff --git a/docs/README.zh-CN.md b/docs/README.zh-CN.md index 4dcb10a..f18acf9 100644 --- a/docs/README.zh-CN.md +++ b/docs/README.zh-CN.md @@ -1,7 +1,6 @@
- 中文(简体) / - [EN](https://github.com/cotes2020/jekyll-theme-chirpy#readme) + [EN](https://github.com/cotes2020/jekyll-theme-chirpy#readme) / 中文
@@ -9,14 +8,14 @@ # Chirpy Jekyll Theme + 一款简约而强大、采用响应式设计的 Jekyll 主题,适合展示专业写作内容。 + [![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://app.codacy.com/project/badge/Grade/4e556876a3c54d5e8f2d2857c4f43894)](https://www.codacy.com/gh/cotes2020/jekyll-theme-chirpy/dashboard?utm_source=github.com&utm_medium=referral&utm_content=cotes2020/jekyll-theme-chirpy&utm_campaign=Badge_Grade) [![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) - 一款简约而强大、采用响应式设计的 Jekyll 主题,适合展示专业写作内容。 - [**线上体验 →**](https://chirpy.cotes.info) [![Devices Mockup](https://cdn.jsdelivr.net/gh/cotes2020/chirpy-images@0a003683c0c3ca549d12c309f9b3e03ea20981e5/commons/devices-mockup.png)](https://chirpy.cotes.info) @@ -158,7 +157,7 @@ $ docker run -it --rm \ 2. 回到 GitHub 上的仓库,选择标签 _Settings_ → 点击左侧导航栏的 _Pages_ → _GitHub Pages_ 选择分支 `gh-pages` 的 `/(root)` 作为「[发布源][pages-src]」: - ![gh-pages-sources](https://cdn.jsdelivr.net/gh/cotes2020/chirpy-images@0a003683c0c3ca549d12c309f9b3e03ea20981e5/posts/20190809/gh-pages-sources.png) + ![gh-pages-sources](https://cdn.jsdelivr.net/gh/cotes2020/chirpy-images@0a003683c0c3ca549d12c309f9b3e03ea20981e5/posts/20190809/gh-pages-sources.png) 3. 按照 GitHub 指示的地址去访问您的网站。 From e880448ba5f85bc5de608a5f8e93d5419930fbf1 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sun, 28 Nov 2021 21:13:57 +0800 Subject: [PATCH 2/4] Fix code-language conversion (`json`, `plaintext`) --- _includes/language-alias.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/_includes/language-alias.html b/_includes/language-alias.html index 26912a3..abfa7ba 100644 --- a/_includes/language-alias.html +++ b/_includes/language-alias.html @@ -41,8 +41,6 @@ {{ 'Perl' }} {% when 'php','php3','php4','php5' %} {{ 'PHP' }} - {% when 'plaintext', 'text' %} - {{ 'Text' }} {% when 'py' %} {{ 'Python' }} {% when 'rb' %} @@ -65,7 +63,7 @@ {{ 'Vue.js' }} {% when 'yml' %} {{ 'YAML' }} - {% when 'css', 'html', 'scss', 'ssh', 'toml', 'xml', 'yaml' %} + {% when 'css', 'html', 'scss', 'ssh', 'toml', 'xml', 'yaml', 'json' %} {{ _lang | upcase }} {% else %} {{ _lang | capitalize }} From a7361717a6d283426bf9efd722f452bb1e8c58b1 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sun, 28 Nov 2021 23:43:40 +0800 Subject: [PATCH 3/4] Exclude NPM lock-file from output --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 6ac98db..a58e0a7 100644 --- a/_config.yml +++ b/_config.yml @@ -159,7 +159,7 @@ exclude: - LICENSE - gulpfile.js - node_modules - - package.json + - package*.json jekyll-archives: enabled: [categories, tags] From 0bf7a8f1d9b89ff487c8af8336a01c0fcf6d5d44 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Mon, 29 Nov 2021 17:52:24 +0800 Subject: [PATCH 4/4] Bump version to 4.3.4 --- _javascript/copyright | 2 +- _sass/jekyll-theme-chirpy.scss | 2 +- assets/js/dist/categories.min.js | 2 +- assets/js/dist/commons.min.js | 2 +- assets/js/dist/home.min.js | 2 +- assets/js/dist/page.min.js | 2 +- assets/js/dist/post.min.js | 2 +- assets/js/dist/pvreport.min.js | 2 +- jekyll-theme-chirpy.gemspec | 2 +- package.json | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/_javascript/copyright b/_javascript/copyright index a0f49dc..c9baf3c 100644 --- a/_javascript/copyright +++ b/_javascript/copyright @@ -1,5 +1,5 @@ /*! - * Chirpy v4.3.3 (https://github.com/cotes2020/jekyll-theme-chirpy/) + * Chirpy v4.3.4 (https://github.com/cotes2020/jekyll-theme-chirpy/) * © 2019 Cotes Chung * MIT Licensed */ diff --git a/_sass/jekyll-theme-chirpy.scss b/_sass/jekyll-theme-chirpy.scss index 9e8e757..4d0314a 100644 --- a/_sass/jekyll-theme-chirpy.scss +++ b/_sass/jekyll-theme-chirpy.scss @@ -1,7 +1,7 @@ /*! * The styles for Jekyll theme Chirpy * - * Chirpy v4.3.3 (https://github.com/cotes2020/jekyll-theme-chirpy) + * Chirpy v4.3.4 (https://github.com/cotes2020/jekyll-theme-chirpy) * © 2019 Cotes Chung * MIT Licensed */ diff --git a/assets/js/dist/categories.min.js b/assets/js/dist/categories.min.js index 7400ce0..bcdc61e 100644 --- a/assets/js/dist/categories.min.js +++ b/assets/js/dist/categories.min.js @@ -1,5 +1,5 @@ /*! - * Chirpy v4.3.3 (https://github.com/cotes2020/jekyll-theme-chirpy/) + * Chirpy v4.3.4 (https://github.com/cotes2020/jekyll-theme-chirpy/) * © 2019 Cotes Chung * MIT Licensed */ diff --git a/assets/js/dist/commons.min.js b/assets/js/dist/commons.min.js index 3a99521..e73b3e0 100644 --- a/assets/js/dist/commons.min.js +++ b/assets/js/dist/commons.min.js @@ -1,5 +1,5 @@ /*! - * Chirpy v4.3.3 (https://github.com/cotes2020/jekyll-theme-chirpy/) + * Chirpy v4.3.4 (https://github.com/cotes2020/jekyll-theme-chirpy/) * © 2019 Cotes Chung * MIT Licensed */ diff --git a/assets/js/dist/home.min.js b/assets/js/dist/home.min.js index e14f5de..8e17459 100644 --- a/assets/js/dist/home.min.js +++ b/assets/js/dist/home.min.js @@ -1,5 +1,5 @@ /*! - * Chirpy v4.3.3 (https://github.com/cotes2020/jekyll-theme-chirpy/) + * Chirpy v4.3.4 (https://github.com/cotes2020/jekyll-theme-chirpy/) * © 2019 Cotes Chung * MIT Licensed */ diff --git a/assets/js/dist/page.min.js b/assets/js/dist/page.min.js index 20d52af..bda84d7 100644 --- a/assets/js/dist/page.min.js +++ b/assets/js/dist/page.min.js @@ -1,5 +1,5 @@ /*! - * Chirpy v4.3.3 (https://github.com/cotes2020/jekyll-theme-chirpy/) + * Chirpy v4.3.4 (https://github.com/cotes2020/jekyll-theme-chirpy/) * © 2019 Cotes Chung * MIT Licensed */ diff --git a/assets/js/dist/post.min.js b/assets/js/dist/post.min.js index 145c454..80e856d 100644 --- a/assets/js/dist/post.min.js +++ b/assets/js/dist/post.min.js @@ -1,5 +1,5 @@ /*! - * Chirpy v4.3.3 (https://github.com/cotes2020/jekyll-theme-chirpy/) + * Chirpy v4.3.4 (https://github.com/cotes2020/jekyll-theme-chirpy/) * © 2019 Cotes Chung * MIT Licensed */ diff --git a/assets/js/dist/pvreport.min.js b/assets/js/dist/pvreport.min.js index 43d8f1b..f5a75d7 100644 --- a/assets/js/dist/pvreport.min.js +++ b/assets/js/dist/pvreport.min.js @@ -1,5 +1,5 @@ /*! - * Chirpy v4.3.3 (https://github.com/cotes2020/jekyll-theme-chirpy/) + * Chirpy v4.3.4 (https://github.com/cotes2020/jekyll-theme-chirpy/) * © 2019 Cotes Chung * MIT Licensed */ diff --git a/jekyll-theme-chirpy.gemspec b/jekyll-theme-chirpy.gemspec index e0aab91..026d1b3 100644 --- a/jekyll-theme-chirpy.gemspec +++ b/jekyll-theme-chirpy.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |spec| spec.name = "jekyll-theme-chirpy" - spec.version = "4.3.3" + spec.version = "4.3.4" spec.authors = ["Cotes Chung"] spec.email = ["cotes.chung@gmail.com"] diff --git a/package.json b/package.json index 1f90a7d..e6bf648 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jekyll-theme-chirpy", - "version": "4.3.3", + "version": "4.3.4", "description": "A minimal, sidebar, responsive web design Jekyll theme that focuses on text presentation.", "main": "index.js", "directories": {