From 9acfa7e21afdf547abd77766a447a92cb6467e34 Mon Sep 17 00:00:00 2001
From: Mimi <1119186082@qq.com>
Date: Fri, 18 Nov 2022 14:10:52 +0800
Subject: [PATCH] Fix typo

---
 .github/PULL_REQUEST_TEMPLATE.md       | 11 +++++------
 README.md                              |  2 +-
 docs/ru/README.md                      |  2 +-
 scripts/events/lib/config.js           |  4 ++--
 source/css/_schemes/Muse/_sidebar.styl |  2 +-
 source/css/main.styl                   |  2 +-
 6 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 5f19239..efe1942 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,7 +1,7 @@
 <!-- ATTENTION!
 1. Please write pull request readme in English, thanks!
 
-2. Always remember that NexT includes 4 schemes. And if on one of them works fine after the 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).
+2. NexT includes 4 schemes: Muse and Mist have similar structure, but Pisces and Gemini are very different from them. It is possible that one scheme works fine after the changes, but another scheme is broken. Please make the tests in different schemes to make sure the changes are compatible with all schemes.
 
 3. In addition, you need to confirm that the changes made by this PR are compatible with PJAX and Dark Mode.
 -->
@@ -10,9 +10,7 @@
 <!-- Change [ ] to [x] to select (将 [ ] 换成 [x] 来选择) -->
 
 - [ ] The commit message follows [guidelines for NexT](https://github.com/next-theme/hexo-theme-next/blob/master/.github/CONTRIBUTING.md).
-- [ ] Tests for the changes was maked (for bug fixes / features).
-   - [ ] Muse | Mist have been tested.
-   - [ ] Pisces | Gemini have been tested.
+- [ ] The changes have been tested (for bug fixes / features).
 - [ ] [Docs](https://github.com/next-theme/theme-next-docs/tree/master/source/docs) in [NexT website](https://theme-next.js.org/docs/) have been added / updated (for features).
 <!-- For adding Docs edit needed file here: https://github.com/next-theme/theme-next-docs/tree/master/source/docs and create PR with this changes here: https://github.com/next-theme/theme-next-docs/pulls -->
 
@@ -21,8 +19,9 @@
 
 - [ ] Bugfix.
 - [ ] Feature.
-- [ ] Code style update (formatting, local variables).
-- [ ] Refactoring (no functional changes, no api changes).
+- [ ] Improvement.
+- [ ] Code style update (formatting, linting).
+- [ ] Refactoring (no functional changes).
 - [ ] Documentation.
 - [ ] Translation. <!-- We use Crowdin to manage translations https://crowdin.com/project/hexo-theme-next -->
 - [ ] Other... Please describe:
diff --git a/README.md b/README.md
index 9b77a81..4992b28 100644
--- a/README.md
+++ b/README.md
@@ -93,7 +93,7 @@ vendors:
 
 A new version of NexT will be released every month. Please read the [release notes][docs-release-url] before updating the theme. You can update NexT by the following command.
 
-Install the latest version throuth npm:
+Install the latest version through npm:
 
 ```sh
 $ cd hexo-site
diff --git a/docs/ru/README.md b/docs/ru/README.md
index 2a7542f..ef24f0c 100644
--- a/docs/ru/README.md
+++ b/docs/ru/README.md
@@ -93,7 +93,7 @@ vendors:
 
 NexT выпускает новые версии каждый месяц. Please read the [release notes][docs-release-url] before updating the theme. You can update NexT by the following command.
 
-Install the latest version throuth npm:
+Install the latest version through npm:
 
 ```sh
 $ cd hexo-site
diff --git a/scripts/events/lib/config.js b/scripts/events/lib/config.js
index 263776d..ad35061 100644
--- a/scripts/events/lib/config.js
+++ b/scripts/events/lib/config.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const merge = require('hexo-util').deepMerge;
+const { deepMerge } = require('hexo-util');
 
 module.exports = hexo => {
   const data = hexo.locals.get('data');
@@ -30,7 +30,7 @@ module.exports = hexo => {
     const { i18n } = hexo.theme;
 
     const mergeLang = lang => {
-      if (data.languages[lang]) i18n.set(lang, merge(i18n.get([lang]), data.languages[lang]));
+      if (data.languages[lang]) i18n.set(lang, deepMerge(i18n.get([lang]), data.languages[lang]));
     };
 
     if (Array.isArray(language)) {
diff --git a/source/css/_schemes/Muse/_sidebar.styl b/source/css/_schemes/Muse/_sidebar.styl
index ae10734..3492185 100644
--- a/source/css/_schemes/Muse/_sidebar.styl
+++ b/source/css/_schemes/Muse/_sidebar.styl
@@ -1,6 +1,6 @@
 if (hexo-config('sidebar.position') == 'right') {
   .sidebar-active {
-    // Note: $sidebar-desktop + $content-desktop-large should be greater than desktop-large threshold
+    // Note: $sidebar-desktop + $content-desktop-large should be less than desktop-large threshold
     // Otherwise a horizontal scrollbar will appear
     +desktop-large() {
       padding-right: $sidebar-desktop;
diff --git a/source/css/main.styl b/source/css/main.styl
index 96f10e4..d75c4a1 100644
--- a/source/css/main.styl
+++ b/source/css/main.styl
@@ -1,7 +1,7 @@
 // CSS Style Guide: https://codeguide.co/#css
 
 // https://stylus-lang.com/docs/keyframes.html
-vendors = official
+vendors = official;
 
 $scheme = hexo-config('scheme') ? hexo-config('scheme') : 'Muse';