diff --git a/README-zh.md b/README-zh.md index 1eb84b814f6..b5873a13f29 100644 --- a/README-zh.md +++ b/README-zh.md @@ -23,7 +23,7 @@ TeXt 是针对个人或团队网站、博客、项目、文档等的一款高度 - 国际化 - 搜索 - 目录 -- 作者（电子邮件，Facebook，Twitter，领英，微博，知乎等。支持多作者配置） +- 作者（支持多个） - 附加样式（提示，标签，图片，图标，按钮，栅格等） - 扩展（音频，视频，幻灯片，在线示例） - Markdown 增强（[MathJax](https://www.mathjax.org/)，[mermaid](https://mermaidjs.github.io/)，[chartjs](http://www.chartjs.org/)） diff --git a/README.md b/README.md index 85b6606000b..46c3d57ac75 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ TeXt is a super customizable Jekyll theme for personal site, team site, blog, pr - Internationalization - Search - Table of contents -- Authors (Email, Facebook, Twitter, Linkedin, Weibo, Zhihu, etc) +- Authors - Additional styles (alert, tag, image, icon, button, grid, etc) - Extensions (audios, videos, slides, demos) - Markdown enhancements ([MathJax](https://www.mathjax.org/), [mermaid](https://mermaidjs.github.io/), [chartjs](http://www.chartjs.org/)) diff --git a/_config.yml b/_config.yml index d696a6bb62c..6dda5ac33be 100644 --- a/_config.yml +++ b/_config.yml @@ -46,8 +46,9 @@ author: googleplus: # "user_id" the last part of your profile url, e.g. https://plus.google.com/u/0/user_id telegram : # "user_name" the last part of your profile url, e.g. https://t.me/user_name medium : # "user_name" the last part of your profile url, e.g. https://medium.com/user_name - douban : # "user_name" the last part of your profile url, e.g. https://www.douban.com/people/user_name/ - linkedin : # "user_name" the last part of your profile url, e.g. https://www.linkedin.com/in/user_name/ + zhihu : # "user_name" the last part of your profile url, e.g. https://www.zhihu.com/people/user_name + douban : # "user_name" the last part of your profile url, e.g. https://www.douban.com/people/user_name + linkedin : # "user_name" the last part of your profile url, e.g. https://www.linkedin.com/in/user_name github : # "user_name" the last part of your profile url, e.g. https://github.com/user_name npm : # "user_name" the last part of your profile url, e.g. https://www.npmjs.com/~user_name @@ -153,6 +154,16 @@ pageview: app_class : # LeanCloud App class +## => Search +############################## +search: + provider: default # "default" (default), false, "google", "custom" + + ## Google Custom Search Engine + google: + custom_search_engine_id: # Google Custom Search Engine ID + + ## => Analytics ############################## analytics: @@ -164,16 +175,6 @@ analytics: anonymize_ip: false # Anonymize IP tracking for Analytics -## => Search -############################## -search: - provider: default # "default" (default), false, "google", "custom" - - ## Google Custom Search Engine - google: - custom_search_engine_id: # Google Custom Search Engine ID - - ## => Build ############################## markdown : kramdown @@ -219,4 +220,4 @@ plugins: - jekyll-feed - jekyll-paginate - jekyll-sitemap - - jemoji + - jemoji \ No newline at end of file diff --git a/_includes/author-links.html b/_includes/author-links.html index ea77db07264..a93ac26dcac 100644 --- a/_includes/author-links.html +++ b/_includes/author-links.html @@ -65,6 +65,14 @@ {%- endif -%} + {%- if _author.zhihu -%} +
  • + +
    {%- include svg/icon/social/zhihu.svg -%}
    +     +
    • + {%- endif -%} + {%- if _author.douban -%}
  • diff --git a/_sass/components/_author-links.scss b/_sass/components/_author-links.scss index 99b766306a8..efe09c2ec27 100644 --- a/_sass/components/_author-links.scss +++ b/_sass/components/_author-links.scss @@ -23,6 +23,9 @@ .medium-button { @include clickable($text-color-1, $medium-color); } + .zhihu-button { + @include clickable($text-color-1, $zhihu-color); + } .douban-button { @include clickable($text-color-1, $douban-color); } diff --git a/_sass/skins/_chocolate.scss b/_sass/skins/_chocolate.scss index 05d1e3dd6b9..733da56829d 100644 --- a/_sass/skins/_chocolate.scss +++ b/_sass/skins/_chocolate.scss @@ -64,6 +64,7 @@ $weibo-color: #e6162d; $google-plus-color:#ea4335; $telegram-color: #32afed; $medium-color: #000; +$zhihu-color: #0084ff; $douban-color: #42bd56; $linkedin-color: #1074af; $github-color: #000; diff --git a/_sass/skins/_dark.scss b/_sass/skins/_dark.scss index 155cff96744..4af4572e49b 100644 --- a/_sass/skins/_dark.scss +++ b/_sass/skins/_dark.scss @@ -64,6 +64,7 @@ $weibo-color: #e6162d; $google-plus-color:#ea4335; $telegram-color: #32afed; $medium-color: #000; +$zhihu-color: #0084ff; $douban-color: #42bd56; $linkedin-color: #1074af; $github-color: #000; diff --git a/_sass/skins/_default.scss b/_sass/skins/_default.scss index 3ab9177425d..78cf26c2035 100644 --- a/_sass/skins/_default.scss +++ b/_sass/skins/_default.scss @@ -64,6 +64,7 @@ $weibo-color: #e6162d; $google-plus-color:#ea4335; $telegram-color: #32afed; $medium-color: #000; +$zhihu-color: #0084ff; $douban-color: #42bd56; $linkedin-color: #1074af; $github-color: #000; diff --git a/_sass/skins/_forest.scss b/_sass/skins/_forest.scss index 5c0858783dc..b78c1730ef8 100644 --- a/_sass/skins/_forest.scss +++ b/_sass/skins/_forest.scss @@ -64,6 +64,7 @@ $weibo-color: #e6162d; $google-plus-color:#ea4335; $telegram-color: #32afed; $medium-color: #000; +$zhihu-color: #0084ff; $douban-color: #42bd56; $linkedin-color: #1074af; $github-color: #000; diff --git a/_sass/skins/_ocean.scss b/_sass/skins/_ocean.scss index 741bf34dea3..bc75ac3b79d 100644 --- a/_sass/skins/_ocean.scss +++ b/_sass/skins/_ocean.scss @@ -64,6 +64,7 @@ $weibo-color: #e6162d; $google-plus-color:#ea4335; $telegram-color: #32afed; $medium-color: #000; +$zhihu-color: #0084ff; $douban-color: #42bd56; $linkedin-color: #1074af; $github-color: #000; diff --git a/_sass/skins/_orange.scss b/_sass/skins/_orange.scss index 2cab988886a..a7e6f85b830 100644 --- a/_sass/skins/_orange.scss +++ b/_sass/skins/_orange.scss @@ -64,6 +64,7 @@ $weibo-color: #e6162d; $google-plus-color:#ea4335; $telegram-color: #32afed; $medium-color: #000; +$zhihu-color: #0084ff; $douban-color: #42bd56; $linkedin-color: #1074af; $github-color: #000; diff --git a/about.md b/about.md index 5701323b1da..f827a1247a3 100644 --- a/about.md +++ b/about.md @@ -35,7 +35,7 @@ TeXt is a super customizable Jekyll theme for personal site, team site, blog, pr - Internationalization - Search - Table of contents -- Authors (Email, Facebook, Twitter, Linkedin, Weibo, Zhihu, etc) +- Authors - Additional styles (alert, tag, image, icon, button, grid, etc) - Extensions (audios, videos, slides, demos) - Markdown enhancements ([MathJax](https://www.mathjax.org/), [mermaid](https://mermaidjs.github.io/), [chartjs](http://www.chartjs.org/)) diff --git a/docs/_config.dev.yml b/docs/_config.dev.yml index ef067c10452..07fc2ac66bc 100644 --- a/docs/_config.dev.yml +++ b/docs/_config.dev.yml @@ -47,6 +47,7 @@ author: googleplus: 1 telegram : 1 medium : 1 + zhihu : 1 douban : 1 linkedin : 1 github : 1 diff --git a/docs/_config.yml b/docs/_config.yml index d3106949e5c..9e1b9bde6ca 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -48,6 +48,7 @@ author: googleplus: 101827554735084402671 telegram : medium : + zhihu : douban : linkedin : github : kitian616/jekyll-TeXt-theme diff --git a/docs/_data/authors.yml b/docs/_data/authors.yml index bed9d8d583d..74c1aba8d4d 100644 --- a/docs/_data/authors.yml +++ b/docs/_data/authors.yml @@ -10,7 +10,8 @@ Tian Qi: googleplus: 101827554735084402671 # "user_id" the last part of your profile url, e.g. https://plus.google.com/u/0/user_id telegram : # "user_name" the last part of your profile url, e.g. https://t.me/user_name medium : # "user_name" the last part of your profile url, e.g. https://medium.com/user_name - douban : # "user_name" the last part of your profile url, e.g. https://www.douban.com/people/user_name/ - linkedin : # "user_name" the last part of your profile url, e.g. https://www.linkedin.com/in/user_name/ + zhihu : # "user_name" the last part of your profile url, e.g. https://www.zhihu.com/people/user_name + douban : # "user_name" the last part of your profile url, e.g. https://www.douban.com/people/user_name + linkedin : # "user_name" the last part of your profile url, e.g. https://www.linkedin.com/in/user_name github : kitian616 # "user_name" the last part of your profile url, e.g. https://github.com/user_name npm : # "user_name" the last part of your profile url, e.g. https://www.npmjs.com/~user_name \ No newline at end of file diff --git a/docs/_docs/en/2.1-configuration.md b/docs/_docs/en/2.1-configuration.md index a7f9abdfdfd..85a503ff3ab 100644 --- a/docs/_docs/en/2.1-configuration.md +++ b/docs/_docs/en/2.1-configuration.md @@ -133,7 +133,7 @@ Short introduction for site author Username or id of site author’s social networks. -TeXt supports Email, Facebook, Twitter, Weibo, Google Plus, Telegram, Medium, Douban, Linkedin, Github and Npm, more to be added. +TeXt supports Email, Facebook, Twitter, Weibo, Google Plus, Telegram, Medium, Zhihu, Douban, Linkedin, Github and Npm, more to be added. Depending on your settings, the social network buttons would show on every pages' footer. diff --git a/docs/_docs/en/2.5-authors.md b/docs/_docs/en/2.5-authors.md index 93f77e41390..bc204b5736e 100644 --- a/docs/_docs/en/2.5-authors.md +++ b/docs/_docs/en/2.5-authors.md @@ -20,8 +20,9 @@ Tian Qi: googleplus: 101827554735084402671 # "user_id" the last part of your profile url, e.g. https://plus.google.com/u/0/user_id telegram : # "user_name" the last part of your profile url, e.g. https://t.me/user_name medium : # "user_name" the last part of your profile url, e.g. https://medium.com/user_name - douban : # "user_name" the last part of your profile url, e.g. https://www.douban.com/people/user_name/ - linkedin : # "user_name" the last part of your profile url, e.g. https://www.linkedin.com/in/user_name/ + zhihu : # "user_name" the last part of your profile url, e.g. https://www.zhihu.com/people/user_name + douban : # "user_name" the last part of your profile url, e.g. https://www.douban.com/people/user_name + linkedin : # "user_name" the last part of your profile url, e.g. https://www.linkedin.com/in/user_name github : kitian616 # "user_name" the last part of your profile url, e.g. https://github.com/user_name npm : # "user_name" the last part of your profile url, e.g. https://www.npmjs.com/~user_name ``` diff --git a/docs/_docs/zh/2.1-configuration.md b/docs/_docs/zh/2.1-configuration.md index e9844e1ceb6..294d4e8e6d1 100644 --- a/docs/_docs/zh/2.1-configuration.md +++ b/docs/_docs/zh/2.1-configuration.md @@ -133,7 +133,7 @@ timezone: Asia/Shanghai 社交网站的用户名或用户 ID。 -目前支持邮件、微博、Facebook、Twitter、微博、Google Plus、Telegram、Medium、豆瓣、Linkedin、Github 和 Npm，持续添加中。 +目前支持邮件，微博，Facebook，Twitter，微博，Google Plus，Telegram，Medium，知乎，豆瓣，Linkedin，Github 和 Npm，持续添加中。 当你设置了相应项的值后，对应的社交按钮就会出现在页面下方。 diff --git a/docs/_docs/zh/2.5-authors.md b/docs/_docs/zh/2.5-authors.md index f0dc3b6ab41..855cd4e8b7e 100644 --- a/docs/_docs/zh/2.5-authors.md +++ b/docs/_docs/zh/2.5-authors.md @@ -20,8 +20,9 @@ Tian Qi: googleplus: 101827554735084402671 # "user_id" the last part of your profile url, e.g. https://plus.google.com/u/0/user_id telegram : # "user_name" the last part of your profile url, e.g. https://t.me/user_name medium : # "user_name" the last part of your profile url, e.g. https://medium.com/user_name - douban : # "user_name" the last part of your profile url, e.g. https://www.douban.com/people/user_name/ - linkedin : # "user_name" the last part of your profile url, e.g. https://www.linkedin.com/in/user_name/ + zhihu : # "user_name" the last part of your profile url, e.g. https://www.zhihu.com/people/user_name + douban : # "user_name" the last part of your profile url, e.g. https://www.douban.com/people/user_name + linkedin : # "user_name" the last part of your profile url, e.g. https://www.linkedin.com/in/user_name github : kitian616 # "user_name" the last part of your profile url, e.g. https://github.com/user_name npm : # "user_name" the last part of your profile url, e.g. https://www.npmjs.com/~user_name ``` diff --git a/test/_config.yml b/test/_config.yml index 4bf368d7da6..21161c6ff9d 100644 --- a/test/_config.yml +++ b/test/_config.yml @@ -14,7 +14,6 @@ theme: jekyll-text-theme # Gem-based Jekyll Themes # | | | .-. : .' \ '-. .-' # | | \ --. / .'. \ | | # `--' `----''--' '--' `--' - ## => Site Settings ############################## text_skin: default # "default" (default), "dark", "forest", "ocean", "chocolate", "orange" @@ -47,8 +46,9 @@ author: googleplus: # "user_id" the last part of your profile url, e.g. https://plus.google.com/u/0/user_id telegram : # "user_name" the last part of your profile url, e.g. https://t.me/user_name medium : # "user_name" the last part of your profile url, e.g. https://medium.com/user_name - douban : # "user_name" the last part of your profile url, e.g. https://www.douban.com/people/user_name/ - linkedin : # "user_name" the last part of your profile url, e.g. https://www.linkedin.com/in/user_name/ + zhihu : # "user_name" the last part of your profile url, e.g. https://www.zhihu.com/people/user_name + douban : # "user_name" the last part of your profile url, e.g. https://www.douban.com/people/user_name + linkedin : # "user_name" the last part of your profile url, e.g. https://www.linkedin.com/in/user_name github : # "user_name" the last part of your profile url, e.g. https://github.com/user_name npm : # "user_name" the last part of your profile url, e.g. https://www.npmjs.com/~user_name