Skip to content

Commit a1551cd

Browse files
committed
Merge branch 'feature/code-style' into develop
2 parents cbe6c3f + 35c4d48 commit a1551cd

15 files changed

+143
-80
lines changed

README.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
[![Gem Version](https://img.shields.io/gem/v/jekyll-theme-chirpy?color=brightgreen)](https://rubygems.org/gems/jekyll-theme-chirpy)
1313
[![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)
14-
[![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)
14+
[![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)
1515
[![GitHub license](https://img.shields.io/github/license/cotes2020/jekyll-theme-chirpy.svg)](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/LICENSE)
1616
[![996.icu](https://img.shields.io/badge/link-996.icu-%23FF4D5B.svg)](https://996.icu)
1717

@@ -74,6 +74,7 @@ $ bash tools/init.sh
7474
The above command will:
7575

7676
1. Removes some files or directories from your repository:
77+
7778
- `.travis.yml`
7879
- files under `_posts`
7980
- folder `docs`
@@ -157,8 +158,7 @@ Now publish your Jekyll site by:
157158
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.
158159

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

@@ -190,18 +190,18 @@ It depends on how you use the theme:
190190

191191
- If you are using the theme gem (there will be `gem "jekyll-theme-chirpy"` in the `Gemfile`), editing the `Gemfile` and update the version number of the theme gem, for example:
192192

193-
```diff
194-
- gem "jekyll-theme-chirpy", "~> 3.2", ">= 3.2.1"
195-
+ gem "jekyll-theme-chirpy", "~> 3.3", ">= 3.3.0"
196-
```
193+
```diff
194+
- gem "jekyll-theme-chirpy", "~> 3.2", ">= 3.2.1"
195+
+ gem "jekyll-theme-chirpy", "~> 3.3", ">= 3.3.0"
196+
```
197197

198-
And then execute the following command:
198+
And then execute the following command:
199199

200-
```console
201-
$ bundle update jekyll-theme-chirpy
202-
```
200+
```console
201+
$ bundle update jekyll-theme-chirpy
202+
```
203203

204-
As the version upgrades, the critical files (for details, see the [Startup Template][starter]) and configuration options will change. Please refer to the [Upgrade Guide](https://github.com/cotes2020/jekyll-theme-chirpy/wiki/Upgrade-Guide) to keep your repo's files in sync with the latest version of the theme.
204+
As the version upgrades, the critical files (for details, see the [Startup Template][starter]) and configuration options will change. Please refer to the [Upgrade Guide](https://github.com/cotes2020/jekyll-theme-chirpy/wiki/Upgrade-Guide) to keep your repo's files in sync with the latest version of the theme.
205205

206206
- If you forked from the source project (there will be `gemspec` in the `Gemfile` of your site), then merge the [latest upstream tags][latest-tag] into your Jekyll site to complete the upgrade.
207207
The merge is likely to conflict with your local modifications. Please be patient and careful to resolve these conflicts.

_posts/2019-08-08-text-and-typography.md

+2-8
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ Fluttering and dancing in the breeze.
5252
### Unordered list
5353

5454
- Chapter
55-
- Section
56-
- Paragraph
55+
- Section
56+
- Paragraph
5757

5858
### Task list
5959

@@ -72,7 +72,6 @@ Sun
7272
Moon
7373
: the natural satellite of the earth, visible by reflected light from the sun
7474

75-
7675
## Block Quote
7776

7877
> This line to shows the Block Quote.
@@ -89,12 +88,10 @@ Moon
8988

9089
<http://127.0.0.1:4000>
9190

92-
9391
## Footnote
9492

9593
Click the hook will locate the footnote[^footnote], and here is another footnote[^fn-nth-2].
9694

97-
9895
## Images
9996

10097
- Default (with caption)
@@ -141,7 +138,6 @@ _shadow effect (visible in light mode)_
141138
cherry :active, c, after b a, 1d
142139
```
143140

144-
145141
## Mathematics
146142

147143
The mathematics powered by [**MathJax**](https://www.mathjax.org/):
@@ -152,12 +148,10 @@ When $a \ne 0$, there are two solutions to $ax^2 + bx + c = 0$ and they are
152148

153149
$$ x = {-b \pm \sqrt{b^2-4ac} \over 2a} $$
154150

155-
156151
## Inline code
157152

158153
This is an example of `Inline Code`.
159154

160-
161155
## Code block
162156

163157
### Common

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

-1
Original file line numberDiff line numberDiff line change
@@ -253,4 +253,3 @@ Or adding `render_with_liquid: false` (Requires Jekyll 4.0 or higher) to the pos
253253
## Learn More
254254

255255
For more knowledge about Jekyll posts, visit the [Jekyll Docs: Posts](https://jekyllrb.com/docs/posts/).
256-

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ $ bash tools/init.sh
3939
The above command will:
4040

4141
1. Removes some files or directories from your repository:
42+
4243
- `.travis.yml`
4344
- files under `_posts`
4445
- folder `docs`
@@ -122,8 +123,7 @@ Now publish your Jekyll site by:
122123
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.
123124

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

@@ -155,19 +155,19 @@ It depends on how you use the theme:
155155

156156
- If you are using the theme gem (there will be `gem "jekyll-theme-chirpy"` in the `Gemfile`), editing the `Gemfile` and update the version number of the theme gem, for example:
157157

158-
```diff
158+
```diff
159159
- gem "jekyll-theme-chirpy", "~> 3.2", ">= 3.2.1"
160160
+ gem "jekyll-theme-chirpy", "~> 3.3", ">= 3.3.0"
161-
```
162-
{: .nolineno file="Gemfile" }
161+
```
162+
{: .nolineno file="Gemfile" }
163163

164-
And then execute the following command:
164+
And then execute the following command:
165165

166-
```console
166+
```console
167167
$ bundle update jekyll-theme-chirpy
168-
```
168+
```
169169

170-
As the version upgrades, the critical files (for details, see the [Startup Template][starter]) and configuration options will change. Please refer to the [Upgrade Guide](https://github.com/cotes2020/jekyll-theme-chirpy/wiki/Upgrade-Guide) to keep your repo's files in sync with the latest version of the theme.
170+
As the version upgrades, the critical files (for details, see the [Startup Template][starter]) and configuration options will change. Please refer to the [Upgrade Guide](https://github.com/cotes2020/jekyll-theme-chirpy/wiki/Upgrade-Guide) to keep your repo's files in sync with the latest version of the theme.
171171

172172
- If you forked from the source project (there will be `gemspec` in the `Gemfile` of your site), then merge the [latest upstream tags][latest-tag] into your Jekyll site to complete the upgrade.
173173
The merge is likely to conflict with your local modifications. Please be patient and careful to resolve these conflicts.

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -202,17 +202,16 @@ In order to reduce the returned results and reduce the network bandwidth, we add
202202

203203
- **filters**: fill in `ga:pagePath=~^/posts/.*/$;ga:pagePath!@=`.
204204

205-
Among them, `;` means using _logical AND_ to concatenate two rules.
205+
Among them, `;` means using _logical AND_ to concatenate two rules.
206206

207-
If the `site.baseurl` is specified, change the first filtering rule to `ga:pagePath=~^/BASE_URL/posts/.*/$`, where `BASE_URL` is the value of `site.baseurl`.
207+
If the `site.baseurl` is specified, change the first filtering rule to `ga:pagePath=~^/BASE_URL/posts/.*/$`, where `BASE_URL` is the value of `site.baseurl`.
208208

209209
After <kbd>Run Query</kbd>, copy the generated contents of **API Query URI** at the bottom of the page and fill in the **Encoded URI for the query** of SuperProxy on GAE.
210210

211211
After the query is saved on GAE, a **Public Endpoint** (public access address) will be generated, and we will get the query result in JSON format when accessing it. Finally, click <kbd>Enable Endpoint</kbd> in **Public Request Endpoint** to make the query effective, and click <kbd>Start Scheduling</kbd> in **Scheduling** to start the scheduled task.
212212

213213
![superproxy-query](/posts/20210103/04-superproxy-query.png){: width="1100" height="126"}
214214

215-
216215
## Configure Chirpy to Display Page View
217216

218217
Once all the hard part is done, it is very easy to enable the Page View on Chirpy theme. Your superProxy dashboard should look something like below and you can grab the required values.

0 commit comments

Comments
 (0)