Skip to content

Commit

Permalink
Merge branch 'master' into sub-menu-feature
Browse files Browse the repository at this point in the history
  • Loading branch information
ivan-nginx authored Mar 14, 2018
2 parents 11e8201 + b9ff77b commit f730da6
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 16 deletions.
30 changes: 15 additions & 15 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ You may delete this recomendations and use template which is placed below.
### I agree and want to create new issue <!-- (我确认我已经查看了) -->

<!-- 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.org/docs/).
- [] And yes, I already searched for current [issues](https://github.com/theme-next/hexo-theme-next/issues?utf8=%E2%9C%93&q=is%3Aissue) and this is not help to me.
- [ ] 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.org/docs/).
- [ ] And yes, I already searched for current [issues](https://github.com/theme-next/hexo-theme-next/issues?utf8=%E2%9C%93&q=is%3Aissue) and this is not help to me.

***

Expand Down Expand Up @@ -59,21 +59,21 @@ You may delete this recomendations and use template which is placed below.

**NexT Version:**
<!-- Check needed with [x] (把 [ ] 换成 [X] 来选择) -->
```
[] Latest Master branch.
[] Latest Release version.
[] Old version -
```

- [ ] Latest Master branch
- [ ] Latest Release version
- [ ] Old version


**NexT Scheme:**
<!-- Check needed with [x] (把 [ ] 换成 [X] 来选择) -->
```
[] All schemes
[] Muse
[] Mist
[] Pisces
[] Gemini
```

- [ ] All schemes
- [ ] Muse
- [ ] Mist
- [ ] Pisces
- [ ] Gemini


#### NexT Configuration:
<!-- Paste ONLY CHANGED CONFIGURATION from NexT `_config.yml` (只粘贴NexT主题配置文件 `_config.yml` 中修改过的部分) -->
Expand Down
17 changes: 17 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,23 @@ fancybox: false
Then turn on `fancybox` and go to «Dependencies» link with installation instructions of this module.

### exception

If you use cdn for any plugins. Please replace your cdn link.

For example, you want to use `fancybox` and you configured a cdn link. Go to NexT config and see:

```yml
vendors:
# ...
# Some contents...
# ...
fancybox: # Set or update fancybox cdn url.
fancybox_css: # Set or update fancybox cdn url.
```

Instead of using [main organization link](https://github.com/theme-next) for updates.

## Update

You can update to latest master branch by the following command:
Expand Down
1 change: 1 addition & 0 deletions source/css/_common/components/post/post-expand.styl
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,4 @@
}

.posts-expand .post-body .fancybox img { margin: 0 auto 25px; }
.posts-expand .post-body img { margin: 0 auto 25px; }
1 change: 0 additions & 1 deletion source/css/_common/scaffolding/tables.styl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ table {
border-spacing: 0;
border: 1px solid $table-border-color;
font-size: $table-font-size;
table-layout: fixed;
word-wrap: break-all;
}
table>tbody>tr {
Expand Down

0 comments on commit f730da6

Please sign in to comment.