Merge tag 'v7.1.2'

* tag 'v7.1.2': Release v7.1.2 Quotes in Release Drafter for around possible bugs Add Icons in Release Drafter Expressions and translations in CONTRIBUTING.md (theme-next#885) Fix Release Drafter template `External Change` label added Change the internal path of quicklink (theme-next#883) Improve Docs section in PR template Force HTTPS of `google-analytics.swig`. Again. (theme-next#881) Update Facebook Graph API to v3.3 (theme-next#876) Fix a few typo errors in docs (theme-next#864) Changed Telegram group link to Chinese Fix Github gist bug (theme-next#861) Update symbols_count_time (theme-next#862) Release v7.1.1
invkrh · Jun 16, 2019 · 8f792a9 · 8f792a9
2 parents 2239554 + f795fd5
commit 8f792a9
Show file tree

Hide file tree

Showing 17 changed files with 84 additions and 78 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -150,7 +150,7 @@ To be continued.
 
 ### Labels Rules
 
-We use "labels" in the issue tracker to help classify pull requests and issues. Using labels enables maintainers and users to quickly find issues they should look into, either because they experience them, or because it meets their area of expertise.
+We use "labels" in the issue tracker to help classify Pull requests and Issues. Using labels enables maintainers and users to quickly find issues they should look into, either because they experience them, or because it meets their area of expertise.
 
 If you are unsure what a label is about or which labels you should apply to a PR or issue, look no further!
 
@@ -160,10 +160,10 @@ Issues related: `types`+`contents`+`results`
     - `Irrelevant`: An irrelevant issue for Next
     - `Duplicate`: An issue which had been mentioned
     - `Bug`: A detected bug that needs to be confirmed
-    - `Improvement Need`: An issue that needs to be improvement
+    - `Improvement Need`: An issue that needs improvement
     - `Feature Request`: An issue that wants a new feature
-    - `High Priority`: A detected bugs or misprints with high priority
-    - `Low Priority`: A detected bugs or misprints with low priority
+    - `High Priority`: A detected bug or misprint with high priority
+    - `Low Priority`: A detected bug or misprint with low priority
     - `Non English`: Requires the attention of a multi-lingual maintainer
     - `Discussion`: An issue that needs to be discussed
     - `Question`: An issue about questions
@@ -195,17 +195,18 @@ Issues related: `types`+`contents`+`results`
 
 Pull requests related:
 
-- `Breaking Change`: A Pull requests that makes breaking change
-- `Bug Fix`: A Pull requests that fixes the related bug
-- `Docs`: A Pull requests that Instruction document has been added
-- `New Feature`: A Pull requests that provides a new feature
-- `Feature`: A Pull requests that provides an option or addition to existing feature
-- `Improvement`: A Pull requests that improves NexT
-- `i18n`: A Pull requests that makes new languages translation
-- `Performance`: A Pull requests that improves the performance
-- `Discussion`: A Pull requests that needs to be discussed
-- `v6.x`: A Pull requests that bug fixes and some improvements, related to old NexT version 6
-- `v7.x`: A Pull requests that bug fixes and some improvements, related to old NexT version 7
+- `Breaking Change`: A pull request that makes breaking change
+- `External Change`: A pull request that makes update for external change
+- `Bug Fix`: A pull request that fixes the related bug
+- `Docs`: A pull request that Instruction document has been added
+- `New Feature`: A pull request that provides a new feature
+- `Feature`: A pull request that provides an option or addition to existing feature
+- `Improvement`: A pull request that improves NexT
+- `i18n`: A pull request that makes new languages translation
+- `Performance`: A pull request that improves the performance
+- `Discussion`: A pull request that needs to be discussed
+- `v6.x`: A pull request that bug fixes and some improvements, related to old NexT version 6
+- `v7.x`: A pull request that bug fixes and some improvements, related to old NexT version 7
 
 <a name="commit-messages-rules"></a>
 

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -12,7 +12,8 @@
 - [ ] Tests for the changes was maked (for bug fixes / features).
    - [ ] Muse | Mist have been tested.
    - [ ] Pisces | Gemini have been tested.
-- [ ] Docs in [NexT website](https://theme-next.org/docs/) have been added / updated (for new features).
+- [ ] [Docs](https://github.com/theme-next/theme-next.org/tree/source/source/docs) in [NexT website](https://theme-next.org/docs/) have been added / updated (for features).
+<!-- For adding Docs edit needed file here: https://github.com/theme-next/theme-next.org/tree/source/source/docs and create PR with this changes here: https://github.com/theme-next/theme-next.org/pulls -->
 
 ## PR Type
 **What kind of change does this PR introduce?**

diff --git a/.github/mergeable.yml b/.github/mergeable.yml
@@ -14,15 +14,15 @@ mergeable:
 
       - do: label
         must_include:
-          regex: 'feat|imp|fix|doc|i18n'
+          regex: 'change|feat|imp|fix|doc|i18n'
         must_exclude:
           regex: 'wip|work in progress'
 
       #- do: project
       #  no_empty:
       #    enabled: true
       #  must_include:
-      #    regex: 'feat|imp|fix|doc|loc'
+      #    regex: 'change|feat|imp|fix|doc|loc'
 
       - do: milestone
         no_empty:

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
@@ -1,28 +1,31 @@
 # Configuration for Release Drafter - https://github.com/toolmantim/release-drafter
 
-name-template: v$NEXT_MINOR_VERSION
-tag-template: v$NEXT_MINOR_VERSION
+name-template: 'v$NEXT_MINOR_VERSION'
+tag-template: 'v$NEXT_MINOR_VERSION'
 categories:
-  - title: 💥 Breaking Changes
-    label: Breaking Change
+  - title: '💥 Breaking Changes'
+    label: '💥 Breaking Change'
 
-  - title: 🌟 New Features
-    label: New Feature
+  - title: '🌀 External Changes'
+    label: '🌀 External Change'
 
-  - title: ⭐ Features
-    label: Feature
+  - title: '🌟 New Features'
+    label: '🌟 New Feature'
 
-  - title: 🛠 Improvements
-    label: Improvement
+  - title: '⭐ Features'
+    label: '⭐ Feature'
 
-  - title: 🐞 Bug Fixes
-    label: Bug Fix
+  - title: '🛠 Improvements'
+    label: '🛠 Improvement'
 
-  - title: 📖 Documentation
-    label: Docs
+  - title: '🐞 Bug Fixes'
+    label: '🐞 Bug Fix'
 
-  - title: 🌍 Localization
-    label: i18n
+  - title: '📖 Documentation'
+    label: '📖 Docs'
+
+  - title: '🌍 Localization'
+    label: '🌍 i18n'
 
 change-template: '- $TITLE (#$NUMBER)'
 no-changes-template: '- No changes'
@@ -31,4 +34,4 @@ template: |
 
   ***
 
-  For full changes, see the [comparison between $PREVIOUS_TAG and v$NEXT_MINOR_VERSION](https://github.com/theme-next/hexo-theme-next/compare/v$PREVIOUS_TAG...v$NEXT_MINOR_VERSION)
+  For full changes, see the [comparison between $PREVIOUS_TAG and v$NEXT_MINOR_VERSION](https://github.com/theme-next/hexo-theme-next/compare/$PREVIOUS_TAG...v$NEXT_MINOR_VERSION)
diff --git a/_config.yml b/_config.yml
@@ -246,7 +246,7 @@ toc:
   wrap: false
   # If true, all level of TOC in a post will be displayed, rather than the activated part of it.
   expand_all: false
-  # Maximum heading depth of generated toc. You can set it in one post through `toc_max_depth` in Front Matter.
+  # Maximum heading depth of generated toc. You can set it in one post through `toc_max_depth` in Front-matter.
   max_depth: 6
 
 sidebar:
@@ -362,7 +362,7 @@ wechat_subscriber:
 # Reward (Donate)
 reward_settings:
   # If true, reward would be displayed in every article by default.
-  # You can show or hide reward in a specific article throuth `reward: true | false` in Front Matter.
+  # You can show or hide reward in a specific article throuth `reward: true | false` in Front-matter.
   enable: false
   animation: false
   #comment: Donate comment here
@@ -501,14 +501,14 @@ math:
   enable: true
 
   # Default (true) will load mathjax / katex script on demand.
-  # That is it only render those page which has `mathjax: true` in Front Matter.
+  # That is it only render those page which has `mathjax: true` in Front-matter.
   # If you set it to false, it will load mathjax / katex srcipt EVERY PAGE.
   per_page: false
 
   engine: katex
   # engine: mathjax
 
-  # hexo-rendering-pandoc (or hexo-renderer-kramed) needed to full MathJax support.
+  # hexo-renderer-pandoc (or hexo-renderer-kramed) needed to full MathJax support.
   mathjax:
     cdn: //cdn.jsdelivr.net/npm/mathjax@2/MathJax.js?config=TeX-AMS-MML_HTMLorMML
     #cdn: //cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-MML-AM_CHTML
@@ -543,7 +543,7 @@ quicklink:
   enable: false
 
   # Quicklink (quicklink.umd.js script) is loaded on demand
-  # Add `quicklink: true` in Front Matter of the page or post you need
+  # Add `quicklink: true` in Front-matter of the page or post you need
   # Home page and archive page can be controlled through home and archive options below
   home: true
   archive: true

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "theme-next",
-  "version": "7.1.0",
+  "version": "7.1.2",
   "homepage": "https://theme-next.org",
   "authors": [
     "NexT <support@theme-next.org> (https://theme-next.org)"

diff --git a/docs/MATH.md b/docs/MATH.md
@@ -198,14 +198,14 @@ math:
   enable: false
 
   # Default(true) will load mathjax/katex script on demand
-  # That is it only render those page who has 'mathjax: true' in Front Matter.
+  # That is it only render those page who has 'mathjax: true' in Front-matter.
   # If you set it to false, it will load mathjax/katex srcipt EVERY PAGE.
   per_page: true
 
   engine: mathjax
   #engine: katex
 
-  # hexo-rendering-pandoc (or hexo-renderer-kramed) needed to full MathJax support.
+  # hexo-renderer-pandoc (or hexo-renderer-kramed) needed to full MathJax support.
   mathjax:
     # For newMathJax CDN (cdnjs.cloudflare.com) with fallback to oldMathJax (cdn.mathjax.org).
     cdn: //cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML
@@ -235,7 +235,7 @@ This option is to control whether to render Math Equations every page.
 
 The behavior of default (`true`) is to render Math Equations **on demand**.
 
-It will only render those posts which have `mathjax: true` in their Front Matter.
+It will only render those posts which have `mathjax: true` in their Front-matter.
 
 For example:
 

diff --git a/docs/zh-CN/CONTRIBUTING.md b/docs/zh-CN/CONTRIBUTING.md
@@ -146,32 +146,32 @@
 
 ### 标签规范
 
-为了方便维护人员和用户能够快速找到他们想要查看的问题，我们使用“标签”功能对拉取请求和问题进行分类。
+为了方便维护人员和用户能够快速找到他们想要查看的问题，我们使用“标签”功能对 Pull requests 和 Issues 进行分类。
 
-如果您不确定某个标签的含义，或者不知道将哪些标签应用于拉取请求或问题，千万别错过这个。
+如果您不确定某个标签的含义，或者不知道将哪些标签应用于 PR 或 issue，千万别错过这个。
 
 Issues 的标签：使用`类型`+`内容`+`结果`的组合
 
 - 类型
     - `Irrelevant`: 与 NexT 主题无关的 Issue
-    - `Duplicate`: 已经存在同样 Issue
-    - `Bug`: 提出了 Bug，等待确认
-    - `Improvement Need`: 需要进行改进的 Issue
-    - `Feature Request`: 提出了特性需求的 Issue
-    - `High Priority`: 检测到的高优先级错误或笔误 Issue
-    - `Low Priority`: 检测到的低优先级错误或笔误 Issue
-    - `Non English`: 需要多语言维护者注意 Issue
-    - `Discussion`: 需要讨论的 Issue
-    - `Question`: 有关咨询的 Issue
+    - `Duplicate`: 重复提及的 Issue
+    - `Bug`: 检测到需要进行确认的 Bug
+    - `Improvement Need`: 需要改进的 Issue
+    - `Feature Request`: 提出了新功能请求的 Issue
+    - `High Priority`: 检测到具有高优先级的 Bug 或笔误的 Issue
+    - `Low Priority`: 检测到具有低优先级的 Bug 或笔误的 Issue
+    - `Non English`: 需要多语言维护者参与的 Issue
+    - `Discussion`: 需要进行讨论的 Issue
+    - `Question`: 提出疑问的 Issue
     - `Backlog`: 待解决的 Issue
-    - `Meta`: 表明使用条款变更 Issue
+    - `Meta`: 表明使用条款变更的 Issue
 - 内容
     - `Roadmap`: 与 NexT 主题发展相关的 Issue
     - `Hexo`: 与 Hexo 相关的 Issue
-    - `Scheme [1] - Mist`: 与 Mist 样式相关的 Issue
-    - `Scheme [2] - Muse`: 与 Muse 样式相关的 Issue
-    - `Scheme [3] - Pisces`: 与 Pisces 样式相关的 Issue
-    - `Scheme [4] - Gemini`: 与 Gemini 样式相关的 Issue
+    - `Scheme [1] - Mist`: 与 Mist 主题相关的 Issue
+    - `Scheme [2] - Muse`: 与 Muse 主题相关的 Issue
+    - `Scheme [3] - Pisces`: 与 Pisces 主题相关的 Issue
+    - `Scheme [4] - Gemini`: 与 Gemini 主题相关的 Issue
     - `3rd Party Service`: 与第三方服务相关的 Issue
     - `Docs`: 需要添加文档说明的 Issue
     - `Configurations`: 与 NexT 主题设置相关的 Issue
@@ -180,8 +180,8 @@ Issues 的标签：使用`类型`+`内容`+`结果`的组合
 - 结果
     - `Wontfix`: 不能或不被修复的 Issue
     - `Need More Info`: 需要更多信息的 Issue
-    - `Need Verify`: 需要开发人员或用户确认的 Issue
-    - `Can't Reproduce`: 不能被重现的 Issue
+    - `Need Verify`: 需要开发人员或用户确认 Bug 或解决方法的 Issue
+    - `Can't Reproduce`: 无法复现的 Issue
     - `Verified`: 已经被确认的 Issue
     - `Help Wanted`: 需要帮助的 Issue
     - `Wait for Answer`: 需要开发人员或用户回复的 Issue
@@ -192,10 +192,11 @@ Issues 的标签：使用`类型`+`内容`+`结果`的组合
 Pull requests 的标签：
 
 - `Breaking Change`: 产生重大变动的 Pull request
-- `Bug Fix`: 修复 Bug 的 Pull request
+- `External Change`: 针对外部变动进行更新的 Pull request
+- `Bug Fix`: 修复相关 Bug 的 Pull request
 - `Docs`: 添加了文档说明的 Pull request
-- `New Feature`: 添加了新特性的 Pull request
-- `Feature`: 为已存在的特性添加了选项或功能的 Pull request
+- `New Feature`: 添加了新功能的 Pull request
+- `Feature`: 为现有功能提供选项或加成的 Pull request
 - `Improvement`: 改进了 NexT 主题的 Pull request
 - `i18n`: 更新了翻译的 Pull request
 - `Performance`: 提高了 NexT 主题性能的 Pull request

diff --git a/docs/zh-CN/MATH.md b/docs/zh-CN/MATH.md
@@ -203,14 +203,14 @@ math:
   enable: false
 
   # Default(true) will load mathjax/katex script on demand
-  # That is it only render those page who has 'mathjax: true' in Front Matter.
+  # That is it only render those page who has 'mathjax: true' in Front-matter.
   # If you set it to false, it will load mathjax/katex srcipt EVERY PAGE.
   per_page: true
 
   engine: mathjax
   #engine: katex
 
-  # hexo-rendering-pandoc (or hexo-renderer-kramed) needed to full MathJax support.
+  # hexo-renderer-pandoc (or hexo-renderer-kramed) needed to full MathJax support.
   mathjax:
     # Use 2.7.1 as default, jsdelivr as default CDN, works everywhere even in China
     cdn: //cdn.jsdelivr.net/npm/mathjax@2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML
@@ -238,9 +238,9 @@ math:
 
 这个选项是控制是否在每篇文章都渲染数学公式；
 
-默认(`true`) 的行为是**只对 Front Matter 中含有 `mathjax: true` 的文章进行数学公式渲染**。
+默认(`true`) 的行为是**只对 Front-matter 中含有 `mathjax: true` 的文章进行数学公式渲染**。
 
-如果 Front Matter 中不含有 `mathjax: true`，或者 `mathjax: false`，那么 NexT 将不会对这些文章进行数学公式渲染。
+如果 Front-matter 中不含有 `mathjax: true`，或者 `mathjax: false`，那么 NexT 将不会对这些文章进行数学公式渲染。
 
 例如：
 

diff --git a/docs/zh-CN/README.md b/docs/zh-CN/README.md
@@ -138,7 +138,7 @@ $ git pull
 
 [gitter-url]: https://gitter.im/theme-next
 [riot-url]: https://riot.im/app/#/room/#theme-next:matrix.org
-[t-chat-url]: https://t.me/theme_next
+[t-chat-url]: https://t.me/theme_next_chinese
 [t-news-url]: https://t.me/theme_next_news
 
 <!--[rel-image]: https://img.shields.io/github/release/theme-next/hexo-theme-next.svg-->

diff --git a/layout/_macro/post.swig b/layout/_macro/post.swig
@@ -228,7 +228,7 @@
                   <span class="post-meta-item-text">{{ __('symbols_count_time.count') + __('symbol.colon') }}</span>
                 {% endif %}
                 <span title="{{ __('symbols_count_time.count') }}">{#
-                #}{{ symbolsCount(post.content) }}{#
+                #}{{ symbolsCount(post) }}{#
               #}</span>
               {% endif %}
 
@@ -244,7 +244,7 @@
                   <span class="post-meta-item-text">{{ __('symbols_count_time.time') }} &asymp;</span>
                 {% endif %}
                 <span title="{{ __('symbols_count_time.time') }}">{#
-                #}{{ symbolsTime(post.content, theme.symbols_count_time.awl, theme.symbols_count_time.wpm, __('symbols_count_time.time_minutes')) }}{#
+                #}{{ symbolsTime(post, theme.symbols_count_time.awl, theme.symbols_count_time.wpm, __('symbols_count_time.time_minutes')) }}{#
               #}</span>
               {% endif %}
             </div>

diff --git a/layout/_third-party/analytics/facebook-sdk.swig b/layout/_third-party/analytics/facebook-sdk.swig
@@ -4,7 +4,7 @@
       FB.init({
         appId  : '{{ theme.facebook_sdk.app_id }}',
         xfbml  : true,
-        version: 'v2.10'
+        version: 'v3.3'
       });
     };
     (function(d, s, id) {

diff --git a/layout/_third-party/analytics/google-analytics.swig b/layout/_third-party/analytics/google-analytics.swig
@@ -1,5 +1,5 @@
 {% if theme.google_analytics.tracking_id %}
-  <script async src="//www.googletagmanager.com/gtag/js?id={{ theme.google_analytics.tracking_id }}"></script>
+  <script async src="https://www.googletagmanager.com/gtag/js?id={{ theme.google_analytics.tracking_id }}"></script>
   <script>
     var host = window.location.hostname;
     if (host !== "localhost" || !{{theme.google_analytics.localhost_ignored}}) {

diff --git a/layout/_third-party/copy-code.swig b/layout/_third-party/copy-code.swig
@@ -1,6 +1,6 @@
 {% if theme.codeblock.copy_button.enable %}
 <script>
-  $('.highlight').each(function(i, e) {
+  $('.highlight').not('.gist .highlight').each(function(i, e) {
     var $wrap = $('<div>').addClass('highlight-wrap');
     $(e).after($wrap);
     $wrap.append($('<button>').addClass('copy-btn').append('{{__("post.copy_button")}}').on('click', function(e) {

diff --git a/layout/_third-party/quicklink.swig b/layout/_third-party/quicklink.swig
@@ -1,5 +1,5 @@
 {% if theme.quicklink.enable %}
-  {% set quicklink_uri = url_for(theme.vendors._internal + '/quicklink/dist/quicklink.umd.js') %}
+  {% set quicklink_uri = url_for(theme.vendors._internal + '/quicklink/quicklink.umd.js') %}
   {% if theme.vendors.quicklink %}
     {% set quicklink_uri = theme.vendors.quicklink %}
   {% endif %}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-next",
-  "version": "7.1.0",
+  "version": "7.1.2",
   "description": "Elegant and powerful theme for Hexo",
   "main": "index.js",
   "directories": {

diff --git a/source/js/utils.js b/source/js/utils.js
@@ -298,7 +298,7 @@ NexT.utils = NexT.$u = {
 $(document).ready(function() {
 
   function wrapTable() {
-    $('table').wrap('<div class="table-container"></div>');
+    $('table').not('.gist table').wrap('<div class="table-container"></div>');
   }
 
   /**