Permalink
Browse files

Merge branch 'master' into master

  • Loading branch information...
LEAFERx committed Sep 29, 2017
2 parents 862863f + 22bbabe commit d4e70a1e2249e8d9e1a1dd64c7e908a8a1c1a2d8
Showing with 2,410 additions and 1,688 deletions.
  1. +40 −17 .github/ISSUE_TEMPLATE.md
  2. +87 −0 .github/PULL_REQUEST_TEMPLATE.md
  3. BIN .github/browserstack_logo.png
  4. +1 −0 .javascript_ignore
  5. +7 −0 .travis.yml
  6. +50 −0 README.cn.md
  7. +0 −210 README.en.md
  8. +311 −17 README.md
  9. +211 −117 _config.yml
  10. +1 −1 bower.json
  11. +7 −0 languages/de.yml
  12. +12 −7 languages/default.yml
  13. +8 −1 languages/en.yml
  14. +7 −0 languages/fr-FR.yml
  15. +7 −0 languages/id.yml
  16. +97 −0 languages/it.yml
  17. +7 −0 languages/ja.yml
  18. +7 −0 languages/ko.yml
  19. +7 −0 languages/pt-BR.yml
  20. +7 −0 languages/pt.yml
  21. +7 −0 languages/ru.yml
  22. +8 −1 languages/zh-Hans.yml
  23. +8 −1 languages/zh-hk.yml
  24. +8 −1 languages/zh-tw.yml
  25. +7 −7 layout/_layout.swig
  26. +14 −16 layout/_macro/post-copyright.swig
  27. +35 −19 layout/_macro/post.swig
  28. +29 −21 layout/_macro/reward.swig
  29. +29 −15 layout/_macro/sidebar.swig
  30. +0 −2 layout/_macro/wechat-subscriber.swig
  31. +2 −0 layout/_partials/comments.swig
  32. +41 −16 layout/_partials/footer.swig
  33. +7 −1 layout/_partials/head.swig
  34. +4 −4 layout/_partials/header.swig
  35. +20 −16 layout/_partials/share/jiathis.swig
  36. +10 −0 layout/_scripts/schemes/gemini.swig
  37. +4 −0 layout/_third-party/analytics/analytics-with-widget.swig
  38. +1 −1 layout/_third-party/analytics/facebook-sdk.swig
  39. +0 −3 layout/_third-party/analytics/index.swig
  40. +1 −1 layout/_third-party/analytics/lean-analytics.swig
  41. +1 −0 layout/_third-party/comments/index.swig
  42. +16 −0 layout/_third-party/comments/valine.swig
  43. +45 −46 layout/archive.swig
  44. +20 −10 layout/category.swig
  45. +1 −1 layout/index.swig
  46. +38 −22 layout/page.swig
  47. +1 −4 layout/post.swig
  48. +12 −4 layout/schedule.swig
  49. +19 −9 layout/tag.swig
  50. +1 −1 package.json
  51. +7 −1 scripts/merge-configs.js
  52. +23 −0 scripts/tags/label.js
  53. +15 −9 scripts/tags/note.js
  54. +78 −0 scripts/tags/tabs.js
  55. +6 −5 source/css/_common/components/back-to-top-sidebar.styl
  56. +6 −4 source/css/_common/components/back-to-top.styl
  57. +0 −9 source/css/_common/components/footer/footer.styl
  58. +0 −4 source/css/_common/components/pages/archive.styl
  59. +3 −3 source/css/_common/components/pagination.styl
  60. +1 −1 source/css/_common/components/post/post-expand.styl
  61. +1 −1 source/css/_common/components/post/post-meta.styl
  62. +6 −1 source/css/_common/components/post/post-reward.styl
  63. +11 −0 source/css/_common/components/post/post-rtl.styl
  64. +0 −5 source/css/_common/components/post/post-title.styl
  65. +0 −3 source/css/_common/components/post/post-wordcount.styl
  66. +10 −3 source/css/_common/components/post/post.styl
  67. +3 −1 source/css/_common/components/sidebar/sidebar-author-links.styl
  68. +12 −1 source/css/_common/components/sidebar/sidebar-blogroll.styl
  69. +21 −0 source/css/_common/components/sidebar/sidebar-dimmer.styl
  70. +4 −2 source/css/_common/components/sidebar/sidebar-toggle.styl
  71. +5 −4 source/css/_common/components/sidebar/sidebar.styl
  72. +12 −0 source/css/_common/components/tags/label.styl
  73. +171 −0 source/css/_common/components/tags/note-modern.styl
  74. +159 −87 source/css/_common/components/tags/note.styl
  75. +99 −0 source/css/_common/components/tags/tabs.styl
  76. +4 −1 source/css/_common/components/tags/tags.styl
  77. +12 −2 source/css/_common/scaffolding/base.styl
  78. +118 −0 source/css/_common/scaffolding/mobile.styl
  79. +1 −0 source/css/_common/scaffolding/scaffolding.styl
  80. +1 −0 source/css/_mixins/Gemini.styl
  81. +3 −2 source/css/_mixins/Pisces.styl
  82. +36 −0 source/css/_mixins/base.styl
  83. +40 −0 source/css/_schemes/Gemini/index.styl
  84. +5 −1 source/css/_schemes/Mist/_posts-expanded.styl
  85. +7 −1 source/css/_schemes/Pisces/_sidebar.styl
  86. +19 −0 source/css/_variables/Gemini.styl
  87. +3 −1 source/css/_variables/Pisces.styl
  88. +84 −0 source/css/_variables/base.styl
  89. +9 −21 source/images/algolia_logo.svg
  90. +8 −2 source/js/src/bootstrap.js
  91. +53 −3 source/js/src/motion.js
  92. +1 −0 source/js/src/post-details.js
  93. +44 −2 source/js/src/utils.js
  94. BIN source/lib/Han/dist/font/han.woff2
  95. +45 −915 source/lib/Han/dist/han.css
  96. +1 −1 source/lib/Han/dist/han.min.css
View
@@ -1,29 +1,52 @@
<!-- ATTENTION!
IF YOU DON'T FILL OUT THE FOLLOWING INFORMATION WE MIGHT CLOSE YOUR ISSUE WITHOUT INVESTIGATING.
如果你不填充下面的内容,我们可能会直接关闭你的 issue。
### Expected behavior (预期行为)
If you want to fast resolve your issue, WRITE IT IN ENGLISH, please. Not all contributors/collaborators know Chinese language and Google translate can't always give true translates on issues. Thanks!
You may delete this recomendations and use template which is placed below.
-->
### I agree and want to create new issue <!-- (我确认我已经查看了) -->
### Actual behavior (实际行为)
<!-- Check all with "x" (使用 "x" 选择) -->
- [] 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:**
<!-- Check one with "x" (使用 "x" 选择) -->
```
[] Latest Master branch.
[] Latest Release version.
[] Old version -
```
**NexT Scheme:**
<!-- Check one with "x" (使用 "x" 选择) -->
```
[] All schemes
[] Muse
[] Mist
[] Pisces
[] Gemini
```
### Other Information <!-- (Like Browser, System, Screenshots) -->
@@ -0,0 +1,87 @@
<!-- ATTENTION!
1. Please, write pulls readme in English. Not all contributors/collaborators know Chinese language and Google translate can't always give true translates on issues. Thanks!
2. If your pull is short and simple, recommended to use "Usual pull template".
If your pull is big and include many separated changes, recommended to use "BIG pull template".
3. Always remember what NexT include 4 schemes. And if on one of them all worked fine after changes, on another scheme this changes can be broken. Muse and Mist have similar structure, but Pisces is very difference from them. Gemini is a mirror of Pisces with some styles and layouts remakes. So, please, make the tests at least on two schemes (Muse or Mist and Pisces or Gemini).
-->
<!-- Usual pull template -->
## 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?** <!-- (Check one with "x") -->
- [ ] 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?
<!-- Please describe the current behavior that you are modifying, or link to a relevant issue. -->
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.
<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below. -->
<!-- BIG pull template -->
<!--
1. xxxxxxx - commit link on modified file. Just copy this below your pull request readme.
2. You can paste any image directly from your clipboard. Just press **Print Scr** and paste it into pull readme - link on image will generate and paste automaticly.
-->
<!--
## PART X. Title of fixes and/or enhancements.
Short description in several words here.
Issue Number(s): #xxxx.
### Files modified:
1. Short description of modified file [1]. xxxxxxx
2. Short description of modified file [2]. xxxxxxx
3. Short description of modified file [3]. xxxxxxx
### Global code changes:
* ADD: `newFunction` in `utils.js`.
* DEL: `oldFunction` from `utils.js`
### How it looks?
![image](https://user-images.githubusercontent.com/xxxxxxxx/xxxxxxxx-xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxx.png)
Live demo [here](http://site.com/).
### How to use?
In Next `_config.yml`:
```yml
...
```
-->
Binary file not shown.
View
@@ -2,3 +2,4 @@ source/vendors/*
source/lib/*
source/js/src/affix.js
source/js/src/scrollspy.js
source/js/src/js.cookie.js
View
@@ -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="
View
@@ -0,0 +1,50 @@
# NexT
> 精于心,简于形
<a href="http://notes.iissnan.com" target="_blank">在线预览 Preview</a> | <a href="http://theme-next.iissnan.com" target="_blank">NexT 使用文档</a> | [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/
Oops, something went wrong.

0 comments on commit d4e70a1

Please sign in to comment.