Skip to content

Commit

Permalink
Merge branch 'source.master'
Browse files Browse the repository at this point in the history
* source.master: (1260 commits)
  [skip ci]
  Update PULL_REQUEST_TEMPLATE.md
  Update PULL_REQUEST_TEMPLATE.md
  Fix font-size only for mobile
  MOD: caution for Safari bug in `font` settings.
  Fix to iissnan#1881.
  Update pagination.styl
  Remove line-height declaration
  FIX: to iissnan#1829 global affix fix.
  Fix Mist font-size for Posts on mobile
  Update PULL_REQUEST_TEMPLATE.md
  Improve font configurations for global and headings
  Revert "FIX: Better way to adjust footer position in Pisces."
  Fix caption position
  Add Italian translation
  Fix fancybox style
  Uncomment `archives` after new option `override`.
  Update _config.yml
  Fix HoundCI issues
  Allow the user to override the whole configuration
  ...

# Conflicts:
#	_config.yml
  • Loading branch information
zqjimlove committed Sep 28, 2017
2 parents 6d023fb + 1145c74 commit 7f3d257
Show file tree
Hide file tree
Showing 121 changed files with 2,549 additions and 1,700 deletions.
57 changes: 40 additions & 17 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -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) -->
87 changes: 87 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -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 added .github/browserstack_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions .javascript_ignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ source/vendors/*
source/lib/*
source/js/src/affix.js
source/js/src/scrollspy.js
source/js/src/js.cookie.js
7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
language: node_js
node_js: node

cache:
directories:
- node_modules
Expand All @@ -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="
50 changes: 50 additions & 0 deletions README.cn.md
Original file line number Diff line number Diff line change
@@ -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/
Loading

0 comments on commit 7f3d257

Please sign in to comment.