Skip to content

Commit b534374

Browse files
kitian616kitian616
committed
fix: some url errors
1 parent 3c92c8d commit b534374

File tree

6 files changed

+60
-31
lines changed

6 files changed

+60
-31
lines changed

‎_config.demo.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,33 @@
44
# which you are expected to set up once and rarely need to edit after that.
55
# For technical reasons, this file is *NOT* reloaded automatically when you use
66
# 'jekyll serve'. If you change this file, please restart the server process.
7-
7+
#
88
# ,--------. ,--. ,--. ,--.
99
# '--. .--',---. \ `.' /,-' '-.
1010
# | | | .-. : .' \ '-. .-'
1111
# | | \ --. / .'. \ | |
1212
# `--' `----''--' '--' `--'
1313

1414
## Base settings ##
15-
url: https://tianqi.name #!the base hostname & protocol for your site e.g. https://www.someone.com (!!required!!)
15+
url: https://tianqi.name #the base hostname & protocol for your site e.g. https://www.someone.com
1616
baseurl: /jekyll-TeXt-theme
1717
title: Someone's blog
1818
description: > #this means to ignore newlines until "nav_lists:"
1919
Someone's Blog
2020
2121
nav_lists:
22-
# - title: About
2322
- titles:
2423
en: About
2524
zh: 关于
2625
zh-Hans: 关于
2726
zh-Hant: 關於
2827
url: /about.html
2928

29+
# paths:
30+
# home: /
31+
# all: /all.html
32+
# rss: /feed.xml
33+
3034
## GitHub repository (if the site is hosted by GitHub) ##
3135
repository: kitian616/jekyll-TeXt-theme
3236
repository_tree: master
@@ -68,7 +72,7 @@ paginate_path: /blog/page:num
6872

6973
## Post excerpts ##
7074
excerpt_separator: <!--more-->
71-
excerpt_type: html ## text | html
75+
excerpt_type: html # text | html
7276

7377
## Build ##
7478
markdown: kramdown
@@ -77,12 +81,14 @@ permalink: date
7781

7882
exclude:
7983
- CHANGELOG.md
84+
- CHECKLIST.md
85+
- README-*.md
8086
- README.md
8187
- LICENSE
82-
- /vendor
8388
- /docs
8489
- /screenshots
8590
- /test
91+
- /vendor
8692

8793
## Plugins ##
8894
gems:

‎_config.dev.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,21 @@
44
# which you are expected to set up once and rarely need to edit after that.
55
# For technical reasons, this file is *NOT* reloaded automatically when you use
66
# 'jekyll serve'. If you change this file, please restart the server process.
7-
7+
#
88
# ,--------. ,--. ,--. ,--.
99
# '--. .--',---. \ `.' /,-' '-.
1010
# | | | .-. : .' \ '-. .-'
1111
# | | \ --. / .'. \ | |
1212
# `--' `----''--' '--' `--'
1313

1414
## Base settings ##
15-
# url: #!the base hostname & protocol for your site e.g. https://www.someone.com (!!required!!)
15+
# url: #the base hostname & protocol for your site e.g. https://www.someone.com
1616
baseurl: /
1717
title: Someone's blog
1818
description: > #this means to ignore newlines until "nav_lists:"
1919
Someone's Blog
2020
2121
nav_lists:
22-
# - title: About
2322
- titles:
2423
en: About
2524
zh: 关于
@@ -73,7 +72,7 @@ paginate_path: /blog/page:num
7372

7473
## Post excerpts ##
7574
excerpt_separator: <!--more-->
76-
excerpt_type: html ## text | html
75+
excerpt_type: html # text | html
7776

7877
## Build ##
7978
markdown: kramdown
@@ -82,12 +81,14 @@ permalink: date
8281

8382
exclude:
8483
- CHANGELOG.md
84+
- CHECKLIST.md
85+
- README-*.md
8586
- README.md
8687
- LICENSE
87-
- /vendor
8888
- /docs
8989
- /screenshots
9090
- /test
91+
- /vendor
9192

9293
## Plugins ##
9394
gems:

‎_config.yml‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,36 @@
44
# which you are expected to set up once and rarely need to edit after that.
55
# For technical reasons, this file is *NOT* reloaded automatically when you use
66
# 'jekyll serve'. If you change this file, please restart the server process.
7-
7+
#
88
# ,--------. ,--. ,--. ,--.
99
# '--. .--',---. \ `.' /,-' '-.
1010
# | | | .-. : .' \ '-. .-'
1111
# | | \ --. / .'. \ | |
1212
# `--' `----''--' '--' `--'
1313

1414
## Base settings ##
15-
# url: #!the base hostname & protocol for your site e.g. https://www.someone.com (!!required!!)
15+
# url: #the base hostname & protocol for your site e.g. https://www.someone.com
1616
baseurl: /
1717
title: Someone's blog
1818
description: > #this means to ignore newlines until "nav_lists:"
1919
Someone's Blog
2020
2121
nav_lists:
22-
# - title: About
2322
- titles:
2423
en: About
2524
zh: 关于
2625
zh-Hans: 关于
2726
zh-Hant: 關於
2827
url: /about.html
2928

29+
# paths:
30+
# home: /
31+
# all: /all.html
32+
# rss: /feed.xml
33+
3034
## GitHub repository (if the site is hosted by GitHub) ##
31-
# repository: e.g. someone/someone.github.io
32-
# repository_tree: e.g. master
35+
# repository: #e.g. someone/someone.github.io
36+
# repository_tree: #e.g. master
3337

3438
## Language & timezone ##
3539
lang: en #the language of your site, eg: en(English), zh(简体中文), zh-Hans(简体中文), zh-Hant(繁體中文)
@@ -68,7 +72,7 @@ paginate_path: /blog/page:num
6872

6973
## Post excerpts ##
7074
excerpt_separator: <!--more-->
71-
excerpt_type: text ## text | html
75+
excerpt_type: text # text | html
7276

7377
## Build ##
7478
markdown: kramdown
@@ -77,12 +81,14 @@ permalink: date
7781

7882
exclude:
7983
- CHANGELOG.md
84+
- CHECKLIST.md
85+
- README-*.md
8086
- README.md
8187
- LICENSE
82-
- /vendor
8388
- /docs
8489
- /screenshots
8590
- /test
91+
- /vendor
8692

8793
## Plugins ##
8894
gems:

‎_includes/blog/header.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<header class="m-page-header main clearfix">
2-
{% assign __path = '/' %}
2+
{% if site.paths.home %}
3+
{% assign __path = site.paths.home %}
4+
{% else %}
5+
{% assign __path = '/' %}
6+
{% endif %}
37
{% include snippets/prepend-baseurl.html %}
48
{% if site.title %}
59
<a class="site-title" title="{% if site.description %}{{ site.description }}{% endif %}"
@@ -10,11 +14,7 @@
1014
</div>
1115
<nav>
1216
<ul class="inline-list">
13-
{% if site.paths.home %}
14-
{% assign __path = site.paths.home %}
15-
{% else %}
16-
{% assign __path = '/' %}
17-
{% endif %}
17+
{% assign __path = '/' %}
1818
{% include snippets/prepend-baseurl.html %}
1919
{% assign href = __return %}
2020
{% assign __locale = site.data.locale.NAV.HOME %}

‎_layouts/home.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,12 @@ <h1><a href="{{ href }}">{{ post.title }}</a></h1>
5454
<li><div class="round-button cur">
5555
<span>{{ page }}</span></div></li>
5656
{% elsif page == 1 %}
57+
{% if site.paths.home %}
58+
{% assign __path = site.paths.home %}
59+
{% else %}
5760
{% assign __path = '/' %}
58-
{% include snippets/prepend-baseurl.html %}
61+
{% endif %}
62+
{% include snippets/prepend-baseurl.html %}
5963
{% assign href = __return %}
6064
<li><a class="round-button"
6165
href="{{ href }}">

‎test/_config.yml‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,36 @@
88

99
## Use TeXt theme !!!
1010
theme: jekyll-text-theme
11+
#
12+
# ,--------. ,--. ,--. ,--.
13+
# '--. .--',---. \ `.' /,-' '-.
14+
# | | | .-. : .' \ '-. .-'
15+
# | | \ --. / .'. \ | |
16+
# `--' `----''--' '--' `--'
1117

1218
## Base settings ##
13-
# url: #!the base hostname & protocol for your site e.g. https://www.someone.com (!!required!!)
19+
# url: #the base hostname & protocol for your site e.g. https://www.someone.com
1420
baseurl: /
1521
title: Someone's blog
1622
description: > #this means to ignore newlines until "nav_lists:"
1723
Someone's Blog
1824
1925
nav_lists:
20-
# - title: About
2126
- titles:
2227
en: About
2328
zh: 关于
2429
zh-Hans: 关于
2530
zh-Hant: 關於
2631
url: /about.html
2732

33+
# paths:
34+
# home: /
35+
# all: /all.html
36+
# rss: /feed.xml
37+
2838
## GitHub repository (if the site is hosted by GitHub) ##
29-
# repository: e.g. someone/someone.github.io
30-
# repository_tree: e.g. master
39+
# repository: #e.g. someone/someone.github.io
40+
# repository_tree: #e.g. master
3141

3242
## Language & timezone ##
3343
lang: en #the language of your site, eg: en(English), zh(简体中文), zh-Hans(简体中文), zh-Hant(繁體中文)
@@ -66,7 +76,7 @@ paginate_path: /blog/page:num
6676

6777
## Post excerpts ##
6878
excerpt_separator: <!--more-->
69-
excerpt_type: text ## text | html
79+
excerpt_type: text # text | html
7080

7181
## Build ##
7282
markdown: kramdown
@@ -75,12 +85,14 @@ permalink: date
7585

7686
exclude:
7787
- CHANGELOG.md
88+
- CHECKLIST.md
89+
- README-*.md
7890
- README.md
7991
- LICENSE
80-
- /vendor
8192
- /docs
8293
- /screenshots
8394
- /test
95+
- /vendor
8496

8597
## Plugins ##
8698
gems:
@@ -93,4 +105,4 @@ gems:
93105
server_url: "0.0.0.0"
94106

95107
## Development ##
96-
isdebug: false
108+
isdebug: false

0 commit comments

Comments
 (0)