Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes and enhancements. [13] #1898

Merged
merged 57 commits into from
Sep 30, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
742d1ca
Merge pull request #22 from iissnan/master
ivan-nginx Sep 12, 2017
028fe60
MOD: move `getContentHeight` to variable.
ivan-nginx Sep 12, 2017
43dd4b4
FIX: jumping affix if sidebar taller then content.
ivan-nginx Sep 12, 2017
61086aa
MOD: rename `getContentHeight` function.
ivan-nginx Sep 12, 2017
619c49e
ADD: scrolling to active TOC if TOC > viewport.
ivan-nginx Sep 23, 2017
9ce276f
FIX: sidebar with `motion` on Mist & Muse schemes.
ivan-nginx Sep 23, 2017
e75a2a1
ADD: sidebar scrollable in all schemes [1].
ivan-nginx Sep 23, 2017
334e50e
ADD: sidebar scrollable in all schemes [2].
ivan-nginx Sep 23, 2017
59209cf
ADD: sidebar scrollable in all schemes [3].
ivan-nginx Sep 23, 2017
a8344d8
FIX: sidebar scrollable in all schemes [4].
ivan-nginx Sep 23, 2017
af067cd
ADD: sidebar scrollable in all schemes [5].
ivan-nginx Sep 23, 2017
65cb162
ADD: sidebar scrollable in all schemes [6].
ivan-nginx Sep 23, 2017
d23c0e0
ADD: sidebar scrollable in all schemes [7].
ivan-nginx Sep 23, 2017
0f27b0c
ADD: sidebar scrollable in all schemes [8].
ivan-nginx Sep 23, 2017
fd91285
ADD: sidebar scrollable in all schemes [9].
ivan-nginx Sep 23, 2017
e3d06b2
ADD: sidebar scrollable in all schemes [10].
ivan-nginx Sep 23, 2017
ef7905d
Merge branch 'master' into master
ivan-nginx Sep 23, 2017
cd92796
MOD: sidebar scrollable in all schemes [11].
ivan-nginx Sep 23, 2017
77b5a30
FIX: sidebar scrollable in all schemes [12].
ivan-nginx Sep 23, 2017
dca0ff4
FIX: sidebar scrollable in all schemes [13].
ivan-nginx Sep 23, 2017
920bd39
ADD: sidebar scrollable in all schemes [14].
ivan-nginx Sep 23, 2017
a0914e8
FIX: sidebar scrollable in all schemes [15].
ivan-nginx Sep 23, 2017
267109c
FIX: sidebar scrollable in all schemes [16].
ivan-nginx Sep 23, 2017
2f2e816
MOD: Enhancements to Gemini scheme [1].
ivan-nginx Sep 24, 2017
3a1b4c0
ADD: Enhancements to Gemini scheme [2].
ivan-nginx Sep 24, 2017
beb52f8
FIX: tabbed code block padding style [1].
ivan-nginx Sep 24, 2017
d433afd
FIX: tabbed code block padding style [2].
ivan-nginx Sep 24, 2017
41ff452
MOD: post more link margin-top refactor.
ivan-nginx Sep 24, 2017
b9243d9
FIX: site state items padding for Pisces & Gemini.
ivan-nginx Sep 24, 2017
7226ad4
MOD: Enhancements to Gemini scheme [3].
ivan-nginx Sep 24, 2017
87fa64e
MOD: Enhancements to Gemini scheme [4].
ivan-nginx Sep 24, 2017
cc2deca
Update readme. [skip ci]
ivan-nginx Sep 25, 2017
45d6254
Update readme [2]. [skip ci]
ivan-nginx Sep 25, 2017
74c34c9
FIX: sidebar scrollable in all schemes [17].
ivan-nginx Sep 28, 2017
42777af
FIX: sidebar scrollable in all schemes [18].
ivan-nginx Sep 28, 2017
7083a9d
FIX: sidebar scrollable in all schemes [19].
ivan-nginx Sep 28, 2017
1a6e24c
FIX: sidebar scrollable in all schemes [20].
ivan-nginx Sep 28, 2017
22569da
FIX: sidebar scrollable in all schemes [21].
ivan-nginx Sep 28, 2017
1280837
FIX: sidebar scrollable in all schemes [22].
ivan-nginx Sep 28, 2017
fa871de
FIX: sidebar scrollable in all schemes [23].
ivan-nginx Sep 28, 2017
11c5d1c
FIX: sidebar scrollable in all schemes [24].
ivan-nginx Sep 28, 2017
867fdbd
FIX: sidebar scrollable in all schemes [25].
ivan-nginx Sep 28, 2017
c2c2834
FIX: sidebar scrollable in all schemes [26].
ivan-nginx Sep 28, 2017
d8543f8
FIX: comments block only show if comments present.
ivan-nginx Sep 28, 2017
abb1424
FIX: comments block show if comments present [2].
ivan-nginx Sep 28, 2017
031244b
ADD: responsive favicons options [1].
ivan-nginx Sep 28, 2017
685b0ee
FIX: responsive favicons options [2].
ivan-nginx Sep 28, 2017
f406902
ADD: responsive favicons options [3].
ivan-nginx Sep 28, 2017
2ca6c06
ADD: responsive favicons options [4].
ivan-nginx Sep 28, 2017
0ed5ec9
FIX: Enhancements to Gemini scheme [5].
ivan-nginx Sep 29, 2017
00f7b64
ADD: Enhancements to Gemini scheme [6].
ivan-nginx Sep 29, 2017
36a3e31
MOD: Enhancements to Gemini scheme [7].
ivan-nginx Sep 29, 2017
7b41c6a
MOD: Enhancements to Gemini scheme [8].
ivan-nginx Sep 29, 2017
a558d60
ADD: Post custom copyright feature.
ivan-nginx Sep 30, 2017
9c33832
Update version to 5.1.3 [1].
ivan-nginx Sep 30, 2017
3a2f34d
Update version to 5.1.3 [2].
ivan-nginx Sep 30, 2017
88c3904
Update version to 5.1.3 [3].
ivan-nginx Sep 30, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
NexT is a high quality elegant [Hexo](http://hexo.io) theme. It is crafted from scratch, with love.

[![gitter-image]][gitter-url]
[![mnt-image]](../../commits/master)
[![mnt-image]][commits-url]
[![travis-image]][travis-url]
[![rel-image]](../../releases)
[![rel-image]][releases-url]
[![hexo-image]][hexo-url]
[![lic-image]](LICENSE)

Expand All @@ -18,6 +18,8 @@ NexT is a high quality elegant [Hexo](http://hexo.io) theme. It is crafted from
* 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)

More NexT examples [here](https://github.com/iissnan/hexo-theme-next/issues/119).

## Installation

**1.** Change dir to **hexo root** directory. There must be `node_modules`, `source`, `themes` and other directories:
Expand All @@ -29,7 +31,7 @@ NexT is a high quality elegant [Hexo](http://hexo.io) theme. It is crafted from

**2.** Get theme from GitHub. There are several variants to do it:

### Download [latest release version](../../releases/latest).
### Download [latest release version][releases-latest-url].
At most cases **stable**. Recommended for most users.

[![curl-tar-wget-image]][curl-tar-wget-url]
Expand All @@ -39,8 +41,8 @@ NexT is a high quality elegant [Hexo](http://hexo.io) theme. It is crafted from
$ 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).
### Download [tagged release version][releases-url].
You must define version. Replace `v5.1.2` with any version from [tags list][tags-url].

[![curl-tar-image]][curl-tar-url]

Expand All @@ -55,7 +57,7 @@ NexT is a high quality elegant [Hexo](http://hexo.io) theme. It is crafted from
$ git clone --branch v5.1.2 https://github.com/iissnan/hexo-theme-next themes/next
```

### Download [latest master branch](../../archive/master.zip).
### Download [latest master branch][download-latest-url].
May be **unstable**, but includes latest features. Recommended for developers.

[![curl-tar-image]][curl-tar-url]
Expand Down Expand Up @@ -85,7 +87,7 @@ NexT is a high quality elegant [Hexo](http://hexo.io) theme. It is crafted from
v5.1.2
```

For example, you want to switch on `v5.1.0` [tagged release version](../../tags). Input the following command:
For example, you want to switch on `v5.1.0` [tagged release version][tags-url]. Input the following command:

```sh
$ git checkout tags/v5.1.0
Expand All @@ -94,7 +96,7 @@ NexT is a high quality elegant [Hexo](http://hexo.io) theme. It is crafted from
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:
And if you want to switch back on [master branch][commits-url], input this command:

```sh
$ git checkout master
Expand All @@ -105,7 +107,7 @@ NexT is a high quality elegant [Hexo](http://hexo.io) theme. It is crafted from
theme: next

### Bugs
For those who also encounter **Error: Cannot find module 'hexo-util'** [issue](../../issues/1490), please check your NPM version.
For those who also encounter **Error: Cannot find module 'hexo-util'** [issue](https://github.com/iissnan/hexo-theme-next/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.
Expand Down Expand Up @@ -333,5 +335,11 @@ Contribution is welcome, feel free to open an issue and fork. Waiting for your p
[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-url]: http://lmgtfy.com/?q=linux+curl+tar+install
[curl-tar-wget-url]: http://lmgtfy.com/?q=linux+curl+tar+wget+install

[download-latest-url]: https://github.com/iissnan/hexo-theme-next/archive/master.zip
[releases-latest-url]: https://github.com/iissnan/hexo-theme-next/releases/latest
[releases-url]: https://github.com/iissnan/hexo-theme-next/releases
[tags-url]: https://github.com/iissnan/hexo-theme-next/tags
[commits-url]: https://github.com/iissnan/hexo-theme-next/commits/master
32 changes: 21 additions & 11 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,17 @@ override: false
# Site Information Settings
# ---------------------------------------------------------------

# Put your favicon.ico into `hexo-site/source/` directory.
favicon: /favicon.ico
# To get favicons visit: https://realfavicongenerator.net
# Put your favicons into `hexo-site/source/` or `hexo-site/themes/next/source/images/` directory.
# Default NexT favicons placed in `hexo-site/themes/next/source/images/` directory.
# And if you want to place your icons in `hexo-site/source/`, you must remove `/images` prefix from pathes.
favicon:
small: /images/favicon-16x16.png
medium: /images/favicon-32x32.png
apple_touch_icon: /images/apple-touch-icon.png
safari_pinned_tab: /images/logo.svg
#android_manifest: /images/manifest.json
#ms_browserconfig: /images/browserconfig.xml

# Set default keywords (Use a comma to separate)
keywords: "Hexo, NexT"
Expand Down Expand Up @@ -138,11 +147,11 @@ toc:
#creative_commons:

sidebar:
# Sidebar Position, available value: left | right
# Sidebar Position, available value: left | right (only for Pisces | Gemini).
position: left
#position: right

# Sidebar Display, available value:
# Sidebar Display, available value (only for Muse | Mist):
# - post expand on posts automatically. Default.
# - always expand for all pages automatically
# - hide expand only when click on the sidebar toggle icon.
Expand All @@ -152,17 +161,16 @@ sidebar:
#display: hide
#display: remove

# Sidebar offset from top menubar in pixels.
# Sidebar offset from top menubar in pixels (only for Pisces | Gemini).
offset: 12
offset_float: 12

# Back to top in sidebar
# Back to top in sidebar (only for Pisces | Gemini).
b2t: false

# Scroll percent label in b2t button
# Scroll percent label in b2t button.
scrollpercent: false

# Enable sidebar on narrow view
# Enable sidebar on narrow view (only for Muse | Mist).
onmobile: false


Expand Down Expand Up @@ -559,7 +567,7 @@ tabs:
#! UNLESS YOU KNOW WHAT YOU ARE DOING
#! ---------------------------------------------------------------

# Motion
# Use velocity to animate everything.
motion:
enable: true
async: false
Expand All @@ -575,6 +583,8 @@ motion:
post_header: slideDownIn
post_body: slideDownIn
coll_header: slideLeftIn
# Only for Pisces | Gemini.
sidebar: slideUpIn

# Fancybox
fancybox: true
Expand Down Expand Up @@ -704,4 +714,4 @@ js: js
images: images

# Theme version
version: 5.1.2
version: 5.1.3
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "isn-next",
"version": "5.1.2",
"version": "5.1.3",
"homepage": "https://github.com/iissnan/hexo-theme-next",
"authors": [
"iissnan <[email protected]>"
Expand Down
2 changes: 0 additions & 2 deletions layout/_layout.swig
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@
{% 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' %}
Expand Down
4 changes: 2 additions & 2 deletions layout/_macro/post-copyright.swig
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<ul class="post-copyright">
<li class="post-copyright-author">
<strong>{{ __('post.copyright.author') + __('symbol.colon') }}</strong>
{{ config.author }}
{{ post.author | default(config.author) }}
</li>
<li class="post-copyright-link">
<strong>{{ __('post.copyright.link') + __('symbol.colon') }}</strong>
<a href="{{ post.permalink }}" title="{{ post.title }}">{{ post.permalink }}</a>
<a href="{{ post.url | default(post.permalink) }}" title="{{ post.title }}">{{ post.url | default(post.permalink) }}</a>
</li>
<li class="post-copyright-license">
<strong>{{ __('post.copyright.license_title') + __('symbol.colon') }} </strong>
Expand Down
Loading