diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 842b1cf2fa..154be9a72b 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,29 +1,52 @@ + +### I agree and want to create new issue -### Actual behavior (实际行为) + +- [] Yes, I was on [Hexo Docs page](https://hexo.io/docs/), especially on [Templates](https://hexo.io/docs/templates.html), [Variables](https://hexo.io/docs/variables.html), [Helpers](https://hexo.io/docs/helpers.html) and [Troubleshooting](https://hexo.io/docs/troubleshooting.html). +- [] Yes, I was on [NexT Documentation Site](http://theme-next.iissnan.com/). +- [] And yes, I already searched for current [issues](https://github.com/iissnan/hexo-theme-next/issues?utf8=%E2%9C%93&q=is%3Aissue) and this is not help to me. +*** -### Steps to reproduce the behavior (重现步骤) +### Expected behavior -### NexT Information - -Add the ✔ sign before an item which is affected by this behavior. +### Actual behavior -NexT Version: - - Master - - Latest Release - - Old version - +### Steps to reproduce the behavior +1. N/A +2. N/A +3. N/A -NexT Scheme: - - All schemes - - Muse - - Mist - - Pisces - -### Other Information (Like Browser, System, Screenshots) +* Link to demo site with this issue: N/A +* Link(s) to source code or any usefull link(s): N/A +### NexT Information +**NexT Version:** + +``` +[] Latest Master branch. +[] Latest Release version. +[] Old version - +``` + +**NexT Scheme:** + +``` +[] All schemes +[] Muse +[] Mist +[] Pisces +[] Gemini +``` + +### Other Information diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000000..af320322a4 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,87 @@ + + + + +## PR Checklist +**Please check if your PR fulfills the following requirements:** + +- [ ] The commit message follows [our guidelines](https://github.com/iissnan/hexo-theme-next/blob/master/.github/CONTRIBUTING.md). +- [ ] Tests for the changes have been added (for bug fixes / features). + - [ ] Muse | Mist have been tested. + - [ ] Pisces | Gemini have been tested. +- [ ] Docs have been added / updated (for bug fixes / features). + +## PR Type +**What kind of change does this PR introduce?** + +- [ ] Bugfix. +- [ ] Feature. +- [ ] Code style update (formatting, local variables). +- [ ] Refactoring (no functional changes, no api changes). +- [ ] Build related changes. +- [ ] CI related changes. +- [ ] Documentation content changes. +- [ ] Other... Please describe: + +## What is the current behavior? + + +Issue Number(s): N/A + +## What is the new behavior? +Description about this pull, in several words... + +* Screens with this changes: N/A +* Link to demo site with this changes: N/A + +### How to use? +In NexT `_config.yml`: +```yml +... +``` + +## Does this PR introduce a breaking change? +- [ ] Yes. +- [ ] No. + + + + + + diff --git a/.github/browserstack_logo.png b/.github/browserstack_logo.png new file mode 100644 index 0000000000..0be37e77e8 Binary files /dev/null and b/.github/browserstack_logo.png differ diff --git a/.javascript_ignore b/.javascript_ignore index 14501d2bbd..ad0d1eaee7 100644 --- a/.javascript_ignore +++ b/.javascript_ignore @@ -2,3 +2,4 @@ source/vendors/* source/lib/* source/js/src/affix.js source/js/src/scrollspy.js +source/js/src/js.cookie.js diff --git a/.travis.yml b/.travis.yml index 752549df6f..a607f87feb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: node_js node_js: node + cache: directories: - node_modules @@ -8,3 +9,9 @@ install: npm install before_script: - npm install -g gulp + +addons: + browserstack: + username: "ivannginx1" + access_key: + secure: "NutOhdgtUdBUXMPZhy8X1F1Jq+tan1LeNOV0FArBt15SNlxtNArqhiyTi4XnG9MPruX4306aGF2RBrKso+OiGNRdGtRGngH613Q0GWNtlC/boMqnI7fHqLIyCs6S12y2uA8PK4Ifxg9bZ0VtCTYYbMy+p1KvBM//L12vmtfdnby8z5Qvex3tB3dLoPOR50CKkINHJVDLm+iVRFrdz4/83oDsulZSRRGIaxu5taDWPIcp3fYZtre2Nc+RXcsyFDyjN7U0Hvr5tKBbloJxXEQEBv2xLkMOtp85nmCPD06s1Il8Wus1ux3raVsfUyaW5FpNX37Jeb5e00RQUM1wgU5m75H6qiGwDvQswbugJG0i/a2nNfsgVmbrSZdMnkHcx2Uxmrw4ejyEP5NSrJSBi05Ck1fQ4UsZ4Qkdf1fd04SI0LpLWt43eoNO/7rHKsQoP4LCX9gxKUuC075NEBLODyJ529RYfA6dKKwwH6o0ZbOgASmCoAWaM65g4+FHRnJcKL/Kj9ZWklQtRa7/ynlHaA65jefFS2lB8Ut6d3rXDDBih9mIrwV1uUaEH96xgAN42bgU/vY6FGzNkDOYZqj4YfsepDM0wbOsslFie7JZq7iFjsYvrXqLvYUMk37AZwQ2Sb6uH4tIT4Qw/4oZfDzA1En3/8HdZJ28nKW/lzjwMSqheIY=" diff --git a/README.cn.md b/README.cn.md new file mode 100644 index 0000000000..ea3504ef5a --- /dev/null +++ b/README.cn.md @@ -0,0 +1,50 @@ +# NexT + +> 精于心,简于形 + +在线预览 Preview | NexT 使用文档 | [English Documentation](README.md) + +[![Join the chat at https://gitter.im/iissnan/hexo-theme-next](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iissnan/hexo-theme-next?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + +![NexT Schemes](http://iissnan.com/nexus/next/next-schemes.jpg) + + +## 浏览器支持 Browser support + +![Browser support](http://iissnan.com/nexus/next/browser-support.png) + +[![Browser Stack](.github/browserstack_logo.png)](https://www.browserstack.com/) +>**BrowserStack** is a cloud-based cross-browser testing tool that enables developers to test their websites across various browsers on different operating systems and mobile devices, without requiring users to install virtual machines, devices or emulators. + +## 贡献 Contributing + +接受各种形式的贡献,包括不限于提交问题与需求,修复代码。等待您的`Pull Request`。 + +Any types of contribution are welcome. Thanks. + +**ATTENTION! Contributors on Chinese docs needed!**\ +Need to translate from [English docs](README.md) to Chinese docs.\ +Any help wanted!\ +Thank's a lot! + +## 开发 Development + +NexT 主旨在于简洁优雅且易于使用,所以首先要尽量确保 NexT 的简洁易用性。 + +NexT is built for easily use with elegant appearance. First things first, always keep things simple. + +## [开发历史 Changelog](https://github.com/iissnan/hexo-theme-next/wiki/Changelog) + +[![hexo-image]][hexo-url] +[![bower-image]][bower-url] +[![jquery-image]][jquery-url] +[![velocity-image]][velocity-url] + +[hexo-image]: http://img.shields.io/badge/Hexo-2.4+-2BAF2B.svg?style=flat-square +[hexo-url]: http://hexo.io +[bower-image]: http://img.shields.io/badge/Bower-*-2BAF2B.svg?style=flat-square +[bower-url]: http://bower.io +[jquery-image]: https://img.shields.io/badge/jquery-2.1-2BAF2B.svg?style=flat-square +[jquery-url]: http://jquery.com/ +[velocity-image]: https://img.shields.io/badge/Velocity-1.2-2BAF2B.svg?style=flat-square +[velocity-url]: http://julian.com/research/velocity/ diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 9aea187a13..0000000000 --- a/README.en.md +++ /dev/null @@ -1,210 +0,0 @@ -# NexT - -> NexT is a high quality elegant [Hexo](http://hexo.io) theme. It is crafted from scratch, with love. - - -[Live Preview](http://notes.iissnan.com) - -## Screenshots - -* Desktop -![Desktop Preview](http://iissnan.com/nexus/next/desktop-preview.png) - -* Sidebar - -![Desktop Sidebar Preview](http://iissnan.com/nexus/next/desktop-sidebar-preview.png) - -* Sidebar (Post details page) - -![Desktop Sidebar Preview](http://iissnan.com/nexus/next/desktop-sidebar-toc.png) - -* Mobile - -![Mobile Preview](http://iissnan.com/nexus/next/mobile.png) - - -## Installation - -1. Get it from GitHub - - $ git clone https://github.com/iissnan/hexo-theme-next themes/next - -2. Add it to `_config.yml` - - theme: next - - -## Update - -```shell -cd themes/next -git pull -``` - -## Features - -### Multiple languages support, including: English / Russian / French / German / Simplified Chinese / Traditional Chinese. - -Default language is English. - -```yml -language: en -# language: zh-Hans -# language: fr-FR -# language: zh-hk -# language: zh-tw -# language: ru -# language: de -``` - -Set `language` field as following in site `_config.yml` to change to Chinese. - -```yml -language: zh-Hans -``` - -### Comment support. - -NexT has native support for `DuoShuo` and `Disqus` comment systems. - -Add the following snippets to your `_config.yml`: - -```yml -duoshuo: - enable: true - shortname: your-duoshuo-shortname -``` - -OR - -```yml -disqus_shortname: your-disqus-shortname -``` - -### Tags page. - -> Add a tags page contains all tags in your site. - -- Create a page named `tags` - - hexo new page "tags" - -- Edit tags page, set page type to `tags`. - - title: All tags - date: 2014-12-22 12:39:04 - type: "tags" - -- Add `tags` to theme `_config.yml`: - - menu: - home: / - archives: /archives - tags: /tags - -### Categories page. - -> Add a categories page contains all categories in your site. - -- Create a page named `categories` - - hexo new page "categories" - -- Edit categories page, set page type to `categories`. - - title: All categories - date: 2014-12-22 12:39:04 - type: "categories" - -- Add `categories` to theme `_config.yml`: - - menu: - home: / - archives: /archives - categories: /categories - -### Social Media - -NexT can automatically add links to your Social Media accounts: - -```yml -social: - GitHub: your-github-url - Twitter: your-twitter-url - Weibo: your-weibo-url - DouBan: your-douban-url - ZhiHu: your-zhihu-url -``` - -### Feed link. - -> Show a feed link. - -Set `rss` field in theme's `_config.yml`, as the following value: - -1. `rss: false` will totally disable feed link. -2. `rss: ` use sites' feed link. This is the default option. - - Follow the installation instruction in the plugin's README. After the configuration is done for this plugin, the feed link is ready too. - -3. `rss: http://your-feed-url` set specific feed link. - -### Up to 5 code highlight themes built-in. - -NexT uses [Tomorrow Theme](https://github.com/chriskempson/tomorrow-theme) with 5 themes for you to choose from. -Next use `normal` by default. Have a preview about `normal` and `night`: - -![Tomorrow Normal Preview](http://iissnan.com/nexus/next/tomorrow-normal.png) -![Tomorrow Night Preview](http://iissnan.com/nexus/next/tomorrow-night.png) - -Head over to [Tomorrow Theme](https://github.com/chriskempson/tomorrow-theme) for more details. - -## Configuration - -NexT comes with few configurations. - -```yml - -# Menu configuration. -menu: - home: / - archives: /archives - -# Favicon -favicon: /favicon.ico - -# Avatar (put the image into next/source/images/) -# can be any image format supported by web browsers (JPEG,PNG,GIF,SVG,..) -avatar: /default_avatar.png - -# Code highlight theme -# available: normal | night | night eighties | night blue | night bright -highlight_theme: normal - -# Fancybox for image gallery -fancybox: true - -# Specify the date when the site was setup -since: 2013 - -``` - -## Browser support - -![Browser support](http://iissnan.com/nexus/next/browser-support.png) - - -## Contributing - -Contribution is welcome, feel free to open an issue and fork. Waiting for your pull request. - -[![hexo-image]][hexo-url] -[![bower-image]][bower-url] -[![jquery-image]][jquery-url] - -[hexo-image]: http://img.shields.io/badge/Hexo-2.4+-2BAF2B.svg?style=flat-square -[hexo-url]: http://hexo.io -[bower-image]: http://img.shields.io/badge/Bower-*-2BAF2B.svg?style=flat-square -[bower-url]: http://bower.io -[jquery-image]: https://img.shields.io/badge/jquery-1.9-blue.svg?style=flat-square -[jquery-url]: http://jquery.com/ diff --git a/README.md b/README.md index a2b004fbb6..b1786ed4eb 100644 --- a/README.md +++ b/README.md @@ -1,43 +1,337 @@ # NexT -> 精于心,简于形 +NexT is a high quality elegant [Hexo](http://hexo.io) theme. It is crafted from scratch, with love. -在线预览 Preview | NexT 使用文档 | [English Documentation](README.en.md) +[![gitter-image]][gitter-url] +[![mnt-image]](../../commits/master) +[![travis-image]][travis-url] +[![rel-image]](../../releases) +[![hexo-image]][hexo-url] +[![lic-image]](LICENSE) + +* [Chinese Documentation](README.cn.md) + +## Live Preview + +* Muse scheme: [XiaMo](https://notes.wanghao.work) | [OAwan](https://oawan.me) | [Hui Wang](http://hui-wang.info) +* Mist scheme: [Jeff](https://blog.zzbd.org) | [uchuhimo](http://uchuhimo.me) | [xirong](http://www.ixirong.com) +* Pisces scheme: [Vi](http://notes.iissnan.com) | [Acris](https://blog.mrx.one) | [Rainy](https://rainylog.com) +* Gemini scheme: [Ivan.Nginx](https://almostover.ru) | [Alynx](http://sh.alynx.xyz) | [Raincal](https://raincal.top) + +## Installation + +**1.** Change dir to **hexo root** directory. There must be `node_modules`, `source`, `themes` and other directories: + ```sh + $ cd hexo + $ ls + _config.yml node_modules package.json public scaffolds source themes + ``` + +**2.** Get theme from GitHub. There are several variants to do it: + +### Download [latest release version](../../releases/latest). + At most cases **stable**. Recommended for most users. + + [![curl-tar-wget-image]][curl-tar-wget-url] + + ```sh + $ mkdir themes/next + $ curl -s https://api.github.com/repos/iissnan/hexo-theme-next/releases/latest | grep tarball_url | cut -d '"' -f 4 | wget -i - -O- | tar -zx -C themes/next --strip-components=1 + ``` + +### Download [tagged release version](../../releases). + You must define version. Replace `v5.1.2` with any version from [tags list](../../tags). + + [![curl-tar-image]][curl-tar-url] + + ```sh + $ mkdir themes/next + $ curl -L https://api.github.com/repos/iissnan/hexo-theme-next/tarball/v5.1.2 | tar -zxv -C themes/next --strip-components=1 + ``` + + [![git-image]][git-url] + + ```sh + $ git clone --branch v5.1.2 https://github.com/iissnan/hexo-theme-next themes/next + ``` + +### Download [latest master branch](../../archive/master.zip). + May be **unstable**, but includes latest features. Recommended for developers. + + [![curl-tar-image]][curl-tar-url] + + ```sh + $ mkdir themes/next + $ curl -L https://api.github.com/repos/iissnan/hexo-theme-next/tarball | tar -zxv -C themes/next --strip-components=1 + ``` + + [![git-image]][git-url] + + ```sh + $ git clone https://github.com/iissnan/hexo-theme-next themes/next + ``` + + Clone command will give you the **whole repository**. And in any time you can switch to any tagged release.\ + Get tags list: + + ```sh + $ cd themes/next + $ git tag -l + … + v5.0.0 + v5.0.1 + v5.1.0 + v5.1.1 + v5.1.2 + ``` + + For example, you want to switch on `v5.1.0` [tagged release version](../../tags). Input the following command: + + ```sh + $ git checkout tags/v5.1.0 + Note: checking out 'tags/v5.1.0'. + … + HEAD now on 1f72f68... CSS: Remove global list-style setting of ul + ``` + + And if you want to switch back on [master branch](../../commits/master), input this command: + + ```sh + $ git checkout master + ``` + +**3.** Set theme in main **hexo root config** `_config.yml` file: + + theme: next + +### Bugs +For those who also encounter **Error: Cannot find module 'hexo-util'** [issue](../../issues/1490), please check your NPM version. + +- `> 3`: Still not work. Please remove `node_modules` directory and reinstall using `npm install`. +- `< 3`: Please add `hexo-util` explicitly via `npm install --save-dev hexo-util` to you site package deps. + +## Update + +```sh +$ cd themes/next +$ git pull +``` + +### Theme configurations using Hexo data files ([#328](https://github.com/iissnan/hexo-theme-next/issues/328)) + +Currently, it is not smooth to update NexT theme from pulling or downloading new releases. It is quite often running into conflict status when updating NexT theme via `git pull`, or need to merge configurations manually when upgrading to new releases. + + At present, NexT encourages users to store some options in site's `_config.yml` and other options in theme's `_config.yml`. This approach is applicable, but has some drawbacks: +1. Configurations are splited into two pieces +2. Users maybe confuse which place should be for options + +In order to resolve this issue, NexT will take advantage of Hexo [Data files](https://hexo.io/docs/data-files.html). Because Data files is introduced in Hexo 3, so you need upgrade Hexo to 3.0 (or above) to use this feature. + +If you prefer Hexo 2.x, you can still use the old approach for configurations. NexT is still compatible with Hexo 2.x. + +#### Benefits + +With this feature, now you can put all your configurations into one place (`source/_data/next.yml`), you don't need to touch `next/_config.yml`. If there are any new options in new releases, you just need to copy those options from `next/_config.yml`, paste into `_data/next.yml` and set their values to whatever you want. + +#### How to use this feature + +1. Please ensure you are using Hexo 3 (or above) +2. Create an file named `next.yml` in site's `source/_data` directory (create `_data` directory if it did not exist) +3. Copy NexT theme options both in site's `_config.yml` and theme's `_config.yml` into `next.yml`. +4. Use `--config source/_data/next.yml` parameter to start server, generate or deploy.\ + For example: `hexo clean --config source/_data/next.yml && hexo g --config source/_data/next.yml`. + +## Features + +### Multiple languages support, including: English / Russian / French / German / Simplified Chinese / Traditional Chinese. + +Default language is English. + +```yml +language: en +# language: zh-Hans +# language: fr-FR +# language: zh-hk +# language: zh-tw +# language: ru +# language: de +``` -[![Join the chat at https://gitter.im/iissnan/hexo-theme-next](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iissnan/hexo-theme-next?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +Set `language` field as following in site `_config.yml` to change to Chinese. -![NexT Schemes](http://iissnan.com/nexus/next/next-schemes.jpg) +```yml +language: zh-Hans +``` +### Comment support. -## 浏览器支持 Browser support +NexT has native support for `DuoShuo` and `Disqus` comment systems. -![Browser support](http://iissnan.com/nexus/next/browser-support.png) +Add the following snippets to your `_config.yml`: +```yml +duoshuo: + enable: true + shortname: your-duoshuo-shortname +``` -## 贡献 Contributing +OR -接受各种形式的贡献,包括不限于提交问题与需求,修复代码。等待您的`Pull Request`。 +```yml +disqus_shortname: your-disqus-shortname +``` -Any types of contribution are welcome. Thanks. +### Tags page. -## 开发 Development +> Add a tags page contains all tags in your site. -NexT 主旨在于简洁优雅且易于使用,所以首先要尽量确保 NexT 的简洁易用性。 +- Create a page named `tags` -NexT is built for easily use with elegant appearance. First things first, always keep things simple. + hexo new page "tags" -## [开发历史 Changelog](https://github.com/iissnan/hexo-theme-next/wiki/Changelog) +- Edit tags page, set page type to `tags`. + title: All tags + date: 2014-12-22 12:39:04 + type: "tags" + +- Add `tags` to theme `_config.yml`: + + menu: + home: / + archives: /archives + tags: /tags + +### Categories page. + +> Add a categories page contains all categories in your site. + +- Create a page named `categories` + + hexo new page "categories" + +- Edit categories page, set page type to `categories`. + + title: All categories + date: 2014-12-22 12:39:04 + type: "categories" + +- Add `categories` to theme `_config.yml`: + + menu: + home: / + archives: /archives + categories: /categories + +### Social Media + +NexT can automatically add links to your Social Media accounts: + +```yml +social: + GitHub: your-github-url + Twitter: your-twitter-url + Weibo: your-weibo-url + DouBan: your-douban-url + ZhiHu: your-zhihu-url +``` + +### Feed link. + +> Show a feed link. + +Set `rss` field in theme's `_config.yml`, as the following value: + +1. `rss: false` will totally disable feed link. +2. `rss: ` use sites' feed link. This is the default option. + + Follow the installation instruction in the plugin's README. After the configuration is done for this plugin, the feed link is ready too. + +3. `rss: http://your-feed-url` set specific feed link. + +### Up to 5 code highlight themes built-in. + +NexT uses [Tomorrow Theme](https://github.com/chriskempson/tomorrow-theme) with 5 themes for you to choose from. +Next use `normal` by default. Have a preview about `normal` and `night`: + +![Tomorrow Normal Preview](http://iissnan.com/nexus/next/tomorrow-normal.png) +![Tomorrow Night Preview](http://iissnan.com/nexus/next/tomorrow-night.png) + +Head over to [Tomorrow Theme](https://github.com/chriskempson/tomorrow-theme) for more details. + +## Configuration + +NexT comes with few configurations. + +```yml + +# Menu configuration. +menu: + home: / + archives: /archives + +# Favicon +favicon: /favicon.ico + +# Avatar (put the image into next/source/images/) +# can be any image format supported by web browsers (JPEG,PNG,GIF,SVG,..) +avatar: /default_avatar.png + +# Code highlight theme +# available: normal | night | night eighties | night blue | night bright +highlight_theme: normal + +# Fancybox for image gallery +fancybox: true + +# Specify the date when the site was setup +since: 2013 + +``` + +## Browser support + +![browser-image] + +[![Browser Stack](.github/browserstack_logo.png)](https://www.browserstack.com/) +>**BrowserStack** is a cloud-based cross-browser testing tool that enables developers to test their websites across various browsers on different operating systems and mobile devices, without requiring users to install virtual machines, devices or emulators. + +## Contributing + +Contribution is welcome, feel free to open an issue and fork. Waiting for your pull request. + + +[browser-image]: https://img.shields.io/badge/browser-%20chrome%20%7C%20firefox%20%7C%20opera%20%7C%20safari%20%7C%20ie%20%3E%3D%209-lightgrey.svg +[browser-url]: https://www.browserstack.com + +[gitter-image]: https://badges.gitter.im/Join%20Chat.svg +[gitter-url]: https://gitter.im/iissnan/hexo-theme-next?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge + +[travis-image]: https://travis-ci.org/iissnan/hexo-theme-next.svg?branch=master +[travis-url]: https://travis-ci.org/iissnan/hexo-theme-next?branch=master "Travis CI" + +[hexo-image]: https://img.shields.io/badge/hexo-%3E%3D%203.0-blue.svg +[hexo-url]: http://hexo.io + +[mnt-image]: https://img.shields.io/maintenance/yes/2017.svg +[rel-image]: https://img.shields.io/github/release/iissnan/hexo-theme-next.svg + +[lic-image]: https://img.shields.io/dub/l/vibe-d.svg + +[git-image]: https://img.shields.io/badge/install%20with%20-git-blue.svg +[curl-tar-image]: https://img.shields.io/badge/install%20with%20-curl%20%7C%20tar-blue.svg +[curl-tar-wget-image]: https://img.shields.io/badge/install%20with%20-curl%20%7C%20tar%20%7C%20wget-blue.svg +[git-url]: http://lmgtfy.com/?q=linux+git+install +[curl-tar-url]: http://lmgtfy.com/?q=linux+curl+tar+install +[curl-tar-wget-url]: http://lmgtfy.com/?q=linux+curl+tar+wget+install diff --git a/_config.yml b/_config.yml index 4cb2e5238f..8a26d2343e 100755 --- a/_config.yml +++ b/_config.yml @@ -1,3 +1,11 @@ +# --------------------------------------------------------------- +# Theme Core Configuration Settings +# --------------------------------------------------------------- + +# Set to true, if you want to fully override the default configuration. +# Useful if you don't want to inherit the theme _config.yml configurations. +override: false + # --------------------------------------------------------------- # Site Information Settings # --------------------------------------------------------------- @@ -22,6 +30,7 @@ authoricon: heart # Footer `powered-by` and `theme-info` copyright copyright: true + # --------------------------------------------------------------- # SEO Settings # --------------------------------------------------------------- @@ -38,39 +47,29 @@ seo: false # subtitle: Subtitle index_with_subtitle: false + # --------------------------------------------------------------- # Menu Settings # --------------------------------------------------------------- -# When running the site in a subdirectory (e.g. domain.tld/blog), remove the leading slash (/archives -> archives) +# When running the site in a subdirectory (e.g. domain.tld/blog), remove the leading slash from link value (/archives -> archives). +# Usage: `Key: /link/ || icon` +# Key is the name of menu item. If translate for this menu will find in languages - this translate will be loaded; if not - Key name will be used. Key is case-senstive. +# Value before `||` delimeter is the target link. +# Value after `||` delimeter is the name of FontAwesome icon. If icon (with or without delimeter) is not specified, question icon will be loaded. menu: - home: / - categories: /categories - #about: /about - archives: /archives - tags: /tags - #sitemap: /sitemap.xml - #commonweal: /404.html - + home: / || home + #about: /about/ || user + tags: /tags/ || tags + categories: /categories/ || th + archives: /archives/ || archive + #schedule: /schedule/ || calendar + #sitemap: /sitemap.xml || sitemap + #commonweal: /404/ || heartbeat # Enable/Disable menu icons. -# Icon Mapping: -# Map a menu item to a specific FontAwesome icon name. -# Key is the name of menu item and value is the name of FontAwesome icon. Key is case-senstive. -# When an question mask icon presenting up means that the item has no mapping icon. menu_icons: enable: true - #KeyMapsToMenuItemKey: NameOfTheIconFromFontAwesome - home: home - about: user - categories: th - schedule: calendar - tags: tags - archives: archive - sitemap: sitemap - commonweal: heartbeat - - # --------------------------------------------------------------- @@ -81,6 +80,7 @@ menu_icons: # scheme: Muse # scheme: Mist scheme: Pisces +#scheme: Gemini # --------------------------------------------------------------- @@ -135,35 +135,40 @@ font: # --------------------------------------------------------------- # Sidebar Settings # --------------------------------------------------------------- +# Social Links. - -# Social Links +# Usage: `Key: permalink || icon` # Key is the link label showing to end users. -# Value is the target link (E.g. GitHub: https://github.com/iissnan) +# Value before `||` delimeter is the target permalink. +# Value after `||` delimeter is the name of FontAwesome icon. If icon (with or without delimeter) is not specified, globe icon will be loaded. social: - GitHub: https://github.com/zqjimlove - #LinkLabel: Link + GitHub: https://github.com/zqjimlove || github + E-Mail: mailto:zqjimlove@gmail.com || envelope + #Google: https://plus.google.com/yourname || google + #Twitter: https://twitter.com/yourname || twitter + #FB Page: https://www.facebook.com/yourname || facebook + #VK Group: https://vk.com/yourname || vk + + + -# Social Links Icons -# Icon Mapping: -# Map a menu item to a specific FontAwesome icon name. -# Key is the name of the item and value is the name of FontAwesome icon. Key is case-senstive. -# When an globe mask icon presenting up means that the item has no mapping icon. social_icons: enable: true - # Icon Mappings. - # KeyMapsToSocialItemKey: NameOfTheIconFromFontAwesome - GitHub: github - Twitter: twitter - Weibo: weibo + icons_only: false + transition: false +# Blog rolls +#links_title: Links +#links_layout: block +#links_layout: inline +#links: + #Title: http://example.com/ # Sidebar Avatar -# in theme directory(source/images): /images/avatar.jpg -# in site directory(source/uploads): /uploads/avatar.jpg -#avatar: - +# in theme directory(source/images): /images/avatar.gif +# in site directory(source/uploads): /uploads/avatar.gif +#avatar: /images/avatar.gif # Table Of Contents in the Sidebar toc: @@ -172,6 +177,8 @@ toc: # Automatically add list number to toc. number: true + # If true, all words will placed on next lines if header width longer then sidebar width. + wrap: false # Creative Commons 4.0 International License. # http://creativecommons.org/ @@ -179,7 +186,6 @@ toc: #creative_commons: by-nc-sa #creative_commons: - sidebar: # Sidebar Position, available value: left | right position: left @@ -197,21 +203,16 @@ sidebar: # Sidebar offset from top menubar in pixels. offset: 12 - offset_float: 0 + offset_float: 12 # Back to top in sidebar b2t: false # Scroll percent label in b2t button scrollpercent: false + # Enable sidebar on narrow view - -# Blog rolls -#links_title: Links -#links_layout: block -#links_layout: inline -#links: - #Title: http://example.com/ + onmobile: false # --------------------------------------------------------------- @@ -246,6 +247,8 @@ post_wordcount: item_text: true wordcount: false min2read: false + totalcount: false + separated_meta: true # Wechat Subscriber #wechat_subscriber: @@ -253,6 +256,12 @@ post_wordcount: #qcode: /path/to/your/wechatqcode ex. /uploads/wechat-qcode.jpg #description: ex. subscribe to my blog by scanning my public wechat account +# Reward +#reward_comment: Donate comment here +#wechatpay: /images/wechatpay.jpg +#alipay: /images/alipay.jpg +#bitcoin: /images/bitcoin.png + # Declare license on posts post_copyright: enable: false @@ -260,11 +269,16 @@ post_copyright: license_url: https://creativecommons.org/licenses/by-nc-sa/3.0/ - # --------------------------------------------------------------- # Misc Theme Settings # --------------------------------------------------------------- +# Reduce padding / margin indents on devices with narrow width. +mobile_layout_economy: false + +# Android Chrome header panel color ($black-deep). +android_chrome_color: "#222" + # Custom Logo. # !!Only available for Default Scheme currently. # Options: @@ -274,7 +288,6 @@ custom_logo: enabled: false image: - # Code Highlight theme # Available value: # normal | night | night eighties | night blue | night bright @@ -282,6 +295,62 @@ custom_logo: highlight_theme: normal +# --------------------------------------------------------------- +# Font Settings +# - Find fonts on Google Fonts (https://www.google.com/fonts) +# - All fonts set here will have the following styles: +# light, light italic, normal, normal italic, bold, bold italic +# - Be aware that setting too much fonts will cause site running slowly +# - Introduce in 5.0.1 +# --------------------------------------------------------------- +# CAUTION! Safari Version 10.1.2 bug: https://github.com/iissnan/hexo-theme-next/issues/1844 +# To avoid space between header and sidebar in Pisces / Gemini themes recommended to use Web Safe fonts for `global` (and `logo`): +# Arial | Tahoma | Helvetica | Times New Roman | Courier New | Verdana | Georgia | Palatino | Garamond | Comic Sans MS | Trebuchet MS +# --------------------------------------------------------------- +font: + enable: false + + # Uri of fonts host. E.g. //fonts.googleapis.com (Default). + host: + + # Font options: + # `external: true` will load this font family from `host` above. + # `family: Times New Roman`. Without any quotes. + # `size: xx`. Use `px` as unit. + + # Global font settings used on
element. + global: + external: true + family: Lato + size: + + # Font settings for Headlines (h1, h2, h3, h4, h5, h6). + # Fallback to `global` font settings. + headings: + external: true + family: + size: + + # Font settings for posts. + # Fallback to `global` font settings. + posts: + external: true + family: + + # Font settings for Logo. + # Fallback to `global` font settings. + logo: + external: true + family: + size: + + # Font settings for and code blocks.
+ codes:
+ external: true
+ family:
+ size:
+
+
# ---------------------------------------------------------------
# Third Party Services Settings
# ---------------------------------------------------------------
@@ -290,8 +359,7 @@ highlight_theme: normal
mathjax:
enable: false
per_page: false
- cdn: //cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML
-
+ cdn: //cdn.bootcss.com/mathjax/2.7.1/latest.js?config=TeX-AMS-MML_HTMLorMML
# Han Support docs: https://hanzi.pro/
han: false
@@ -314,15 +382,24 @@ disqus:
# Hypercomments
#hypercomments_id:
-# Gentie productKey
-#gentie_productKey:
-
# changyan
changyan:
enable: false
appid:
appkey:
+
+# Valine.
+# You can get your appid and appkey from https://leancloud.cn
+# more info please open https://github.com/xCss/Valine
+valine:
+ enable: false
+ appid: # your leancloud application appid
+ appkey: # your leancloud application appkey
+ notify: false # mail notifier , https://github.com/xCss/Valine/wiki
+ verify: false # Verification code
+ placeholder: Comment input placeholder
+
# Support for youyan comments system.
# You can get your uid from http://www.uyan.cc
#youyan_uid: your uid
@@ -339,8 +416,11 @@ changyan:
## type: button
# Share
-#jiathis:
+# This plugin is more useful in China, make sure you known how to use it.
+# And you can find the use guide at official webiste: http://www.jiathis.com/.
# Warning: JiaThis does not support https.
+#jiathis:
+ ##uid: Get this uid from http://www.jiathis.com/
#add_this_id:
# Share
@@ -353,6 +433,10 @@ changyan:
# Google Analytics
#google_analytics:
+# Bing Webmaster tools verification setting
+# See: https://www.bing.com/webmaster/
+#bing_site_verification:
+
# Yandex Webmaster tools verification setting
# See: https://webmaster.yandex.ru/
#yandex_site_verification:
@@ -374,6 +458,7 @@ duoshuo_info:
#admin_nickname: Author
+
# Facebook SDK Support.
# https://github.com/iissnan/hexo-theme-next/pull/410
facebook_sdk:
@@ -401,6 +486,13 @@ vkontakte_api:
comments: true
num_of_posts: 10
+# Star rating support to each article.
+# To get your ID visit https://widgetpack.com
+rating:
+ enable: false
+ id: #
+ color: fc6423
+
# Show number of visitors to each article.
# You can visit https://leancloud.cn get AppID and AppKey.
@@ -465,8 +557,8 @@ algolia_search:
hits_empty: "We didn't find any results for the search: ${query}"
hits_stats: "${hits} results found in ${time} ms"
-
# Local search
+# Dependencies: https://github.com/flashlab/hexo-generator-search
local_search:
enable: false
# if auto, trigger search by changing input
@@ -475,11 +567,41 @@ local_search:
# show top n results per article, show all results by setting to -1
top_n_per_article: 1
-# External URL with BASE64 encrypt & decrypt
+
+# ---------------------------------------------------------------
+# Tags Settings
+# ---------------------------------------------------------------
+
+# External URL with BASE64 encrypt & decrypt.
# Usage: {% exturl text url "title" %}
# Alias: {% extlink text url "title" %}
exturl: false
+# Note tag (bs-callout).
+note:
+ # Note tag style values:
+ # - simple bs-callout old alert style. Default.
+ # - modern bs-callout new (v2-v3) alert style.
+ # - flat flat callout style with background, like on Mozilla or StackOverflow.
+ # - disabled disable all CSS styles import of note tag.
+ style: simple
+ icons: false
+ border_radius: 3
+ # Offset lighter of background in % for modern and flat styles (modern: -12 | 12; flat: -18 | 6).
+ # Offset also applied to label tag variables. This option can work with disabled note tag.
+ light_bg_offset: 0
+
+# Label tag.
+label: true
+
+# Tabs tag.
+tabs:
+ enable: true
+ transition:
+ tabs: false
+ labels: true
+ border_radius: 0
+
#! ---------------------------------------------------------------
#! DO NOT EDIT THE FOLLOWING SETTINGS
@@ -487,11 +609,45 @@ exturl: false
#! ---------------------------------------------------------------
# Motion
-use_motion: true
+motion:
+ enable: true
+ async: false
+ transition:
+ # Transition variants:
+ # fadeIn | fadeOut | flipXIn | flipXOut | flipYIn | flipYOut | flipBounceXIn | flipBounceXOut | flipBounceYIn | flipBounceYOut
+ # swoopIn | swoopOut | whirlIn | whirlOut | shrinkIn | shrinkOut | expandIn | expandOut
+ # bounceIn | bounceOut | bounceUpIn | bounceUpOut | bounceDownIn | bounceDownOut | bounceLeftIn | bounceLeftOut | bounceRightIn | bounceRightOut
+ # slideUpIn | slideUpOut | slideDownIn | slideDownOut | slideLeftIn | slideLeftOut | slideRightIn | slideRightOut
+ # slideUpBigIn | slideUpBigOut | slideDownBigIn | slideDownBigOut | slideLeftBigIn | slideLeftBigOut | slideRightBigIn | slideRightBigOut
+ # perspectiveUpIn | perspectiveUpOut | perspectiveDownIn | perspectiveDownOut | perspectiveLeftIn | perspectiveLeftOut | perspectiveRightIn | perspectiveRightOut
+ post_block: fadeIn
+ post_header: slideDownIn
+ post_body: slideDownIn
+ coll_header: slideLeftIn
# Fancybox
fancybox: true
+# Progress bar in the top during page loading.
+pace: false
+# Themes list:
+#pace-theme-big-counter
+#pace-theme-bounce
+#pace-theme-barber-shop
+#pace-theme-center-atom
+#pace-theme-center-circle
+#pace-theme-center-radar
+#pace-theme-center-simple
+#pace-theme-corner-indicator
+#pace-theme-fill-left
+#pace-theme-flash
+#pace-theme-loading-bar
+#pace-theme-mac-osx
+#pace-theme-minimal
+# For example
+# pace_theme: pace-theme-center-simple
+pace_theme: pace-theme-minimal
+
# Canvas-nest
canvas_nest: false
@@ -554,6 +710,14 @@ vendors:
# https://www.algolia.com
algolia_instant_js:
algolia_instant_css:
+ # Internal version: 1.0.2
+
+ # See: https://github.com/HubSpot/pace
+ # Or use direct links below:
+ # pace: //cdn.bootcss.com/pace/1.0.2/pace.min.js
+ # pace_css: //cdn.bootcss.com/pace/1.0.2/themes/blue/pace-theme-flash.min.css
+ pace:
+ pace_css:
# Internal version: 1.0.0
# https://github.com/hustcc/canvas-nest.js
@@ -583,11 +747,10 @@ vendors:
han:
-
# Assets
css: css
js: js
images: images
# Theme version
-version: 5.1.1
+version: 5.1.2
diff --git a/bower.json b/bower.json
index ddb9665cb5..ed2a6748ce 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
{
"name": "isn-next",
- "version": "5.1.0",
+ "version": "5.1.2",
"homepage": "https://github.com/iissnan/hexo-theme-next",
"authors": [
"iissnan "
diff --git a/languages/de.yml b/languages/de.yml
index c4e11d7abe..8c74a69c2b 100644
--- a/languages/de.yml
+++ b/languages/de.yml
@@ -30,6 +30,7 @@ post:
visitors: Visitors
wordcount: Words count in article
min2read: Reading time
+ totalcount: Site words total count
copyright:
author: Post author
link: Post link
@@ -81,3 +82,9 @@ symbol:
comma: '. '
period: ', '
colon: ':'
+
+reward:
+ donate: Donate
+ wechatpay: WeChat Pay
+ alipay: Alipay
+ bitcoin: Bitcoin
diff --git a/languages/default.yml b/languages/default.yml
index 65166a5b75..b1fec615c8 100644
--- a/languages/default.yml
+++ b/languages/default.yml
@@ -34,14 +34,13 @@ post:
visitors: Visitors
wordcount: Words count in article
min2read: Reading time
+ totalcount: Site words total count
copyright:
- author: Post author
- link: Post link
- license_title: Copyright Notice
- license_content: 'All articles in this blog are licensed under
- %s unless stating additionally.'
-
-
+ author: Post author
+ link: Post link
+ license_title: Copyright Notice
+ license_content: 'All articles in this blog are licensed under
+ %s unless stating additionally.'
page:
totally: Totally
@@ -90,3 +89,9 @@ symbol:
comma: ', '
period: '. '
colon: ':'
+
+reward:
+ donate: Donate
+ wechatpay: WeChat Pay
+ alipay: Alipay
+ bitcoin: Bitcoin
diff --git a/languages/en.yml b/languages/en.yml
index 37f967a6b0..b1fec615c8 100644
--- a/languages/en.yml
+++ b/languages/en.yml
@@ -34,6 +34,7 @@ post:
visitors: Visitors
wordcount: Words count in article
min2read: Reading time
+ totalcount: Site words total count
copyright:
author: Post author
link: Post link
@@ -88,3 +89,9 @@ symbol:
comma: ', '
period: '. '
colon: ':'
+
+reward:
+ donate: Donate
+ wechatpay: WeChat Pay
+ alipay: Alipay
+ bitcoin: Bitcoin
diff --git a/languages/fr-FR.yml b/languages/fr-FR.yml
index deaef312aa..6a3d2aed13 100644
--- a/languages/fr-FR.yml
+++ b/languages/fr-FR.yml
@@ -28,6 +28,7 @@ post:
visitors: Visitors
wordcount: Words count in article
min2read: Reading time
+ totalcount: Site words total count
copyright:
author: Post author
link: Post link
@@ -79,3 +80,9 @@ symbol:
comma: ', '
period: '. '
colon: ':'
+
+reward:
+ donate: Donate
+ wechatpay: WeChat Pay
+ alipay: Alipay
+ bitcoin: Bitcoin
diff --git a/languages/id.yml b/languages/id.yml
index 683bef48ae..0e81fe4d05 100644
--- a/languages/id.yml
+++ b/languages/id.yml
@@ -28,6 +28,7 @@ post:
visitors: Pengunjung
wordcount: Words count in article
min2read: Reading time
+ totalcount: Site words total count
copyright:
author: Post author
link: Post link
@@ -79,3 +80,9 @@ symbol:
comma: ', '
period: '. '
colon: ':'
+
+reward:
+ donate: Donate
+ wechatpay: WeChat Pay
+ alipay: Alipay
+ bitcoin: Bitcoin
diff --git a/languages/it.yml b/languages/it.yml
new file mode 100644
index 0000000000..39aa40ed91
--- /dev/null
+++ b/languages/it.yml
@@ -0,0 +1,97 @@
+title:
+ archive: Archivio
+ category: Categoria
+ tag: Tag
+ schedule: Programma
+
+author: Autore
+
+menu:
+ home: Home
+ archives: Archivi
+ categories: Categorie
+ tags: Tags
+ about: Informazioni su
+ search: Cerca
+ schedule: Programma
+ sitemap: Sitemap
+ commonweal: Commonweal 404
+
+sidebar:
+ overview: Panoramica
+ toc: Indice
+
+post:
+ created: Post creato
+ modified: Post modificato
+ sticky: Sticky
+ posted: Scritto il
+ in: In
+ more: espandi
+ read_more: Leggi di più
+ untitled: Senza titolo
+ toc_empty: Questo post non ha un indice
+ visitors: Visitatori
+ wordcount: Numero di parole nell'articolo
+ min2read: Tempo di lettura
+ totalcount: Numero totale di parole
+ copyright:
+ author: Autore
+ link: Link
+ license_title: Copyright
+ license_content: 'Tutti gli articoli in questo sito sono sotto licenza
+ %s salvo disposizione contraria.'
+
+page:
+ totally: Totale
+ tags: tags
+
+footer:
+ powered: "Powered by %s"
+ theme: Tema
+
+counter:
+ tag_cloud:
+ zero: Nessun tag
+ one: 1 tag in totale
+ other: "%d tags in totale."
+
+ categories:
+ zero: Nessuna categoria
+ one: 1 categoria in totale
+ other: "%d categorie in totale."
+
+ archive_posts:
+ zero: Nessun post.
+ one: 1 post.
+ other: "%d posts in totale."
+
+state:
+ posts: posts
+ pages: pagine
+ tags: tags
+ categories: categorie
+
+search:
+ placeholder: Cerca...
+
+cheers:
+ um: Mh..
+ ok: OK
+ nice: Bello
+ good: Buono
+ great: Ottimo
+ excellent: Eccellente
+
+keep_on: Continua così.
+
+symbol:
+ comma: ', '
+ period: '. '
+ colon: ':'
+
+reward:
+ donate: Dona
+ wechatpay: WeChat Pay
+ alipay: Alipay
+ bitcoin: Bitcoin
diff --git a/languages/ja.yml b/languages/ja.yml
index df86e2ab56..990e5f212f 100644
--- a/languages/ja.yml
+++ b/languages/ja.yml
@@ -28,6 +28,7 @@ post:
visitors: Visitors
wordcount: Words count in article
min2read: Reading time
+ totalcount: Site words total count
copyright:
author: Post author
link: Post link
@@ -79,3 +80,9 @@ symbol:
comma: ', '
period: '. '
colon: ':'
+
+reward:
+ donate: Donate
+ wechatpay: WeChat Pay
+ alipay: Alipay
+ bitcoin: Bitcoin
diff --git a/languages/ko.yml b/languages/ko.yml
index 350f1b5fc6..df4e736d01 100644
--- a/languages/ko.yml
+++ b/languages/ko.yml
@@ -28,6 +28,7 @@ post:
visitors: 방문객
wordcount: Words count in article
min2read: Reading time
+ totalcount: Site words total count
copyright:
author: Post author
link: Post link
@@ -79,3 +80,9 @@ symbol:
comma: ', '
period: '. '
colon: ':'
+
+reward:
+ donate: Donate
+ wechatpay: WeChat Pay
+ alipay: Alipay
+ bitcoin: Bitcoin
diff --git a/languages/pt-BR.yml b/languages/pt-BR.yml
index 28f7195619..64f2da0669 100644
--- a/languages/pt-BR.yml
+++ b/languages/pt-BR.yml
@@ -28,6 +28,7 @@ post:
visitors: Visitantes
wordcount: Words count in article
min2read: Reading time
+ totalcount: Site words total count
copyright:
author: Post author
link: Post link
@@ -79,3 +80,9 @@ symbol:
comma: '. '
period: ', '
colon: ':'
+
+reward:
+ donate: Donate
+ wechatpay: WeChat Pay
+ alipay: Alipay
+ bitcoin: Bitcoin
diff --git a/languages/pt.yml b/languages/pt.yml
index f4eb2bf535..9c83699f23 100644
--- a/languages/pt.yml
+++ b/languages/pt.yml
@@ -28,6 +28,7 @@ post:
visitors: Visitors
wordcount: Words count in article
min2read: Reading time
+ totalcount: Site words total count
copyright:
author: Post author
link: Post link
@@ -79,3 +80,9 @@ symbol:
comma: ', '
period: '. '
colon: ':'
+
+reward:
+ donate: Donate
+ wechatpay: WeChat Pay
+ alipay: Alipay
+ bitcoin: Bitcoin
diff --git a/languages/ru.yml b/languages/ru.yml
index 07ebed70a1..55b6df1540 100644
--- a/languages/ru.yml
+++ b/languages/ru.yml
@@ -33,6 +33,7 @@ post:
visitors: Просмотров
wordcount: Кол-во слов в статье
min2read: Время чтения в минутах
+ totalcount: Общее кол-во слов в записях
copyright:
author: Автор записи
link: Ссылка на запись
@@ -96,3 +97,9 @@ symbol:
comma: ', '
period: '. '
colon: ':'
+
+reward:
+ donate: Донат
+ wechatpay: WeChat Pay
+ alipay: Alipay
+ bitcoin: Bitcoin
diff --git a/languages/zh-Hans.yml b/languages/zh-Hans.yml
index b99de7fdba..8e145277f6 100644
--- a/languages/zh-Hans.yml
+++ b/languages/zh-Hans.yml
@@ -33,6 +33,7 @@ post:
visitors: 阅读次数
wordcount: 字数统计
min2read: 阅读时长
+ totalcount: Site words total count
copyright:
author: 本文作者
link: 本文链接
@@ -87,3 +88,9 @@ symbol:
comma: ', '
period: '。 '
colon: ':'
+
+reward:
+ donate: 打赏
+ wechatpay: 微信支付
+ alipay: 支付宝
+ bitcoin: 比特币
diff --git a/languages/zh-hk.yml b/languages/zh-hk.yml
index c1cc179be2..47e60b6c99 100644
--- a/languages/zh-hk.yml
+++ b/languages/zh-hk.yml
@@ -33,6 +33,7 @@ post:
visitors: 閱讀次數
wordcount: 字數統計
min2read: 閱讀時長
+ totalcount: Site words total count
copyright:
author: Post author
link: Post link
@@ -87,3 +88,9 @@ symbol:
comma: ', '
period: '。 '
colon: ':'
+
+reward:
+ donate: 打賞
+ wechatpay: 微信支付
+ alipay: 支付寶
+ bitcoin: 比特幣
diff --git a/languages/zh-tw.yml b/languages/zh-tw.yml
index dfb48969b6..aa4c21aac6 100644
--- a/languages/zh-tw.yml
+++ b/languages/zh-tw.yml
@@ -33,6 +33,7 @@ post:
visitors: 閱讀次數
wordcount: 字數統計
min2read: 閱讀時長
+ totalcount: Site words total count
copyright:
author: Post author
link: Post link
@@ -87,3 +88,9 @@ symbol:
comma: ', '
period: '。 '
colon: ':'
+
+reward:
+ donate: 打賞
+ wechatpay: 微信支付
+ alipay: 支付寶
+ bitcoin: 比特幣
diff --git a/layout/_layout.swig b/layout/_layout.swig
index 1a9799fdce..fb3c6f8cfe 100644
--- a/layout/_layout.swig
+++ b/layout/_layout.swig
@@ -1,7 +1,7 @@
-
+
{% set html_class = 'theme-next ' + theme.scheme %}
-{% if theme.use_motion %}
+{% if theme.motion.enable %}
{% set html_class = html_class + ' use-motion' %}
{% endif %}
@@ -9,18 +9,17 @@
{% include '_partials/head.swig' %}
{% block title %}{% endblock %}
+ {% include '_third-party/analytics/index.swig' %}
- {% include '_third-party/analytics/index.swig' %}
-
{% set container_class = "container " %}
{% if theme.sidebar.position %}
{% set container_class = container_class + 'sidebar-position-' + theme.sidebar.position %}
{% endif %}
-
+
@@ -45,7 +44,7 @@
@@ -67,6 +66,8 @@
{% set scheme_script = '_scripts/schemes/' + theme.scheme | lower + '.swig' %}
{% include scheme_script %}
+ {% include '_scripts/pages/post-details.swig' %}
+
{% block script_extra %}{% endblock %}
{% include '_scripts/boostrap.swig' %}
@@ -75,6 +76,7 @@
{% include '_third-party/search/index.swig' %}
{% include '_third-party/analytics/lean-analytics.swig' %}
{% include '_third-party/seo/baidu-push.swig' %}
+ {% include '_third-party/rating.swig' %}
{% include '_third-party/mathjax.swig' %}
{% include '_third-party/scroll-cookie.swig' %}
{% include '_third-party/exturl.swig' %}
diff --git a/layout/_macro/post-copyright.swig b/layout/_macro/post-copyright.swig
index 9a8164b0e9..e1f6a1dd43 100644
--- a/layout/_macro/post-copyright.swig
+++ b/layout/_macro/post-copyright.swig
@@ -1,16 +1,14 @@
-{% if theme.post_copyright.enable %}
-
- -
- {{ __('post.copyright.link') + __('symbol.colon') }}
- {{ post.permalink }}
-
- -
- {{ __('post.copyright.license_title') + __('symbol.colon') }}
- {{ __('post.copyright.license_content', theme.post_copyright.license_url, theme.post_copyright.license) }}
-
-
-{% endif %}
+
-
+ -
+ {{ __('post.copyright.link') + __('symbol.colon') }}
+ {{ post.permalink }}
+
+ -
+ {{ __('post.copyright.license_title') + __('symbol.colon') }}
+ {{ __('post.copyright.license_content', theme.post_copyright.license_url, theme.post_copyright.license) }}
+
+
diff --git a/layout/_macro/post.swig b/layout/_macro/post.swig
index ca6d5c0973..edbc48a7ae 100644
--- a/layout/_macro/post.swig
+++ b/layout/_macro/post.swig
@@ -3,12 +3,18 @@
{% set headlessPost = Array.prototype.indexOf.call(['quote', 'picture'], post.type) > -1 %}
{% set post_class = 'post post-type-' + post.type | default('normal') %}
- {% set post_class = post_class + ' ' + post_extra_class | default('') %}
+ {% if post_extra_class > 0 %}
+ {% set post_class = post_class + ' ' + post_extra_class | default('') %}
+ {% endif %}
{% if post.sticky > 0 %}
{% set post_class = post_class + ' ' + 'post-sticky' %}
{% endif %}
+
+ {##################}
+ {### POST BLOCK ###}
+ {##################}
+
@@ -26,7 +32,7 @@
{# Not to show title for quote posts that do not have a title #}
{% if not (is_index and post.type === 'quote' and not post.title) %}
- <{% if theme.seo %}h2{% else %}h1{% endif %} class="post-title" itemprop="name headline">{#
+ <{% if theme.seo %}h2{% else %}h1{% endif %} class="post-title{% if post.direction && post.direction.toLowerCase() === 'rtl' %} rtl{% endif %}" itemprop="name headline">{#
#}{# Link posts #}{#
#}{% if post.link %}
{% if post.sticky > 0 %}
@@ -77,7 +83,7 @@
{% if theme.post_meta.item_text %}
-
+
{% endif %}