diff --git a/README-zh.md b/README-zh.md index 692d52f96df..2948dc7127a 100644 --- a/README-zh.md +++ b/README-zh.md @@ -11,7 +11,7 @@ TeXt 是针对个人或团队网站、博客、项目、文档等的一款高度可定制的 Jekyll 主题。它参考了 iOS 11 的风格，有大而突出的标题和圆润的按钮及卡片。 -[English Documentation](https://github.com/kitian616/jekyll-TeXt-theme/blob/master/README.md) +[English](https://github.com/kitian616/jekyll-TeXt-theme/blob/master/README.md) ## 特性 @@ -74,10 +74,6 @@ TeXt 使用 [Tomorrow](https://github.com/chriskempson/tomorrow-theme) 作为它 - [扩展](https://tianqi.name/jekyll-TeXt-theme/docs/zh/extensions) - [Markdown 增强](https://tianqi.name/jekyll-TeXt-theme/docs/zh/markdown-enhancements) -## 其他资源 - -在 *_includes/icon/social* 目录下有很多的社交产品图标，例如 Behance、Flickr、QQ、微信等，方便修改和使用。 - ## 示例 | Name | Description | @@ -99,6 +95,10 @@ TeXt 使用 [Tomorrow](https://github.com/chriskempson/tomorrow-theme) 作为它 | --- | --- | | ![微信支付](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/docs/assets/images/tip_wechat.jpg) | ![支付宝](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/docs/assets/images/tip_alipay.jpg) | +## 其他资源 + +在 *_includes/icon/social* 目录下有很多的社交产品图标，例如 Behance、Flickr、QQ、微信等，方便修改和使用。 + ## 协议 TeXt Theme 遵循 [MIT 协议](https://github.com/kitian616/jekyll-TeXt-theme/blob/master/LICENSE)。 \ No newline at end of file diff --git a/README.md b/README.md index dcb8fb7c7e7..8fe222e53e2 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ TeXt is a super customizable Jekyll theme for personal site, team site, blog, project, documentation, etc. Similar to iOS 11 style, it has large and prominent titles, round buttons and cards. -[Change Log](https://github.com/kitian616/jekyll-TeXt-theme/blob/master/CHANGELOG.md) | [中文文档](https://github.com/kitian616/jekyll-TeXt-theme/blob/master/README-zh.md) +[Change Log](https://github.com/kitian616/jekyll-TeXt-theme/blob/master/CHANGELOG.md) | [中文](https://github.com/kitian616/jekyll-TeXt-theme/blob/master/README-zh.md) ## Features diff --git a/_config.yml b/_config.yml index 68af65449c6..2132a7c2f26 100644 --- a/_config.yml +++ b/_config.yml @@ -106,7 +106,7 @@ sources: # bootcdn (default), unpkg ## => Sharing ############################## sharing: - provider: false # false (default), "addtoany", "addthis" + provider: false # false (default), "addtoany", "addthis", "custom" ## AddThis addthis: diff --git a/_includes/article-footer/author-profile.html b/_includes/article/footer/author-profile.html similarity index 100% rename from _includes/article-footer/author-profile.html rename to _includes/article/footer/author-profile.html diff --git a/_includes/article-footer/custom.html b/_includes/article/footer/custom.html similarity index 100% rename from _includes/article-footer/custom.html rename to _includes/article/footer/custom.html diff --git a/_includes/article-footer/license.html b/_includes/article/footer/license.html similarity index 100% rename from _includes/article-footer/license.html rename to _includes/article/footer/license.html diff --git a/_includes/article/top/custom.html b/_includes/article/top/custom.html new file mode 100644 index 00000000000..d749475e2c3 --- /dev/null +++ b/_includes/article/top/custom.html @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/_includes/comments-providers/custom.html b/_includes/comments-providers/custom.html new file mode 100644 index 00000000000..90993691ed4 --- /dev/null +++ b/_includes/comments-providers/custom.html @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/_includes/main-bottom/custom.html b/_includes/main/bottom/custom.html similarity index 100% rename from _includes/main-bottom/custom.html rename to _includes/main/bottom/custom.html diff --git a/_includes/main/top/custom.html b/_includes/main/top/custom.html new file mode 100644 index 00000000000..5b6bf8a84c1 --- /dev/null +++ b/_includes/main/top/custom.html @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/_includes/pageview-providers/custom.html b/_includes/pageview-providers/custom.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/_includes/sharing-providers/custom.html b/_includes/sharing-providers/custom.html new file mode 100644 index 00000000000..98cc0b30219 --- /dev/null +++ b/_includes/sharing-providers/custom.html @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/_includes/sharing.html b/_includes/sharing.html index 9b85df1c368..f5853460921 100644 --- a/_includes/sharing.html +++ b/_includes/sharing.html @@ -2,4 +2,6 @@ {%- include sharing-providers/addtoany.html -%} {%- elsif site.sharing.provider == 'addthis' -%} {%- include sharing-providers/addthis.html -%} + {%- elsif site.sharing.provider == 'custom' -%} + {%- include sharing-providers/custom.html -%} {%- endif -%} diff --git a/_layouts/article.html b/_layouts/article.html index 35ba19e6f7a..89c688d2a7d 100644 --- a/_layouts/article.html +++ b/_layouts/article.html @@ -20,6 +20,7 @@ {%- assign _license = __return -%}
+ {%- include article/top/custom.html -%}
{{ content }}
@@ -40,7 +41,7 @@ {%- elsif page.date -%} {%- endif -%} - {%- include article-footer/custom.html -%} + {%- include article/footer/custom.html -%} {%- if _show_author_profile -%} {%- if page.author -%} @@ -48,7 +49,7 @@ {%- else -%} {%- assign _author = site.author -%} {%- endif -%} - {%- include article-footer/author-profile.html author=_author -%} + {%- include article/footer/author-profile.html author=_author -%} {%- endif -%} {%- if _license != false -%} @@ -60,7 +61,7 @@ {%- assign _license_data = _data_license[_license] -%} {%- endif -%}
- {%- include article-footer/license.html license=_license_data -%} + {%- include article/footer/license.html license=_license_data -%}
{%- endif -%} diff --git a/_layouts/page.html b/_layouts/page.html index a43740045d2..0acede64181 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -193,6 +193,7 @@
+ {%- include main/top/custom.html -%} {%- if _page_type == 'article' -%}
{%- elsif _page_type == 'webpage' -%} @@ -214,7 +215,7 @@
{%- include comments.html -%}
{%- endif -%}
- {%- include main-bottom/custom.html -%} + {%- include main/bottom/custom.html -%}
diff --git a/docs/_config.dev.yml b/docs/_config.dev.yml index fa631f565c6..80769b9bded 100644 --- a/docs/_config.dev.yml +++ b/docs/_config.dev.yml @@ -107,7 +107,7 @@ sources: unpkg # bootcdn (default), unpkg ## => Sharing ############################## sharing: - provider: addtoany # false (default), "addtoany", "addthis" + provider: addtoany # false (default), "addtoany", "addthis", "custom" ## AddThis addthis: diff --git a/docs/_config.yml b/docs/_config.yml index 087b8ef4917..82965134eff 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -108,7 +108,7 @@ sources: # bootcdn (default), unpkg ## => Sharing ############################## sharing: - provider: addthis # false (default), "addtoany", "addthis" + provider: addthis # false (default), "addtoany", "addthis", "custom" ## AddThis addthis: diff --git a/docs/_docs/en/2.1-configuration.md b/docs/_docs/en/2.1-configuration.md index 88904cd0c7b..86fb2002c68 100644 --- a/docs/_docs/en/2.1-configuration.md +++ b/docs/_docs/en/2.1-configuration.md @@ -252,6 +252,7 @@ sources: bootcdn # bootcdn (default), unpkg | --- | --- | | **addtoany** | [AddToAny](https://www.addtoany.com/) | | **addthis** | [AddThis](https://www.addthis.com/) | +| **custom** | | ### AddToAny @@ -279,6 +280,7 @@ You NEED set `sharing` variable as `true` in the page’s YAML Front Matter to e | **disqus** | [Disqus](https://disqus.com/) | | **gitalk** | [Gitalk](https://github.com/gitalk/gitalk/) | | **valine** | [Valine](https://valine.js.org/en/) | +| **custom** | | ### Disqus @@ -328,6 +330,7 @@ For all the above comments systems, you NEED set `key` variable in the page’s | Name | Pageview Provider | | --- | --- | | **leancloud** | [Disqus](https://leancloud.cn/) | +| **custom** | | ### LeanCloud @@ -353,6 +356,7 @@ For all the above pageview statistics, you **NEED** set `key` variable in the pa | Name | Analytics Provider | | --- | --- | | **google** | [Google Analytics](https://analytics.google.com/) | +| **custom** | | ### Google Analytics diff --git a/docs/_docs/zh/2.1-configuration.md b/docs/_docs/zh/2.1-configuration.md index 7917210c26f..892b441d321 100644 --- a/docs/_docs/zh/2.1-configuration.md +++ b/docs/_docs/zh/2.1-configuration.md @@ -250,6 +250,7 @@ sources: bootcdn # bootcdn (default), unpkg | --- | --- | | **addtoany** | [AddToAny](https://www.addtoany.com/) | | **addthis** | [AddThis](https://www.addthis.com/) | +| **custom** | | ### AddToAny @@ -277,6 +278,7 @@ comments: | **disqus** | [Disqus](https://disqus.com/) | | **gitalk** | [Gitalk](https://github.com/gitalk/gitalk/) | | **valine** | [Valine](https://valine.js.org/en/) | +| **custom** | | ### Disqus @@ -328,6 +330,7 @@ comments: | 名称 | 文章点击量后台提供方 | | --- | --- | | **leancloud** | [Disqus](https://leancloud.cn/) | +| **custom** | | ### LeanCloud @@ -370,6 +373,7 @@ pageview: | 名称 | 站点统计提供方 | | --- | --- | | **google** | [Google Analytics](https://analytics.google.com/) | +| **custom** | | ### Google Analytics diff --git a/docs/_includes/article/top/custom.html b/docs/_includes/article/top/custom.html new file mode 100644 index 00000000000..fda507fbd30 --- /dev/null +++ b/docs/_includes/article/top/custom.html @@ -0,0 +1,8 @@ + +
+ + Tip Me via PayPal + + +
+ \ No newline at end of file diff --git a/docs/_includes/main-bottom/custom.html b/docs/_includes/main/bottom/custom.html similarity index 76% rename from docs/_includes/main-bottom/custom.html rename to docs/_includes/main/bottom/custom.html index e8e2fbb6e56..e8c21e4bf9a 100644 --- a/docs/_includes/main-bottom/custom.html +++ b/docs/_includes/main/bottom/custom.html @@ -1,4 +1,5 @@ -
+ +
(adsbygoogle = window.adsbygoogle || []).push({}); -
\ No newline at end of file +
+ \ No newline at end of file diff --git a/test/_config.yml b/test/_config.yml index 02a017b6484..994cc12ec2a 100644 --- a/test/_config.yml +++ b/test/_config.yml @@ -107,7 +107,7 @@ sources: # bootcdn (default), unpkg ## => Sharing ############################## sharing: - provider: false # false (default), "addtoany", "addthis" + provider: false # false (default), "addtoany", "addthis", "custom" ## AddThis addthis: