diff --git a/LICENSE.md b/LICENSE.md index b0c5356..f77513f 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ #
«NexT» – Elegant and powerful theme for Hexo.
-

Copyright © 2017 «NexT».

+

Copyright © 2017 «NexT».

Detail attribution information for «NexT»
is contained in the 'docs/AUTHORS.md' file.

diff --git a/README.md b/README.md index 0adc2fc..2c76d9c 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ 🇷🇺 -#
e x T
+#
e x T

«NexT» is a high quality elegant Hexo theme. It is crafted from scratch with love. @@ -14,8 +14,8 @@ - - + +

@@ -26,7 +26,7 @@ 💟 Muse | 🔯 Mist | ♓️ Pisces | ♊️ Gemini

- More «NexT» examples here. + More «NexT» examples here.

## Installation @@ -35,7 +35,7 @@ The simplest way to install is to clone the entire repository: ```sh $ cd hexo -$ git clone https://github.com/hexo-next/hexo-theme-next themes/next +$ git clone https://github.com/next-theme/hexo-theme-next themes/next ``` Or you can see [detailed installation instructions][docs-installation-url] if you want any other variant. @@ -48,7 +48,7 @@ For example, if you want to enable `pjax` on your site, just set `pjax` to `true ```yml # Easily enable fast Ajax navigation on your website. -# Dependencies: https://github.com/hexo-next/pjax +# Dependencies: https://github.com/next-theme/pjax pjax: true ``` @@ -121,9 +121,9 @@ Also, we welcome Issue or PR to our [official-plugins][official-plugins-url]. Crowdin allows us to translate conveniently the documentation.

-[docs-installation-url]: https://github.com/hexo-next/hexo-theme-next/blob/master/docs/INSTALLATION.md -[docs-data-files-url]: https://github.com/hexo-next/hexo-theme-next/blob/master/docs/DATA-FILES.md -[docs-update-5-1-x-url]: https://github.com/hexo-next/hexo-theme-next/blob/master/docs/UPDATE-FROM-5.1.X.md +[docs-installation-url]: https://github.com/next-theme/hexo-theme-next/blob/master/docs/INSTALLATION.md +[docs-data-files-url]: https://github.com/next-theme/hexo-theme-next/blob/master/docs/DATA-FILES.md +[docs-update-5-1-x-url]: https://github.com/next-theme/hexo-theme-next/blob/master/docs/UPDATE-FROM-5.1.X.md [t-news-url]: https://t.me/theme_next_news [t-chat-url]: https://t.me/theme_next @@ -131,12 +131,12 @@ Also, we welcome Issue or PR to our [official-plugins][official-plugins-url]. [riot-url]: https://riot.im/app/#/room/#theme-next:matrix.org [i18n-url]: https://i18n.theme-next.org -[awesome-next-url]: https://github.com/hexo-next/awesome-next -[issues-bug-url]: https://github.com/hexo-next/hexo-theme-next/issues/new?assignees=&labels=Bug&template=bug-report.md -[issues-feat-url]: https://github.com/hexo-next/hexo-theme-next/issues/new?assignees=&labels=Feature+Request&template=feature-request.md -[feat-req-vote-url]: https://github.com/hexo-next/hexo-theme-next/issues?q=is%3Aopen+is%3Aissue+label%3A%22Feature+Request%22 +[awesome-next-url]: https://github.com/next-theme/awesome-next +[issues-bug-url]: https://github.com/next-theme/hexo-theme-next/issues/new?assignees=&labels=Bug&template=bug-report.md +[issues-feat-url]: https://github.com/next-theme/hexo-theme-next/issues/new?assignees=&labels=Feature+Request&template=feature-request.md +[feat-req-vote-url]: https://github.com/next-theme/hexo-theme-next/issues?q=is%3Aopen+is%3Aissue+label%3A%22Feature+Request%22 -[contributing-document-url]: https://github.com/hexo-next/hexo-theme-next/blob/master/.github/CONTRIBUTING.md +[contributing-document-url]: https://github.com/next-theme/hexo-theme-next/blob/master/.github/CONTRIBUTING.md [official-plugins-url]: https://github.com/theme-next -[contributors-image]: https://opencollective.com/hexo-next/contributors.svg?width=890 -[contributors-url]: https://github.com/hexo-next/hexo-theme-next/graphs/contributors +[contributors-image]: https://opencollective.com/next-theme/contributors.svg?width=890 +[contributors-url]: https://github.com/next-theme/hexo-theme-next/graphs/contributors diff --git a/_config.yml b/_config.yml index c631e0c..9557a9a 100644 --- a/_config.yml +++ b/_config.yml @@ -242,7 +242,7 @@ post_meta: categories: true # Post wordcount display settings -# Dependencies: https://github.com/hexo-next/hexo-symbols-count-time +# Dependencies: https://github.com/next-theme/hexo-symbols-count-time symbols_count_time: separated_meta: true item_text_post: true @@ -478,7 +478,7 @@ baidu_push: false # --------------------------------------------------------------- # Third Party Plugins & Services Settings # See: https://theme-next.org/docs/third-party-services/ -# More plugins: https://github.com/hexo-next/awesome-next +# More plugins: https://github.com/next-theme/awesome-next # You may need to install dependencies or set CDN URLs in `vendors` # There are two different CDN providers by default: # - jsDelivr (cdn.jsdelivr.net), works everywhere even in China @@ -505,7 +505,7 @@ math: copy_tex: false # Easily enable fast Ajax navigation on your website. -# Dependencies: https://github.com/hexo-next/pjax +# Dependencies: https://github.com/next-theme/pjax pjax: false # FancyBox is a tool that offers a nice and elegant way to add zooming functionality for images. @@ -688,7 +688,7 @@ leancloud_visitors: app_key: # # Required for apps from CN region server_url: # - # Dependencies: https://github.com/hexo-next/hexo-leancloud-counter-security + # Dependencies: https://github.com/theme-next/hexo-leancloud-counter-security # If you don't care about security in leancloud counter and just want to use it directly # (without hexo-leancloud-counter-security plugin), set `security` to `false`. security: true @@ -731,7 +731,7 @@ algolia_search: hits_stats: "${hits} results found in ${time} ms" # Local Search -# Dependencies: https://github.com/hexo-next/hexo-generator-searchdb +# Dependencies: https://github.com/next-theme/hexo-generator-searchdb local_search: enable: false # If auto, trigger search by changing input. @@ -797,7 +797,7 @@ tabs: # PDF tag # NexT will try to load pdf files natively, if failed, pdf.js will be used. # So, you have to install the dependency of pdf.js if you want to use pdf tag and make it available to all browsers. -# See: https://github.com/hexo-next/theme-next-pdf +# See: https://github.com/next-theme/theme-next-pdf pdf: enable: false # Default height @@ -835,7 +835,7 @@ motion: sidebar: slideUpIn # Progress bar in the top during page loading. -# Dependencies: https://github.com/hexo-next/theme-next-pace +# Dependencies: https://github.com/next-theme/theme-next-pace # For more information: https://github.com/HubSpot/pace pace: enable: false @@ -845,7 +845,7 @@ pace: theme: minimal # JavaScript 3D library. -# Dependencies: https://github.com/hexo-next/theme-next-three +# Dependencies: https://github.com/next-theme/theme-next-three three: enable: false three_waves: false @@ -853,7 +853,7 @@ three: canvas_sphere: false # Canvas-ribbon -# Dependencies: https://github.com/hexo-next/theme-next-canvas-ribbon +# Dependencies: https://github.com/next-theme/theme-next-canvas-ribbon # For more information: https://github.com/zproo/canvas-ribbon canvas_ribbon: enable: false @@ -898,7 +898,7 @@ vendors: copy_tex_css: # Internal version: 0.2.8 - # pjax: //cdn.jsdelivr.net/gh/hexo-next/pjax@0/pjax.min.js + # pjax: //cdn.jsdelivr.net/gh/next-theme/pjax@0/pjax.min.js pjax: # FancyBox @@ -972,17 +972,17 @@ vendors: pace_css: # Internal version: 1.0.0 - # three: //cdn.jsdelivr.net/gh/hexo-next/theme-next-three@1/three.min.js - # three_waves: //cdn.jsdelivr.net/gh/hexo-next/theme-next-three@1/three-waves.min.js - # canvas_lines: //cdn.jsdelivr.net/gh/hexo-next/theme-next-three@1/canvas_lines.min.js - # canvas_sphere: //cdn.jsdelivr.net/gh/hexo-next/theme-next-three@1/canvas_sphere.min.js + # three: //cdn.jsdelivr.net/gh/next-theme/theme-next-three@1/three.min.js + # three_waves: //cdn.jsdelivr.net/gh/next-theme/theme-next-three@1/three-waves.min.js + # canvas_lines: //cdn.jsdelivr.net/gh/next-theme/theme-next-three@1/canvas_lines.min.js + # canvas_sphere: //cdn.jsdelivr.net/gh/next-theme/theme-next-three@1/canvas_sphere.min.js three: three_waves: canvas_lines: canvas_sphere: # Internal version: 1.0.0 - # canvas_ribbon: //cdn.jsdelivr.net/gh/hexo-next/theme-next-canvas-ribbon@1/canvas-ribbon.js + # canvas_ribbon: //cdn.jsdelivr.net/gh/next-theme/theme-next-canvas-ribbon@1/canvas-ribbon.js canvas_ribbon: # Assets diff --git a/docs/AUTHORS.md b/docs/AUTHORS.md index 26a3072..714b954 100644 --- a/docs/AUTHORS.md +++ b/docs/AUTHORS.md @@ -82,6 +82,6 @@ And best contributors from initially repository: - **LeviDing**: [Fix the bug of Gitment](https://github.com/iissnan/hexo-theme-next/pull/1944) - **maple3142**: [Firestore visitor counter](https://github.com/iissnan/hexo-theme-next/pull/1978) -It lives on as an open source project with many contributors, a self updating list is [here](https://github.com/hexo-next/hexo-theme-next/graphs/contributors). +It lives on as an open source project with many contributors, a self updating list is [here](https://github.com/next-theme/hexo-theme-next/graphs/contributors). P.S. If you did some useful pulls/commits in original repository and you are not in the list, let us know and you will be added here. diff --git a/docs/DATA-FILES.md b/docs/DATA-FILES.md index 1760c77..2313083 100644 --- a/docs/DATA-FILES.md +++ b/docs/DATA-FILES.md @@ -1,14 +1,10 @@ -

Data Files

+

Configuration Files

-Currently, it is not smooth to update NexT theme from pulling or downloading new releases. It is quite often running into conflict status when updating NexT theme via `git pull`, or need to merge configurations manually when upgrading to new releases. +How to configure Hexo and NexT? The traditional approach is to store some options in site's `/_config.yml` and other options in theme's `/themes/next/_config.yml`. This approach is applicable, but it is not smooth to update NexT theme from pulling or downloading new releases. It is quite often running into conflict status when updating NexT theme via `git pull`, or need to merge configurations manually when upgrading to new releases. For the new version of Hexo, the theme can be installed through npm; it is also difficult to directly modify the theme configuration file in `node_modules`. -At present, NexT encourages users to store some options in site's `/_config.yml` and other options in theme's `/themes/next/_config.yml`. This approach is applicable, but has some drawbacks: -1. Configurations are splitted into two pieces -2. Users may be confused which place should be for options +In order to resolve this issue, Hexo provides the following solutions. Please choose only one of them and resume next steps. -In order to resolve this issue, NexT provides the following two solutions. - -

Option 1: Hexo-Way

+## `theme_config` With this way, all your configurations locate in main Hexo config file (`/_config.yml`), you don't need to touch `/themes/next/_config.yml` or create any new files. But you must preserve double spaces indents within `theme_config` option. @@ -16,46 +12,28 @@ If there are any new options in new releases, you just need to copy those option ### Usage -1. Please confirm that the `/source/_data/next.yml` file does not exist (delete it if exists). -2. Copy needed NexT theme options from theme's `/themes/next/_config.yml` into `/_config.yml`, then\ - 2.1. Move all this settings to the right with two spaces (in Visual Studio Code: select all strings, CTRL + ]).\ - 2.2. Add `theme_config:` parameter above all this settings. +Copy needed NexT theme options from theme's `/themes/next/_config.yml` into `/_config.yml`, then\ +1. Move all this settings to the right with two spaces (in Visual Studio Code: select all strings, CTRL + ]).\ +2. Add `theme_config:` parameter above all this settings. -### Useful links +## `_config.[name].yml` -* [Hexo Configuration](https://hexo.io/docs/configuration.html) -* [Hexo Pull #757](https://github.com/hexojs/hexo/pull/757) +With this way, all your configurations locate in config file `/_config.[name].yml`. Replace `[name]` with the value of `theme` option in Hexo config file (`/_config.yml`), e.g. `next`. -

Option 2: NexT-Way

- -With this way, you can put all your configurations into one place (`/source/_data/next.yml`), you don't need to touch `/themes/next/_config.yml`. -But option may not accurately procces all hexo external libraries with their additional options (for example, `hexo-server` module options may be readed only in default hexo config). - -If there are any new options in new releases, you just need to copy those options from `/themes/next/_config.yml`, paste into `/source/_data/next.yml` and set their values to whatever you want. - -This method relies on Hexo [Data files](https://hexo.io/docs/data-files.html). Because Data files is introduced in Hexo 3, so you need upgrade Hexo to 3.0 (or above) to use this feature. +If there are any new options in new releases, you just need to copy those options from `/themes/next/_config.yml`, paste into this config file and set their values to whatever you want. ### Usage -1. Please ensure you are using Hexo 3 (or above). -2. Create an file named `next.yml` in site's `/source/_data` directory (create `_data` directory if it does not exist). +1. Please ensure you are using Hexo 4.3 (or above). +2. Create a config file in site's root directory, e.g. `_config.next.yml`. +3. Copy needed NexT theme options from theme's `/themes/next/_config.yml` into this config file. -

And after that steps there are 2 variants, need to choose only one of them and resume next steps.

+## `next.yml` -* **Variant 1: `override: false` (default)**: +Older versions of NexT theme also provide another configuration method, which is to place the theme configuration in the `/source/_data/next.yml` file. This method is deprecated, please use `_config.[name].yml` instead. If the `/source/_data/next.yml` file exists, move it to the Hexo root directory and rename it to `_config.next.yml`. - 1. Check your `override` option in default NexT config, it must set on `false`.\ - In `next.yml` it must not be defined or set on `false` too. - 2. Copy needed options from both site's `/_config.yml` and theme's `/themes/next/_config.yml` into `/source/_data/next.yml`. +## Useful links -* **Variant 2: `override: true`**: - - 1. In `next.yml` set `override` option on `true`. - 2. Copy **all** NexT theme options from theme's `/themes/next/_config.yml` into `/source/_data/next.yml`. - -3. Then, in main site's `/_config.yml` need to define `theme: next` option (and if needed, `source_dir: source`). -4. Use standard parameters to start server, generate or deploy (`hexo clean && hexo g -d && hexo s`). - -### Useful links - -* [NexT Issue #328](https://github.com/iissnan/hexo-theme-next/issues/328) +* [Hexo Configuration](https://hexo.io/docs/configuration.html) +* [Hexo Pull #757](https://github.com/hexojs/hexo/pull/757) +* [Hexo Pull #4120](https://github.com/hexojs/hexo/pull/4120) diff --git a/docs/INSTALLATION.md b/docs/INSTALLATION.md index 383d99c..3238d85 100644 --- a/docs/INSTALLATION.md +++ b/docs/INSTALLATION.md @@ -23,7 +23,7 @@ There are 3 options to do it, need to choose only one of them.

```sh $ mkdir themes/next - $ curl -s https://api.github.com/repos/hexo-next/hexo-theme-next/releases/latest | grep tarball_url | cut -d '"' -f 4 | wget -i - -O- | tar -zx -C themes/next --strip-components=1 + $ curl -s https://api.github.com/repos/next-theme/hexo-theme-next/releases/latest | grep tarball_url | cut -d '"' -f 4 | wget -i - -O- | tar -zx -C themes/next --strip-components=1 ``` This variant will give to you **only latest release version** (without `.git` directory inside).\ So, there is impossible to update this version with `git` later.\ @@ -38,14 +38,14 @@ There are 3 options to do it, need to choose only one of them.

```sh $ mkdir themes/next - $ curl -L https://api.github.com/repos/hexo-next/hexo-theme-next/tarball/v6.0.0 | tar -zxv -C themes/next --strip-components=1 + $ curl -L https://api.github.com/repos/next-theme/hexo-theme-next/tarball/v6.0.0 | tar -zxv -C themes/next --strip-components=1 ``` Same as above under `curl & tar & wget` variant, but will download **only concrete version**. * Variant 2: Install with [git][git-url]: ```sh - $ git clone --branch v6.0.0 https://github.com/hexo-next/hexo-theme-next themes/next + $ git clone --branch v6.0.0 https://github.com/next-theme/hexo-theme-next themes/next ``` This variant will give to you the **defined release version** (with `.git` directory inside).\ And in any time you can switch to any tagged release, but with limit to defined version. @@ -58,7 +58,7 @@ There are 3 options to do it, need to choose only one of them.

```sh $ mkdir themes/next - $ curl -L https://api.github.com/repos/hexo-next/hexo-theme-next/tarball | tar -zxv -C themes/next --strip-components=1 + $ curl -L https://api.github.com/repos/next-theme/hexo-theme-next/tarball | tar -zxv -C themes/next --strip-components=1 ``` Same as above under `curl & tar & wget` variant, but will download **only latest master branch version**.\ At some cases useful for developers. @@ -66,7 +66,7 @@ There are 3 options to do it, need to choose only one of them.

* Variant 2: Install with [git][git-url]: ```sh - $ git clone https://github.com/hexo-next/hexo-theme-next themes/next + $ git clone https://github.com/next-theme/hexo-theme-next themes/next ``` This variant will give to you the **whole repository** (with `.git` directory inside).\ @@ -107,15 +107,15 @@ Set theme in main **Hexo root config** `_config.yml` file: theme: next ``` -[download-latest-url]: https://github.com/hexo-next/hexo-theme-next/archive/master.zip -[releases-latest-url]: https://github.com/hexo-next/hexo-theme-next/releases/latest -[releases-url]: https://github.com/hexo-next/hexo-theme-next/releases -[tags-url]: https://github.com/hexo-next/hexo-theme-next/tags -[commits-url]: https://github.com/hexo-next/hexo-theme-next/commits/master +[download-latest-url]: https://github.com/next-theme/hexo-theme-next/archive/master.zip +[releases-latest-url]: https://github.com/next-theme/hexo-theme-next/releases/latest +[releases-url]: https://github.com/next-theme/hexo-theme-next/releases +[tags-url]: https://github.com/next-theme/hexo-theme-next/tags +[commits-url]: https://github.com/next-theme/hexo-theme-next/commits/master [git-url]: http://lmgtfy.com/?q=linux+git+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 -[update-with-git-url]: https://github.com/hexo-next/hexo-theme-next/blob/master/README.md#update -[docs-data-files-url]: https://github.com/hexo-next/hexo-theme-next/blob/master/docs/DATA-FILES.md +[update-with-git-url]: https://github.com/next-theme/hexo-theme-next/blob/master/README.md#update +[docs-data-files-url]: https://github.com/next-theme/hexo-theme-next/blob/master/docs/DATA-FILES.md diff --git a/docs/LEANCLOUD-COUNTER-SECURITY.md b/docs/LEANCLOUD-COUNTER-SECURITY.md index 9297ca7..b5d741c 100644 --- a/docs/LEANCLOUD-COUNTER-SECURITY.md +++ b/docs/LEANCLOUD-COUNTER-SECURITY.md @@ -45,7 +45,7 @@ Please note the difference between **site config file** and **theme config file* app_key: # # Required for apps from CN region server_url: # - # Dependencies: https://github.com/hexo-next/hexo-leancloud-counter-security + # Dependencies: https://github.com/theme-next/hexo-leancloud-counter-security security: true ``` @@ -98,7 +98,7 @@ Please note the difference between **site config file** and **theme config file* app_key: # # Required for apps from CN region server_url: # - # Dependencies: https://github.com/hexo-next/hexo-leancloud-counter-security + # Dependencies: https://github.com/theme-next/hexo-leancloud-counter-security security: true ``` diff --git a/docs/LICENSE.txt b/docs/LICENSE.txt index b5b8753..735fc78 100644 --- a/docs/LICENSE.txt +++ b/docs/LICENSE.txt @@ -1,6 +1,6 @@ «NexT» – Elegant and powerful theme for Hexo. - Copyright © 2017 «NexT» (github.com/hexo-next/hexo-theme-next). + Copyright © 2017 «NexT» (github.com/next-theme/hexo-theme-next). Detail attribution information for «NexT» is contained in the 'docs/AUTHORS.md' file. diff --git a/docs/MATH.md b/docs/MATH.md index 0e22ee2..776a584 100644 --- a/docs/MATH.md +++ b/docs/MATH.md @@ -157,12 +157,12 @@ markdown: 1. Firstly, please check [Common Issues](https://github.com/Khan/KaTeX#common-issues) of Katex. 2. Displayed Math (i.e. `$$...$$`) needs to started with new clear line.\ - In other words: you must not have any characters (except of whitespaces) **before the opening `$$` and after the ending `$$`** ([comment #32](https://github.com/hexo-next/hexo-theme-next/pull/32#issuecomment-357489509)). -3. Don't support Unicode ([comment #32](https://github.com/hexo-next/hexo-theme-next/pull/32#issuecomment-357489509)). -4. Inline Math (..`$...$`) must not have white spaces **after the opening `$` and before the ending `$`** ([comment #32](https://github.com/hexo-next/hexo-theme-next/pull/32#issuecomment-357489509)). + In other words: you must not have any characters (except of whitespaces) **before the opening `$$` and after the ending `$$`** ([comment #32](https://github.com/theme-next/hexo-theme-next/pull/32#issuecomment-357489509)). +3. Don't support Unicode ([comment #32](https://github.com/theme-next/hexo-theme-next/pull/32#issuecomment-357489509)). +4. Inline Math (..`$...$`) must not have white spaces **after the opening `$` and before the ending `$`** ([comment #32](https://github.com/theme-next/hexo-theme-next/pull/32#issuecomment-357489509)). 5. If you use math in Heading (i.e. `## Heading`).\ - Then in corresponding TOC item it will show the related LaTex code 3 times ([comment #32](https://github.com/hexo-next/hexo-theme-next/pull/32#issuecomment-359018694)). -6. If you use math in your post's title, it will not be rendered ([comment #32](https://github.com/hexo-next/hexo-theme-next/pull/32#issuecomment-359142879)). + Then in corresponding TOC item it will show the related LaTex code 3 times ([comment #32](https://github.com/theme-next/hexo-theme-next/pull/32#issuecomment-359018694)). +6. If you use math in your post's title, it will not be rendered ([comment #32](https://github.com/theme-next/hexo-theme-next/pull/32#issuecomment-359142879)). We currently use Katex 0.11.1, some of those bugs might be caused by the outdated version of Katex we use. diff --git a/docs/UPDATE-FROM-5.1.X.md b/docs/UPDATE-FROM-5.1.X.md index c54f5e4..41966b1 100644 --- a/docs/UPDATE-FROM-5.1.X.md +++ b/docs/UPDATE-FROM-5.1.X.md @@ -1,12 +1,12 @@

Update from NexT v5.1.x

-NexT version 5 works fine with Hexo 3, but for frequent users, you maybe need to upgrade version 5 to 7 to get features and supports in new [Theme-Next](https://github.com/hexo-next/hexo-theme-next) repository. +NexT version 5 works fine with Hexo 3, but for frequent users, you maybe need to upgrade version 5 to 7 to get features and supports in new [Theme-Next](https://github.com/next-theme/hexo-theme-next) repository. There are no hard breaking changes between 5.1.x and the latest version. It's change major version to 7 because: 1. Main repo was rebased from [iissnan's](https://github.com/iissnan/hexo-theme-next) profile to [theme-next](https://github.com/theme-next) organization. 2. Most libraries under the `next/source/lib` directory was moved out to [external repos under NexT organization](https://github.com/theme-next). -3. 3rd-party plugin [`hexo-wordcount`](https://github.com/willin/hexo-wordcount) was replaced by [`hexo-symbols-count-time`](https://github.com/hexo-next/hexo-symbols-count-time) because `hexo-symbols-count-time` no have any external Node.js dependencies, no have [language filter](https://github.com/willin/hexo-wordcount/issues/7) which causes better performance on speed at site generation. +3. 3rd-party plugin [`hexo-wordcount`](https://github.com/willin/hexo-wordcount) was replaced by [`hexo-symbols-count-time`](https://github.com/next-theme/hexo-symbols-count-time) because `hexo-symbols-count-time` no have any external Node.js dependencies, no have [language filter](https://github.com/willin/hexo-wordcount/issues/7) which causes better performance on speed at site generation. So, we suggest to update from version 5 to version 7 in this way: @@ -15,15 +15,15 @@ So, we suggest to update from version 5 to version 7 in this way: 1.2. Custom CSS styles what placed in `next/source/css/_custom/*` and `next/source/css/_variables/*` directories.\ 1.3. Custom layout styles what placed in `next/layout/_custom/*`.\ 1.4. Any another possible custom additions which can be finded by compare tools between repos. -2. Clone new repo to any another directory instead of `next`. For example, in `next-reloaded` directory: `git clone https://github.com/hexo-next/hexo-theme-next themes/next-reloaded`. So, you don't touch your old NexT 5.1.x directory and can work with new `next-reloaded` dir. +2. Clone new repo to any another directory instead of `next`. For example, in `next-reloaded` directory: `git clone https://github.com/next-theme/hexo-theme-next themes/next-reloaded`. So, you don't touch your old NexT 5.1.x directory and can work with new `next-reloaded` dir. 3. Go to Hexo main config and set theme parameter: `theme: next-reloaded`. So, your `next-reloaded` directory must loading with your generation. If you may see any bugs or you simply not like this version, you anytime can switch for 5.1.x version back. 4. Update language configuration (For Chinese) - Since v6.0.3, `zh-Hans` has been renamed to `zh-CN`: https://github.com/hexo-next/hexo-theme-next/releases/tag/v6.0.3 + Since v6.0.3, `zh-Hans` has been renamed to `zh-CN`: https://github.com/next-theme/hexo-theme-next/releases/tag/v6.0.3 Users upgrading to v6.0.3 and later need to explicitly modify the `language` configuration in the Hexo main config file `_config.yml`, otherwise the language display is incorrect. 5. Update Hexo and Hexo plugin If after completing the above steps, an error occurs when executing `hexo s` or` hexo g`, it means that there may be a conflict between the old version of Hexo / Hexo plugin and the new version of the theme NexT. We recommend upgrading Hexo to versions 4.0 and higher and upgrading Hexo plugins to the latest version. You can run `npm outdated` to see all the upgradeable plugins. -And how to enable 3rd-party libraries see [here](https://github.com/hexo-next/hexo-theme-next/blob/master/docs/INSTALLATION.md#plugins). +And how to enable 3rd-party libraries see [here](https://github.com/next-theme/hexo-theme-next/blob/master/docs/INSTALLATION.md#plugins). diff --git a/docs/ru/INSTALLATION.md b/docs/ru/INSTALLATION.md index 3b3d87e..1147477 100644 --- a/docs/ru/INSTALLATION.md +++ b/docs/ru/INSTALLATION.md @@ -23,7 +23,7 @@ _config.yml node_modules package.json public scaffolds source themes ```sh $ mkdir themes/next - $ curl -s https://api.github.com/repos/hexo-next/hexo-theme-next/releases/latest | grep tarball_url | cut -d '"' -f 4 | wget -i - -O- | tar -zx -C themes/next --strip-components=1 + $ curl -s https://api.github.com/repos/next-theme/hexo-theme-next/releases/latest | grep tarball_url | cut -d '"' -f 4 | wget -i - -O- | tar -zx -C themes/next --strip-components=1 ``` Этим способом Вы скачаете **только последнюю версию релиза** (без директории `.git` внутри).\ Поэтому, в дальнейшем будет невозможно обновить эту версию через `git`.\ @@ -38,14 +38,14 @@ _config.yml node_modules package.json public scaffolds source themes ```sh $ mkdir themes/next - $ curl -L https://api.github.com/repos/hexo-next/hexo-theme-next/tarball/v6.0.0 | tar -zxv -C themes/next --strip-components=1 + $ curl -L https://api.github.com/repos/next-theme/hexo-theme-next/tarball/v6.0.0 | tar -zxv -C themes/next --strip-components=1 ``` То же, что и описано выше в способе `curl & tar & wget`, но скачает **только конкретную версию**. * Вариант 2: Установка с помощью [git][git-url]: ```sh - $ git clone --branch v6.0.0 https://github.com/hexo-next/hexo-theme-next themes/next + $ git clone --branch v6.0.0 https://github.com/next-theme/hexo-theme-next themes/next ``` Этот вариант скачает **указанную версию релиза** (включая директорию `.git` внутри).\ И в любой момент Вы можете переключиться на любую весию тэга, но с лимитом до указанной версии. @@ -58,7 +58,7 @@ _config.yml node_modules package.json public scaffolds source themes ```sh $ mkdir themes/next - $ curl -L https://api.github.com/repos/hexo-next/hexo-theme-next/tarball | tar -zxv -C themes/next --strip-components=1 + $ curl -L https://api.github.com/repos/next-theme/hexo-theme-next/tarball | tar -zxv -C themes/next --strip-components=1 ``` То же, что и описано выше в варианте `curl & tar & wget`, но скачает **только последнюю мастер-ветку**.\ В некоторых случаях полезно для разработчиков. @@ -66,7 +66,7 @@ _config.yml node_modules package.json public scaffolds source themes * Вариант 2: Установка с помощью [git][git-url]: ```sh - $ git clone https://github.com/hexo-next/hexo-theme-next themes/next + $ git clone https://github.com/next-theme/hexo-theme-next themes/next ``` Этот вариант скачает **весь репозиторий** (включая директорию `.git` внутри).\ @@ -107,15 +107,15 @@ _config.yml node_modules package.json public scaffolds source themes theme: next ``` -[download-latest-url]: https://github.com/hexo-next/hexo-theme-next/archive/master.zip -[releases-latest-url]: https://github.com/hexo-next/hexo-theme-next/releases/latest -[releases-url]: https://github.com/hexo-next/hexo-theme-next/releases -[tags-url]: https://github.com/hexo-next/hexo-theme-next/tags -[commits-url]: https://github.com/hexo-next/hexo-theme-next/commits/master +[download-latest-url]: https://github.com/next-theme/hexo-theme-next/archive/master.zip +[releases-latest-url]: https://github.com/next-theme/hexo-theme-next/releases/latest +[releases-url]: https://github.com/next-theme/hexo-theme-next/releases +[tags-url]: https://github.com/next-theme/hexo-theme-next/tags +[commits-url]: https://github.com/next-theme/hexo-theme-next/commits/master [git-url]: http://lmgtfy.com/?q=linux+git+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 -[update-with-git-url]: https://github.com/hexo-next/hexo-theme-next/blob/master/docs/ru/README.md#%D0%A3%D1%81%D1%82%D0%B0%D0%BD%D0%BE%D0%B2%D0%BA%D0%B0 -[docs-data-files-url]: https://github.com/hexo-next/hexo-theme-next/blob/master/docs/ru/DATA-FILES.md +[update-with-git-url]: https://github.com/next-theme/hexo-theme-next/blob/master/docs/ru/README.md#%D0%A3%D1%81%D1%82%D0%B0%D0%BD%D0%BE%D0%B2%D0%BA%D0%B0 +[docs-data-files-url]: https://github.com/next-theme/hexo-theme-next/blob/master/docs/ru/DATA-FILES.md diff --git a/docs/ru/README.md b/docs/ru/README.md index eee2abd..c4a339e 100644 --- a/docs/ru/README.md +++ b/docs/ru/README.md @@ -5,7 +5,7 @@ 🇷🇺 -#
e x T
+#
e x T

«NexT» — элегантная высококачественная тема под Hexo. Сделана с нуля, с любовью. @@ -14,8 +14,8 @@ - - + +

@@ -26,7 +26,7 @@ 💟 Muse | 🔯 Mist | ♓️ Pisces | ♊️ Gemini

- Больше примеров «NexT» здесь. + Больше примеров «NexT» здесь.

## Установка @@ -35,7 +35,7 @@ ```sh $ cd hexo -$ git clone https://github.com/hexo-next/hexo-theme-next themes/next +$ git clone https://github.com/next-theme/hexo-theme-next themes/next ``` Или предлагаю почитать [детальные инструкции по установке][docs-installation-url], если вариант выше не устраивает. @@ -48,7 +48,7 @@ $ git clone https://github.com/hexo-next/hexo-theme-next themes/next ```yml # Easily enable fast Ajax navigation on your website. -# Dependencies: https://github.com/hexo-next/pjax +# Dependencies: https://github.com/next-theme/pjax pjax: true ``` @@ -101,9 +101,9 @@ $ git pull Crowdin позволяет нам удобно переводить документацию.

-[docs-installation-url]: https://github.com/hexo-next/hexo-theme-next/blob/master/docs/ru/INSTALLATION.md -[docs-data-files-url]: https://github.com/hexo-next/hexo-theme-next/blob/master/docs/ru/DATA-FILES.md -[docs-update-5-1-x-url]: https://github.com/hexo-next/hexo-theme-next/blob/master/docs/ru/UPDATE-FROM-5.1.X.md +[docs-installation-url]: https://github.com/next-theme/hexo-theme-next/blob/master/docs/ru/INSTALLATION.md +[docs-data-files-url]: https://github.com/next-theme/hexo-theme-next/blob/master/docs/ru/DATA-FILES.md +[docs-update-5-1-x-url]: https://github.com/next-theme/hexo-theme-next/blob/master/docs/ru/UPDATE-FROM-5.1.X.md [t-news-url]: https://t.me/theme_next_news [t-chat-url]: https://t.me/theme_next @@ -111,12 +111,12 @@ $ git pull [riot-url]: https://riot.im/app/#/room/#theme-next:matrix.org [i18n-url]: https://i18n.theme-next.org -[awesome-next-url]: https://github.com/hexo-next/awesome-next -[issues-bug-url]: https://github.com/hexo-next/hexo-theme-next/issues/new?assignees=&labels=Bug&template=bug-report.md -[issues-feat-url]: https://github.com/hexo-next/hexo-theme-next/issues/new?assignees=&labels=Feature+Request&template=feature-request.md -[feat-req-vote-url]: https://github.com/hexo-next/hexo-theme-next/issues?q=is%3Aopen+is%3Aissue+label%3A%22Feature+Request%22 +[awesome-next-url]: https://github.com/next-theme/awesome-next +[issues-bug-url]: https://github.com/next-theme/hexo-theme-next/issues/new?assignees=&labels=Bug&template=bug-report.md +[issues-feat-url]: https://github.com/next-theme/hexo-theme-next/issues/new?assignees=&labels=Feature+Request&template=feature-request.md +[feat-req-vote-url]: https://github.com/next-theme/hexo-theme-next/issues?q=is%3Aopen+is%3Aissue+label%3A%22Feature+Request%22 -[contributing-document-url]: https://github.com/hexo-next/hexo-theme-next/blob/master/.github/CONTRIBUTING.md +[contributing-document-url]: https://github.com/next-theme/hexo-theme-next/blob/master/.github/CONTRIBUTING.md [official-plugins-url]: https://github.com/theme-next -[contributors-image]: https://opencollective.com/hexo-next/contributors.svg?width=890 -[contributors-url]: https://github.com/hexo-next/hexo-theme-next/graphs/contributors +[contributors-image]: https://opencollective.com/next-theme/contributors.svg?width=890 +[contributors-url]: https://github.com/next-theme/hexo-theme-next/graphs/contributors diff --git a/docs/ru/UPDATE-FROM-5.1.X.md b/docs/ru/UPDATE-FROM-5.1.X.md index ae7247b..b919ca5 100644 --- a/docs/ru/UPDATE-FROM-5.1.X.md +++ b/docs/ru/UPDATE-FROM-5.1.X.md @@ -3,7 +3,7 @@ Между версией 5.1.x и последней версиями нет жёстких изменений. Версия сменилась на мажорную 7 по следующим причинам: 1. Основной репозиторий перебазировался из профиля [iissnan'а](https://github.com/iissnan/hexo-theme-next) в [theme-next](https://github.com/theme-next) организацию. 2. Большинство библиотек в `next/source/lib` директории были вынесены в [отдельные репозитории под организацией NexT](https://github.com/theme-next). -3. 3rd-party плагин [`hexo-wordcount`](https://github.com/willin/hexo-wordcount) был заменён на [`hexo-symbols-count-time`](https://github.com/hexo-next/hexo-symbols-count-time) т.к. `hexo-symbols-count-time` не имеет никаких сторонних Node.js зависимостей, не имеет [языкового фильтра](https://github.com/willin/hexo-wordcount/issues/7) что обеспечивает улучшенную производительность при генерации сайта. +3. 3rd-party плагин [`hexo-wordcount`](https://github.com/willin/hexo-wordcount) был заменён на [`hexo-symbols-count-time`](https://github.com/next-theme/hexo-symbols-count-time) т.к. `hexo-symbols-count-time` не имеет никаких сторонних Node.js зависимостей, не имеет [языкового фильтра](https://github.com/willin/hexo-wordcount/issues/7) что обеспечивает улучшенную производительность при генерации сайта. Поэтому, я предлагаю обновиться с версии 5 на версию 7 следующим способом: @@ -12,7 +12,7 @@ 1.2. Пользовательских CSS-стилей, которые расположены в `next/source/css/_custom/*` и `next/source/css/_variables/*` директориях.\ 1.3. Пользовательских layout-стилей, которые расположены в `next/layout/_custom/*`.\ 1.4. Любые другие всевозможные пользовательские изменения, которые могут быть найдены любым инструментом для сравнения файлов. -2. Склонировать новый репозиторий в любую другую директорию, отличную от `next`. Например, в директорию `next-reloaded`: `git clone https://github.com/hexo-next/hexo-theme-next themes/next-reloaded`. Итак, нет необходимости трогать старую NexT 5.1.x директорию и можно работать с новой `next-reloaded`. +2. Склонировать новый репозиторий в любую другую директорию, отличную от `next`. Например, в директорию `next-reloaded`: `git clone https://github.com/next-theme/hexo-theme-next themes/next-reloaded`. Итак, нет необходимости трогать старую NexT 5.1.x директорию и можно работать с новой `next-reloaded`. 3. Открываем главную Hexo-конфигурацию и устанавливаем параметр темы: `theme: next-reloaded`. Так Ваша директория `next-reloaded` должна грузиться при генерации. Если Вы будете наблюдать какие-либо баги или Вам попросту не нравится эта новая версия, в любой момент Вы можете использовать старую 5.1.x. -А как активировать 3rd-party библиотеки, смотрим здесь [здесь](https://github.com/hexo-next/hexo-theme-next/blob/master/docs/ru/INSTALLATION.md#%D0%9F%D0%BB%D0%B0%D0%B3%D0%B8%D0%BD%D1%8B). +А как активировать 3rd-party библиотеки, смотрим здесь [здесь](https://github.com/next-theme/hexo-theme-next/blob/master/docs/ru/INSTALLATION.md#%D0%9F%D0%BB%D0%B0%D0%B3%D0%B8%D0%BD%D1%8B). diff --git a/docs/zh-CN/CODE_OF_CONDUCT.md b/docs/zh-CN/CODE_OF_CONDUCT.md index b93aa52..eb814a3 100644 --- a/docs/zh-CN/CODE_OF_CONDUCT.md +++ b/docs/zh-CN/CODE_OF_CONDUCT.md @@ -5,11 +5,11 @@ :ru: -#
e x T
+#
e x T
[NexT](https://theme-next.org) 是一个优雅而强大的 [Hexo](https://hexo.io/)主题。在这里，您可以构建一个托管在 [GitHub Pages](https://pages.github.com/) 上的静态博客，分享您的生活，并与新朋友进行交流。 -参与者公约用来约束在 [NexT](https://github.com/hexo-next/hexo-theme-next) 社区中代码更新、问题交流、请求合并等行为。我们期望所有用户相互尊重，礼貌待人。任何违反这些规则的人都将不会被审核，并会在发现后立即被阻止和驱逐。 +参与者公约用来约束在 [NexT](https://github.com/next-theme/hexo-theme-next) 社区中代码更新、问题交流、请求合并等行为。我们期望所有用户相互尊重，礼貌待人。任何违反这些规则的人都将不会被审核，并会在发现后立即被阻止和驱逐。 ## 目录 diff --git a/docs/zh-CN/CONTRIBUTING.md b/docs/zh-CN/CONTRIBUTING.md index e52b3cb..ddb9313 100644 --- a/docs/zh-CN/CONTRIBUTING.md +++ b/docs/zh-CN/CONTRIBUTING.md @@ -5,7 +5,7 @@ :ru: -#
e x T
+#
e x T
首先，非常感谢大家抽出宝贵时间来让我们的 NexT 主题越变越好。在这里，我们介绍一下 [NexT 主题及其子模块](https://github.com/theme-next) 的开源贡献指南。不过，我们希望大家不要局限于此，更欢迎大家随时进行补充。 @@ -37,7 +37,7 @@ 如果你在使用过程中遇到了问题，你可以查阅 [FAQs](https://theme-next.org/docs/faqs) 或者 [NexT 帮助文档](https://theme-next.org/docs/troubleshooting)。 -另外，你也可以通过 [这里](https://github.com/hexo-next/hexo-theme-next/search?q=&type=Issues&utf8=%E2%9C%93) 进行大致检索，有些问题已经得到解答，你可以自行解决。对于没有解决的 Issue，你也可以继续提问。 +另外，你也可以通过 [这里](https://github.com/next-theme/hexo-theme-next/search?q=&type=Issues&utf8=%E2%9C%93) 进行大致检索，有些问题已经得到解答，你可以自行解决。对于没有解决的 Issue，你也可以继续提问。 #### 快速调试指南 @@ -52,7 +52,7 @@ 如果你得到了来自 Hexo 或浏览器控制台的报错信息，请在 Google / Stackoverflow / GitHub Issue 中搜寻，或在提交 Issue 时报告给我们。 -如果你在使用过程中发现了 Bug，请再次确认 Bug 在 [最新发布版本](https://github.com/hexo-next/hexo-theme-next/releases/latest) 中是否重现。如果 Bug 重现，欢迎你到我们的 [主题仓库](https://github.com/hexo-next/hexo-theme-next) 中 [反馈 Bug](#reporting-bugs) 或者 [提交功能需求](#提交功能需求)，也更期待您 [提交合并请求](#提交合并请求)。 +如果你在使用过程中发现了 Bug，请再次确认 Bug 在 [最新发布版本](https://github.com/next-theme/hexo-theme-next/releases/latest) 中是否重现。如果 Bug 重现，欢迎你到我们的 [主题仓库](https://github.com/next-theme/hexo-theme-next) 中 [反馈 Bug](#reporting-bugs) 或者 [提交功能需求](#提交功能需求)，也更期待您 [提交合并请求](#提交合并请求)。 ### 反馈 Bug @@ -64,7 +64,7 @@ * 参照如下问题尽可能多的提供信息： * Bug 是否能够重现？是一直出现还是偶尔出现？ * Bug 是从什么时候开始发生的？ - * 如果 Bug 突然发生，使用 [旧版本主题](https://github.com/hexo-next/hexo-theme-next/releases) 是否能够重现 Bug？又是从哪个版本开始出现 Bug？ + * 如果 Bug 突然发生，使用 [旧版本主题](https://github.com/next-theme/hexo-theme-next/releases) 是否能够重现 Bug？又是从哪个版本开始出现 Bug？ * 你所使用 Node，Hexo 以及 Next 的版本号多少？你可以运行 `node -v` 和 `hexo version` 获取版本号，或者查看文件 `package.json` 的内容。 * 你使用了哪些插件包？查看文件 `package.json` 的内容即可获取。 * 一步步详细你是如何重现 Bug 的，做了什么，使用了哪些功能等等。如果你需要展示代码段，请使用 [Markdown 代码块](https://help.github.com/articles/creating-and-highlighting-code-blocks/) 或 [Github 预览链接](https://help.github.com/articles/creating-a-permanent-link-to-a-code-snippet/) 或 [Gist 链接](https://gist.github.com/)。 @@ -104,7 +104,7 @@ 版本发布是将项目发布给用户的一种很好的方式。 1. 进入 GitHub 项目主页，点击 **Releases** 和 **Draft a new release**。 -2. 输入你需要发布的版本号。版本控制是基于 [Git tags](https://git-scm.com/book/en/Git-Basics-Tagging) 工作的，建议按照 [About Major and Minor NexT versions](https://github.com/hexo-next/hexo-theme-next/issues/187) 确定版本号。 +2. 输入你需要发布的版本号。版本控制是基于 [Git tags](https://git-scm.com/book/en/Git-Basics-Tagging) 工作的，建议按照 [About Major and Minor NexT versions](https://github.com/theme-next/hexo-theme-next/issues/187) 确定版本号。 3. 确定你需要发布的分支。除非发布测试版本，通常情况下选择 `master` 分支。 4. 输入发布版本的标题和说明。 - 标题为版本号。 diff --git a/docs/zh-CN/DATA-FILES.md b/docs/zh-CN/DATA-FILES.md index 0194f0b..6f4963d 100644 --- a/docs/zh-CN/DATA-FILES.md +++ b/docs/zh-CN/DATA-FILES.md @@ -1,61 +1,39 @@ -

数据文件

+

配置文件

-目前，通过 pull 或下载新的 release 版本来更新 NexT 主题的体验并不平滑。当用户使用 `git pull` 更新 NexT 主题时经常需要解决冲突问题，而在手动下载 release 版本时也经常需要手动合并配置。 +如何配置 Hexo 和 NexT？传统的做法是存储部分配置在 Hexo 站点配置文件（`/_config.yml`），而另一部分在主题配置文件（`/themes/next/_config.yml`）。这一方式固然可用，但通过 `git pull` 或下载新的 release 版本来更新 NexT 主题的体验并不平滑。当用户使用 `git pull` 更新 NexT 主题时经常需要解决冲突问题，而在手动下载 release 版本时也经常需要手动合并配置。对于新版本的 Hexo，主题可以通过 npm 安装；直接修改 `node_modules` 中的主题配置文件同样是困难的。 -现在来说，NexT 推荐用户存储部分配置在 Hexo 站点配置文件（`/_config.yml`），而另一部分在主题配置文件（`/themes/next/_config.yml`）。这一方式固然可用，但也有一些缺点： -1. 配置项被分裂为两部分； -2. 用户难以弄清何处存放配置选项。 +为了解决这一问题，Hexo 提供了以下这些方案。请任选其一，然后继续后面的步骤。 -为了解决这一问题，NexT 提供了以下两种方案。 +## `theme_config` 方式 -

选择 1：Hexo 方式

+使用这一方式，你的全部配置都将置于 Hexo 站点配置文件（`/_config.yml`）中，并且不需要修改 `/themes/next/_config.yml`，或者创建什么其他的文件。但是所有用到的主题选项必须放置在 `theme_config` 后，并全部增加两个空格的缩进。 -使用这一方式，你的全部配置都将置于 Hexo 站点配置文件（`/_config.yml`），并且不需要修改 `/themes/next/_config.yml`，或者创建什么其他的文件。但是所有用到的主题选项必须放置在 `theme_config` 后，并全部增加两个空格的缩进。 - -如果在新的 release 中新增了选项，那么你只需要从 `/themes/next/_config.yml` 中将他们复制到 `/_config.yml` 中并将它们的值设置为你想要的。 +如果在新的 release 中新增了选项，那么你只需要从 `/themes/next/_config.yml` 中将它们复制到 `/_config.yml` 中并将它们的值设置为你想要的。 ### 用法 -1. 请确认不存在 `/source/_data/next.yml` 文件（如果已存在，请删除） -2. 从主题的 `/themes/next/_config.yml` 文件中复制你需要的 NexT 配置项到 `/_config.yml` 中，然后\ - 2.1. 所有这些配置项右移两个空格（在 Visual Studio Code 中：选中这些文字，CTRL + ]）。\ - 2.2. 在这些参数最上方添加一行 `theme_config:`。 +从主题的 `/themes/next/_config.yml` 文件中复制你需要的 NexT 配置项到 `/_config.yml` 中，然后\ +1. 所有这些配置项右移两个空格（在 Visual Studio Code 中：选中这些文字，CTRL + ]）。\ +2. 在这些参数最上方添加一行 `theme_config:`。 -### 相关链接 +## `_config.[name].yml` 方式 + +使用这一方式，你的主题配置将置于配置文件 `/_config.[name].yml` 中。这里的 `[name]` 需要替换为 Hexo 站点配置文件（`/_config.yml`）中 `theme` 项的名字，例如 `next`。 + +如果在新的 release 中新增了选项，那么你只需要从 `/themes/next/_config.yml` 中将它们复制到此配置文件中并将它们的值设置为你想要的。 + +### 用法 + +1. 请确认你的 Hexo 版本为 4.3 或更高。 +2. 根据你所使用的 NexT 主题的名字，在 Hexo 根目录下创建配置文件，例如 `_config.next.yml`。 +3. 从主题的 `/themes/next/_config.yml` 文件中复制你需要的 NexT 配置项到此配置文件中。 + +## `next.yml` 方式 + +较旧版本的 NexT 主题还提供了另一种配置方法，那就是将主题配置放置在 `/source/_data/next.yml` 文件中。这一方法已经废弃，请使用 `_config.[name].yml` 方式替代。如果存在 `/source/_data/next.yml` 文件，请将其移动到 Hexo 根目录并重命名为 `_config.next.yml`。 + +## 相关链接 * [Hexo 配置](https://hexo.io/zh-cn/docs/configuration.html) * [Hexo Pull #757](https://github.com/hexojs/hexo/pull/757) - -

选择 2: NexT 方式

- -使用这一方式，你现在可以将你的全部配置置于同一位置（`/source/_data/next.yml`），并且不需要修改 `/themes/next/_config.yml`。 -但是可能无法让所有 Hexo 外部库都准确处理它们的附加选项（举个例子，`hexo-server` 模块只会从 Hexo 默认配置文件中读取选项）。 - -如果在新的 release 中出现了任何新的选项，那么你只需要从 `/themes/next/_config.yml` 中将他们复制到 `/source/_data/next.yml` 中并设置它们的值为你想要的选项。 - -这一方法依赖于 Hexo 的[数据文件](https://hexo.io/docs/data-files.html)特性。因为数据文件是在 Hexo 3 中被引入，所以你需要更新至 Hexo 3.0 以后的版本来使用这一特性。 - -### 用法 - -1. 请确认你的 Hexo 版本为 3.0 或更高。 -2. 在你站点的 `/source/_data` 目录创建一个 `next.yml` 文件（如果 `_data` 目录不存在，请创建之）。 - -

以上步骤之后有 两种选择，请任选其一然后继续后面的步骤。

- -* **选择 1：`override: false`（默认）**： - - 1. 检查默认 NexT 配置中的 `override` 选项，必须设置为 `false`。\ - 在 `next.yml` 文件中，也要设置为 `false`，或者不定义此选项。 - 2. 从站点配置文件（`/_config.yml`）与主题配置文件（`/themes/next/_config.yml`）中复制你需要的选项到 `/source/_data/next.yml` 中。 - -* **选择 2：`override: true`**： - - 1. 在 `next.yml` 中设置 `override` 选项为 `true`。 - 2. 从 `/themes/next/_config.yml` 配置文件中复制**所有**的 NexT 主题选项到 `/source/_data/next.yml` 中。 - -3. 然后，在站点的 `/_config.yml` 中需要定义 `theme: next` 选项（如果需要的话，`source_dir: source`）。 -4. 使用标准参数来启动服务器，生成或部署（`hexo clean && hexo g -d && hexo s`）。 - -### 相关链接 - -* [NexT Issue #328](https://github.com/iissnan/hexo-theme-next/issues/328) +* [Hexo Pull #4120](https://github.com/hexojs/hexo/pull/4120) diff --git a/docs/zh-CN/INSTALLATION.md b/docs/zh-CN/INSTALLATION.md index 4132c09..17ad36e 100644 --- a/docs/zh-CN/INSTALLATION.md +++ b/docs/zh-CN/INSTALLATION.md @@ -23,7 +23,7 @@ _config.yml node_modules package.json public scaffolds source themes ```sh $ mkdir themes/next - $ curl -s https://api.github.com/repos/hexo-next/hexo-theme-next/releases/latest | grep tarball_url | cut -d '"' -f 4 | wget -i - -O- | tar -zx -C themes/next --strip-components=1 + $ curl -s https://api.github.com/repos/next-theme/hexo-theme-next/releases/latest | grep tarball_url | cut -d '"' -f 4 | wget -i - -O- | tar -zx -C themes/next --strip-components=1 ``` 这种方式将**仅提供最新的 release 版本**（其中不附带 `.git` 目录）。\ 因此，将来你将不可能通过 `git` 更新这一方式安装的主题。\ @@ -38,14 +38,14 @@ _config.yml node_modules package.json public scaffolds source themes ```sh $ mkdir themes/next - $ curl -L https://api.github.com/repos/hexo-next/hexo-theme-next/tarball/v6.0.0 | tar -zxv -C themes/next --strip-components=1 + $ curl -L https://api.github.com/repos/next-theme/hexo-theme-next/tarball/v6.0.0 | tar -zxv -C themes/next --strip-components=1 ``` 和上述的 `curl、tar 和 wget` 方法相同，但只会下载**指定的 release 版本**。 * 方式 2：使用 [git][git-url] 安装： ```sh - $ git clone --branch v6.0.0 https://github.com/hexo-next/hexo-theme-next themes/next + $ git clone --branch v6.0.0 https://github.com/next-theme/hexo-theme-next themes/next ``` 这一方式将为你下载**指定的 release 版本**（其中包含 `.git` 目录）。\ 并且，你可以随时切换到任何已定义的版本号所对应的 tag 的版本。 @@ -58,7 +58,7 @@ _config.yml node_modules package.json public scaffolds source themes ```sh $ mkdir themes/next - $ curl -L https://api.github.com/repos/hexo-next/hexo-theme-next/tarball | tar -zxv -C themes/next --strip-components=1 + $ curl -L https://api.github.com/repos/next-theme/hexo-theme-next/tarball | tar -zxv -C themes/next --strip-components=1 ``` 和上述的 `curl、tar 和 wget` 方法相同，但只会下载**最新 master 分支版本**。\ 在有些情况对开发者有所帮助。 @@ -66,7 +66,7 @@ _config.yml node_modules package.json public scaffolds source themes * 方式 2：使用 [git][git-url] 安装： ```sh - $ git clone https://github.com/hexo-next/hexo-theme-next themes/next + $ git clone https://github.com/next-theme/hexo-theme-next themes/next ``` 这一方式将为你下载**完整仓库**（其中包含 `.git` 目录）。\ @@ -107,15 +107,15 @@ _config.yml node_modules package.json public scaffolds source themes theme: next ``` -[download-latest-url]: https://github.com/hexo-next/hexo-theme-next/archive/master.zip -[releases-latest-url]: https://github.com/hexo-next/hexo-theme-next/releases/latest -[releases-url]: https://github.com/hexo-next/hexo-theme-next/releases -[tags-url]: https://github.com/hexo-next/hexo-theme-next/tags -[commits-url]: https://github.com/hexo-next/hexo-theme-next/commits/master +[download-latest-url]: https://github.com/next-theme/hexo-theme-next/archive/master.zip +[releases-latest-url]: https://github.com/next-theme/hexo-theme-next/releases/latest +[releases-url]: https://github.com/next-theme/hexo-theme-next/releases +[tags-url]: https://github.com/next-theme/hexo-theme-next/tags +[commits-url]: https://github.com/next-theme/hexo-theme-next/commits/master [git-url]: http://lmgtfy.com/?q=linux+git+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 -[update-with-git-url]: https://github.com/hexo-next/hexo-theme-next/blob/master/docs/zh-CN/README.md#update -[docs-data-files-url]: https://github.com/hexo-next/hexo-theme-next/blob/master/docs/zh-CN/DATA-FILES.md +[update-with-git-url]: https://github.com/next-theme/hexo-theme-next/blob/master/docs/zh-CN/README.md#update +[docs-data-files-url]: https://github.com/next-theme/hexo-theme-next/blob/master/docs/zh-CN/DATA-FILES.md diff --git a/docs/zh-CN/LEANCLOUD-COUNTER-SECURITY.md b/docs/zh-CN/LEANCLOUD-COUNTER-SECURITY.md index b491de1..c955c0d 100644 --- a/docs/zh-CN/LEANCLOUD-COUNTER-SECURITY.md +++ b/docs/zh-CN/LEANCLOUD-COUNTER-SECURITY.md @@ -50,7 +50,7 @@ app_key: # # Required for apps from CN region server_url: # - # Dependencies: https://github.com/hexo-next/hexo-leancloud-counter-security + # Dependencies: https://github.com/theme-next/hexo-leancloud-counter-security security: true ``` @@ -109,7 +109,7 @@ app_key: # # Required for apps from CN region server_url: # - # Dependencies: https://github.com/hexo-next/hexo-leancloud-counter-security + # Dependencies: https://github.com/theme-next/hexo-leancloud-counter-security security: true ``` diff --git a/docs/zh-CN/MATH.md b/docs/zh-CN/MATH.md index 42d182f..3a45672 100644 --- a/docs/zh-CN/MATH.md +++ b/docs/zh-CN/MATH.md @@ -155,12 +155,12 @@ markdown: 1. 首先请查阅 Katex 的 [Common Issue](https://github.com/Khan/KaTeX#common-issues) 2. 块级公式(例如 `$$...$$`)必须位于空行。\ - 即在开头的 `$$` 前和在结尾的 `$$` 后不能有除了空白字符以外的其他字符。([#32comment](https://github.com/hexo-next/hexo-theme-next/pull/32#issuecomment-357489509)) -3. 不支持 Unicode。([#32comment](https://github.com/hexo-next/hexo-theme-next/pull/32#issuecomment-357489509)) -4. 行内公式(例如 `$...$`)在开头的 `$` 后面和结尾的 `$` 前面**不能含有空格**。([#32comment](https://github.com/hexo-next/hexo-theme-next/pull/32#issuecomment-357489509)) + 即在开头的 `$$` 前和在结尾的 `$$` 后不能有除了空白字符以外的其他字符。([#32comment](https://github.com/theme-next/hexo-theme-next/pull/32#issuecomment-357489509)) +3. 不支持 Unicode。([#32comment](https://github.com/theme-next/hexo-theme-next/pull/32#issuecomment-357489509)) +4. 行内公式(例如 `$...$`)在开头的 `$` 后面和结尾的 `$` 前面**不能含有空格**。([#32comment](https://github.com/theme-next/hexo-theme-next/pull/32#issuecomment-357489509)) 5. 如果你在文章的各级标题中(例如 `## 标题`)使用公式。\ - 那么文章目录中的这个标题会出现 3 次未渲染的公式代码([#32comment](https://github.com/hexo-next/hexo-theme-next/pull/32#issuecomment-359018694)) -6. 如果你在文章 Title 中使用公式，那么公式将不会被渲染。([#32comment](https://github.com/hexo-next/hexo-theme-next/pull/32#issuecomment-359142879)) + 那么文章目录中的这个标题会出现 3 次未渲染的公式代码([#32comment](https://github.com/theme-next/hexo-theme-next/pull/32#issuecomment-359018694)) +6. 如果你在文章 Title 中使用公式，那么公式将不会被渲染。([#32comment](https://github.com/theme-next/hexo-theme-next/pull/32#issuecomment-359142879)) 我们目前使用的 Katex 版本为 0.11.1，这里面可能有某些问题是因为 Katex 版本老旧导致的； diff --git a/docs/zh-CN/README.md b/docs/zh-CN/README.md index c7242a9..4072029 100644 --- a/docs/zh-CN/README.md +++ b/docs/zh-CN/README.md @@ -5,7 +5,7 @@ 🇷🇺 -#
e x T
+#
e x T

«NexT» 是一款风格优雅的高质量 Hexo 主题，自点点滴滴中用爱雕琢而成。 @@ -14,8 +14,8 @@ - - + +

@@ -26,7 +26,7 @@ 💟 Muse | 🔯 Mist | ♓️ Pisces | ♊️ Gemini

- 更多 «NexT» 的例子参见这里。 + 更多 «NexT» 的例子参见这里。

## 安装 @@ -35,7 +35,7 @@ ```sh $ cd hexo -$ git clone https://github.com/hexo-next/hexo-theme-next themes/next +$ git clone https://github.com/next-theme/hexo-theme-next themes/next ``` 此外，如果你想要使用其他方式，你也可以参见[详细安装步骤][docs-installation-url]。 @@ -48,7 +48,7 @@ NexT 支持大量的第三方插件，它们可以被轻松地配置。 ```yml # Easily enable fast Ajax navigation on your website. -# Dependencies: https://github.com/hexo-next/pjax +# Dependencies: https://github.com/next-theme/pjax pjax: true ``` @@ -119,9 +119,9 @@ $ git pull Crowdin 容许我们方便地翻译文档。

-[docs-installation-url]: https://github.com/hexo-next/hexo-theme-next/blob/master/docs/zh-CN/INSTALLATION.md -[docs-data-files-url]: https://github.com/hexo-next/hexo-theme-next/blob/master/docs/zh-CN/DATA-FILES.md -[docs-update-5-1-x-url]: https://github.com/hexo-next/hexo-theme-next/blob/master/docs/zh-CN/UPDATE-FROM-5.1.X.md +[docs-installation-url]: https://github.com/next-theme/hexo-theme-next/blob/master/docs/zh-CN/INSTALLATION.md +[docs-data-files-url]: https://github.com/next-theme/hexo-theme-next/blob/master/docs/zh-CN/DATA-FILES.md +[docs-update-5-1-x-url]: https://github.com/next-theme/hexo-theme-next/blob/master/docs/zh-CN/UPDATE-FROM-5.1.X.md [t-news-url]: https://t.me/theme_next_news [t-chat-url]: https://t.me/theme_next_chinese @@ -129,12 +129,12 @@ $ git pull [riot-url]: https://riot.im/app/#/room/#theme-next:matrix.org [i18n-url]: https://i18n.theme-next.org -[awesome-next-url]: https://github.com/hexo-next/awesome-next -[issues-bug-url]: https://github.com/hexo-next/hexo-theme-next/issues/new?assignees=&labels=Bug&template=bug-report.md -[issues-feat-url]: https://github.com/hexo-next/hexo-theme-next/issues/new?assignees=&labels=Feature+Request&template=feature-request.md -[feat-req-vote-url]: https://github.com/hexo-next/hexo-theme-next/issues?q=is%3Aopen+is%3Aissue+label%3A%22Feature+Request%22 +[awesome-next-url]: https://github.com/next-theme/awesome-next +[issues-bug-url]: https://github.com/next-theme/hexo-theme-next/issues/new?assignees=&labels=Bug&template=bug-report.md +[issues-feat-url]: https://github.com/next-theme/hexo-theme-next/issues/new?assignees=&labels=Feature+Request&template=feature-request.md +[feat-req-vote-url]: https://github.com/next-theme/hexo-theme-next/issues?q=is%3Aopen+is%3Aissue+label%3A%22Feature+Request%22 -[contributing-document-url]: https://github.com/hexo-next/hexo-theme-next/blob/master/docs/zh-CN/CONTRIBUTING.md +[contributing-document-url]: https://github.com/next-theme/hexo-theme-next/blob/master/docs/zh-CN/CONTRIBUTING.md [official-plugins-url]: https://github.com/theme-next -[contributors-image]: https://opencollective.com/hexo-next/contributors.svg?width=890 -[contributors-url]: https://github.com/hexo-next/hexo-theme-next/graphs/contributors +[contributors-image]: https://opencollective.com/next-theme/contributors.svg?width=890 +[contributors-url]: https://github.com/next-theme/hexo-theme-next/graphs/contributors diff --git a/docs/zh-CN/UPDATE-FROM-5.1.X.md b/docs/zh-CN/UPDATE-FROM-5.1.X.md index c155699..95d7aa7 100644 --- a/docs/zh-CN/UPDATE-FROM-5.1.X.md +++ b/docs/zh-CN/UPDATE-FROM-5.1.X.md @@ -1,12 +1,12 @@

从 NexT v5.1.x 更新

-在使用 Hexo 3 时，NexT V5 版本仍然能够正常运行，但是如果你想获得更多的功能和帮助，还是建议您升级到 NexT V7+ 版本，并移步 [Theme-Next](https://github.com/hexo-next/hexo-theme-next) 仓库。 +在使用 Hexo 3 时，NexT V5 版本仍然能够正常运行，但是如果你想获得更多的功能和帮助，还是建议您升级到 NexT V7+ 版本，并移步 [Theme-Next](https://github.com/next-theme/hexo-theme-next) 仓库。 在 5.1.x 版本和新版本之间没有很大的革命性改进。主版本号变更至 7 主要是因为： 1. 主仓库已从 [iissnan 名下](https://github.com/iissnan/hexo-theme-next) 迁移至 [theme-next](https://github.com/theme-next) 组织。 2. `next/source/lib` 目录下的绝大多数库被移出到了 [NexT 组织的外部仓库](https://github.com/theme-next)中。 -3. 第三方插件 [`hexo-wordcount`](https://github.com/willin/hexo-wordcount) 被 [`hexo-symbols-count-time`](https://github.com/hexo-next/hexo-symbols-count-time) 所取代，因为 `hexo-symbols-count-time` 没有任何外部 Node.js 依赖、也没有会导致生成站点时的性能问题 [language filter](https://github.com/willin/hexo-wordcount/issues/7)。 +3. 第三方插件 [`hexo-wordcount`](https://github.com/willin/hexo-wordcount) 被 [`hexo-symbols-count-time`](https://github.com/next-theme/hexo-symbols-count-time) 所取代，因为 `hexo-symbols-count-time` 没有任何外部 Node.js 依赖、也没有会导致生成站点时的性能问题 [language filter](https://github.com/willin/hexo-wordcount/issues/7)。 我们推荐通过如下步骤从 v5 升级到 v7： @@ -17,7 +17,7 @@ 4. 任何其它可能的附加自定义内容；为了定位它们，你可以通过某些工具在仓库间比较。 2. 克隆新的仓库到任一异于 `next` 的目录（如 `next-reloaded`）： ```sh - $ git clone https://github.com/hexo-next/hexo-theme-next themes/next-reloaded + $ git clone https://github.com/next-theme/hexo-theme-next themes/next-reloaded ``` 如此，你可以在不修改原有的 NexT v5.1.x 目录的同时使用 `next-reloaded` 目录中的新版本主题。 3. 在 Hexo 的主配置文件中设置主题： @@ -30,11 +30,11 @@ 4. 更新语言配置 - 从 v6.0.3 版本起，`zh-Hans` 改名为 `zh-CN`：https://github.com/hexo-next/hexo-theme-next/releases/tag/v6.0.3 + 从 v6.0.3 版本起，`zh-Hans` 改名为 `zh-CN`：https://github.com/next-theme/hexo-theme-next/releases/tag/v6.0.3 升级到 v6.0.3 及以后版本的用户，需要显式修改 Hexo 主配置文件 `_config.yml` 里的 `language` 配置，否则语言显示不正确。 5. 更新 Hexo 和 Hexo 插件 如果完成了以上步骤后，执行 `hexo s` 或 `hexo g` 出现错误，这意味着可能是旧版的 Hexo 和 Hexo 插件与新版的 NexT 主题产生了冲突。我们建议将 Hexo 升级至 4.0 以上的版本，将 Hexo 插件升级到最新版本。你可以执行 `npm outdated` 查看所有可以升级的插件。 -关于第三方库的启用，参见[这里](https://github.com/hexo-next/hexo-theme-next/blob/master/docs/zh-CN/INSTALLATION.md#插件)。 +关于第三方库的启用，参见[这里](https://github.com/next-theme/hexo-theme-next/blob/master/docs/zh-CN/INSTALLATION.md#插件)。 diff --git a/layout/_third-party/statistics/lean-analytics.njk b/layout/_third-party/statistics/lean-analytics.njk index cddfe10..e667fae 100644 --- a/layout/_third-party/statistics/lean-analytics.njk +++ b/layout/_third-party/statistics/lean-analytics.njk @@ -24,7 +24,7 @@ } else { {%- if theme.leancloud_visitors.security %} leancloudSelector(url).innerText = 'Counter not initialized! More info at console err msg.'; - console.error('ATTENTION! LeanCloud counter has security bug, see how to solve it here: https://github.com/hexo-next/hexo-leancloud-counter-security. \n However, you can still use LeanCloud without security, by setting `security` option to `false`.'); + console.error('ATTENTION! LeanCloud counter has security bug, see how to solve it here: https://github.com/theme-next/hexo-leancloud-counter-security. \n However, you can still use LeanCloud without security, by setting `security` option to `false`.'); {% else %} Counter('post', '/classes/Counter', { title, url, time: 1 }) .then(response => response.json()) diff --git a/package.json b/package.json index 93faec2..f5d110c 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/hexo-next/hexo-theme-next.git" + "url": "git+https://github.com/next-theme/hexo-theme-next.git" }, "keywords": [ "hexo", @@ -20,7 +20,7 @@ "author": "NexT (https://theme-next.org)", "license": "AGPL-3.0-or-later", "bugs": { - "url": "https://github.com/hexo-next/hexo-theme-next/issues" + "url": "https://github.com/next-theme/hexo-theme-next/issues" }, "homepage": "https://theme-next.org", "devDependencies": { diff --git a/scripts/events/index.js b/scripts/events/index.js index e9b69ee..b926855 100644 --- a/scripts/events/index.js +++ b/scripts/events/index.js @@ -28,7 +28,7 @@ hexo.on('exit', () => { const latest = JSON.parse(result).version; if (latest !== version) { hexo.log.warn(`Your theme NexT is outdated. Current version: v${version}, latest version: v${latest}`); - hexo.log.warn('Visit https://github.com/hexo-next/hexo-theme-next/releases for more information.'); + hexo.log.warn('Visit https://github.com/next-theme/hexo-theme-next/releases for more information.'); } else { hexo.log.info('Congratulations! Your are using the latest version of theme NexT.'); } diff --git a/scripts/filters/front-matter.js b/scripts/filters/front-matter.js index 7d6b225..594faf9 100644 --- a/scripts/filters/front-matter.js +++ b/scripts/filters/front-matter.js @@ -16,7 +16,7 @@ const keys = ['toc', 'reward_settings', 'quicklink']; function showWarnLog(source, variable) { hexo.log.warn(`front-matter: '${variable}' has deprecated, source: ${source}`); - hexo.log.warn('see: https://github.com/hexo-next/hexo-theme-next/pull/1211'); + hexo.log.warn('see: https://github.com/theme-next/hexo-theme-next/pull/1211'); } function compatibleBeforeAssign(page) {