Merge pull request #1898 from ivan-nginx/master

Fixes and enhancements. [13]

Author: ivan-nginx

README.md

@@ -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)
 
@@ -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:
@@ -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]
@@ -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]
 
@@ -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]
@@ -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
@@ -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
@@ -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.
@@ -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

_config.yml

@@ -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"
@@ -151,11 +160,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.
@@ -165,17 +174,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
 
 
@@ -572,7 +580,7 @@ tabs:
 #! UNLESS YOU KNOW WHAT YOU ARE DOING
 #! ---------------------------------------------------------------
 
-# Motion
+# Use velocity to animate everything.
 motion:
   enable: true
   async: false
@@ -588,6 +596,8 @@ motion:
     post_header: slideDownIn
     post_body: slideDownIn
     coll_header: slideLeftIn
+    # Only for Pisces | Gemini.
+    sidebar: slideUpIn
 
 # Fancybox
 fancybox: true
@@ -717,4 +727,4 @@ js: js
 images: images
 
 # Theme version
-version: 5.1.2
+version: 5.1.3

bower.json

@@ -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]>"

layout/_layout.swig

@@ -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' %}

layout/_macro/post-copyright.swig

@@ -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>