Skip to content

Commit 3c186dc

Browse files
committed
Merge branch 'hotfix/4.3.4'
1 parent 0126ab6 commit 3c186dc

16 files changed

+31
-33
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
<div align="right">
22

3-
EN /
4-
[中文(简体)](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/docs/README.zh-CN.md)
3+
EN / [中文](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/docs/README.zh-CN.md)
54

65
</div>
76

87
<div align="center">
98

109
# Chirpy Jekyll Theme
1110

11+
A minimal, responsive, and powerful Jekyll theme for presenting professional writing.
12+
1213
[![Gem Version](https://img.shields.io/gem/v/jekyll-theme-chirpy?color=brightgreen)](https://rubygems.org/gems/jekyll-theme-chirpy)
1314
[![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)
1415
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/4e556876a3c54d5e8f2d2857c4f43894)](https://www.codacy.com/gh/cotes2020/jekyll-theme-chirpy/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=cotes2020/jekyll-theme-chirpy&amp;utm_campaign=Badge_Grade)
1516
[![GitHub license](https://img.shields.io/github/license/cotes2020/jekyll-theme-chirpy.svg)](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/LICENSE)
1617
[![996.icu](https://img.shields.io/badge/link-996.icu-%23FF4D5B.svg)](https://996.icu)
1718

18-
A minimal, responsive, and powerful Jekyll theme for presenting professional writing.
19-
2019
[**Live Demo →**](https://chirpy.cotes.info)
2120

2221
[![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:
158157
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.
159158

160159
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 <kbd>Save</kbd> before leaving.
161-
![gh-pages-sources](https://cdn.jsdelivr.net/gh/cotes2020/chirpy-images@0a003683c0c3ca549d12c309f9b3e03ea20981e5/posts/20190809/gh-pages-sources.png)
160+
161+
![gh-pages-sources](https://cdn.jsdelivr.net/gh/cotes2020/chirpy-images@0a003683c0c3ca549d12c309f9b3e03ea20981e5/posts/20190809/gh-pages-sources.png)
162162

163163
3. Visit your website at the address indicated by GitHub.
164164

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ exclude:
159159
- LICENSE
160160
- gulpfile.js
161161
- node_modules
162-
- package.json
162+
- package*.json
163163

164164
jekyll-archives:
165165
enabled: [categories, tags]

_includes/language-alias.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
{{ 'Perl' }}
4242
{% when 'php','php3','php4','php5' %}
4343
{{ 'PHP' }}
44-
{% when 'plaintext', 'text' %}
45-
{{ 'Text' }}
4644
{% when 'py' %}
4745
{{ 'Python' }}
4846
{% when 'rb' %}
@@ -65,7 +63,7 @@
6563
{{ 'Vue.js' }}
6664
{% when 'yml' %}
6765
{{ 'YAML' }}
68-
{% when 'css', 'html', 'scss', 'ssh', 'toml', 'xml', 'yaml' %}
66+
{% when 'css', 'html', 'scss', 'ssh', 'toml', 'xml', 'yaml', 'json' %}
6967
{{ _lang | upcase }}
7068
{% else %}
7169
{{ _lang | capitalize }}

_javascript/copyright

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Chirpy v4.3.3 (https://github.com/cotes2020/jekyll-theme-chirpy/)
2+
* Chirpy v4.3.4 (https://github.com/cotes2020/jekyll-theme-chirpy/)
33
* © 2019 Cotes Chung
44
* MIT Licensed
55
*/

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ $ bash tools/init.sh
3939
The above command will:
4040

4141
1. Removes some files or directories from your repository:
42-
4342
- `.travis.yml`
4443
- files under `_posts`
4544
- folder `docs`
@@ -123,7 +122,8 @@ Now publish your Jekyll site by:
123122
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.
124123

125124
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 <kbd>Save</kbd> before leaving.
126-
![gh-pages-sources](/posts/20190809/gh-pages-sources.png){: width="850" height="153" }
125+
126+
![gh-pages-sources](/posts/20190809/gh-pages-sources.png){: width="850" height="153" }
127127

128128
3. Visit your website at the address indicated by GitHub.
129129

_posts/2021-01-03-enable-google-pv.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,16 @@ There is a detailed [tutorial](https://developers.google.com/analytics/solutions
113113

114114
1. Clone the **Google Analytics superProxy** project on Github: <https://github.com/googleanalytics/google-analytics-super-proxy> to your local.
115115

116-
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:
117-
```diff
118-
- application: your-project-id
119-
- version: 1
120-
```
116+
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:
117+
118+
```diff
119+
- application: your-project-id
120+
- version: 1
121+
```
121122

122123
3. In `src/config.py`, add the `OAUTH_CLIENT_ID` and `OAUTH_CLIENT_SECRET` that you gathered from your App Engine Dashboard.
123124

124-
4. Enter any random key for `XSRF_KEY`, your `config.py` should look similar to this
125+
4. Enter any random key for `XSRF_KEY`, your `config.py` should look similar to this
125126

126127
```python
127128
#!/usr/bin/python2.7
@@ -145,7 +146,7 @@ There is a detailed [tutorial](https://developers.google.com/analytics/solutions
145146

146147
**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.
147148

148-
5. From inside the src/ directory, deploy the app
149+
5. From inside the src/ directory, deploy the app
149150

150151
```console
151152
[root@bc96abf71ef8 src]# gcloud app deploy

_sass/jekyll-theme-chirpy.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* The styles for Jekyll theme Chirpy
33
*
4-
* Chirpy v4.3.3 (https://github.com/cotes2020/jekyll-theme-chirpy)
4+
* Chirpy v4.3.4 (https://github.com/cotes2020/jekyll-theme-chirpy)
55
* © 2019 Cotes Chung
66
* MIT Licensed
77
*/

assets/js/dist/categories.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/js/dist/commons.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/js/dist/home.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)