From 523e39e9d669b79a9cd0fbb823666b80cc656e1a Mon Sep 17 00:00:00 2001
From: Mimi <1119186082@qq.com>
Date: Tue, 11 Aug 2020 12:09:04 +0800
Subject: [PATCH] Fix id conflict with markdown headerlink

---
 _config.yml                                            | 2 +-
 layout/_macro/post.njk                                 | 4 ++--
 layout/_macro/sidebar.njk                              | 2 +-
 layout/_partials/header/menu.njk                       | 2 +-
 layout/_partials/header/sub-menu.njk                   | 4 ++--
 layout/_partials/post/post-reward.njk                  | 4 ++--
 layout/_partials/search/algolia-search.njk             | 6 +++---
 layout/_partials/search/localsearch.njk                | 2 +-
 layout/_partials/widgets.njk                           | 2 +-
 source/css/_common/components/components.styl          | 2 +-
 source/css/_common/components/post/post-reward.styl    | 2 +-
 source/css/_common/components/third-party/search.styl  | 2 +-
 source/css/_common/outline/sidebar/sidebar-dimmer.styl | 4 ++--
 source/js/algolia-search.js                            | 6 +++---
 source/js/local-search.js                              | 4 ++--
 source/js/schemes/muse.js                              | 2 +-
 16 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/_config.yml b/_config.yml
index e879331..bc8bbca 100644
--- a/_config.yml
+++ b/_config.yml
@@ -712,7 +712,7 @@ busuanzi_count:
   total_views: true
   total_views_icon: fa fa-eye
   post_views: true
-  post_views_icon: fa fa-eye
+  post_views_icon: far fa-eye
 
 
 # ---------------------------------------------------------------
diff --git a/layout/_macro/post.njk b/layout/_macro/post.njk
index f980228..42af228 100644
--- a/layout/_macro/post.njk
+++ b/layout/_macro/post.njk
@@ -100,7 +100,7 @@
           {%- if theme.leancloud_visitors.enable or (theme.valine.enable and theme.valine.visitor) %}
             <span id="{{ url_for(post.path) }}" class="post-meta-item leancloud_visitors" data-flag-title="{{ post.title }}" title="{{ __('post.views') }}">
               <span class="post-meta-item-icon">
-                <i class="fa fa-eye"></i>
+                <i class="far fa-eye"></i>
               </span>
               <span class="post-meta-item-text">{{ __('post.views') + __('symbol.colon') }}</span>
               <span class="leancloud-visitors-count"></span>
@@ -110,7 +110,7 @@
           {%- if theme.firestore.enable %}
             <span class="post-meta-item" title="{{ __('post.views') }}">
               <span class="post-meta-item-icon">
-                <i class="fa fa-users"></i>
+                <i class="far fa-eye"></i>
               </span>
               <span class="post-meta-item-text">{{ __('post.views') + __('symbol.colon') }}</span>
               <span class="firestore-visitors-count"></span>
diff --git a/layout/_macro/sidebar.njk b/layout/_macro/sidebar.njk
index 6a789c7..6730a31 100644
--- a/layout/_macro/sidebar.njk
+++ b/layout/_macro/sidebar.njk
@@ -44,5 +44,5 @@
       {%- endif %}
     </div>
   </aside>
-  <div id="sidebar-dimmer"></div>
+  <div class="sidebar-dimmer"></div>
 {% endmacro %}
diff --git a/layout/_partials/header/menu.njk b/layout/_partials/header/menu.njk
index 2dc34b6..5b39769 100644
--- a/layout/_partials/header/menu.njk
+++ b/layout/_partials/header/menu.njk
@@ -2,7 +2,7 @@
 
 {%- if theme.menu or theme.algolia_search.enable or theme.local_search.enable %}
 <nav class="site-nav">
-  <ul id="menu" class="main-menu menu">
+  <ul class="main-menu menu">
     {%- for name, path in theme.menu %}
       {%- set respath = path %}
       {%- if path == '[object Object]' %}
diff --git a/layout/_partials/header/sub-menu.njk b/layout/_partials/header/sub-menu.njk
index 19186cb..993f15b 100644
--- a/layout/_partials/header/sub-menu.njk
+++ b/layout/_partials/header/sub-menu.njk
@@ -11,7 +11,7 @@
       {%- if currentParentUrl == value.default.split('||')[0] | trim | replace('/', '') %}
 
         {# Submenu items #}
-        <ul id="sub-menu" class="sub-menu menu">
+        <ul class="sub-menu menu">
         {%- for subname, subvalue in value %}
           {# For main submenu items #}
           {%- if subvalue != '[object Object]' %}
@@ -54,7 +54,7 @@
                   {%- if paths[1] == subvalue.default.split('||')[0] | trim | replace('/', '') %}
 
                     {# Submenu-2 items #}
-                    <ul id="sub-menu-2" class="sub-menu menu">
+                    <ul class="sub-menu menu">
                     {%- for subname2, subvalue2 in subvalue %}
                       {%- set respath2 = subvalue %}
                       {%- set itemName = subname2 | lower %}
diff --git a/layout/_partials/post/post-reward.njk b/layout/_partials/post/post-reward.njk
index 6e78ead..eb4dd0c 100644
--- a/layout/_partials/post/post-reward.njk
+++ b/layout/_partials/post/post-reward.njk
@@ -1,9 +1,9 @@
 <div class="reward-container">
   <div>{{ page.reward_settings.comment }}</div>
-  <button onclick="document.getElementById('post-reward').classList.toggle('active');">
+  <button onclick="document.querySelector('.post-reward').classList.toggle('active');">
     {{ __('reward.donate') }}
   </button>
-  <div id="post-reward">
+  <div class="post-reward">
 
     {%- for name, image in theme.reward %}
       {%- set builtin = ['wechatpay', 'alipay', 'paypal', 'bitcoin'] %}
diff --git a/layout/_partials/search/algolia-search.njk b/layout/_partials/search/algolia-search.njk
index 47efb28..c208fc2 100644
--- a/layout/_partials/search/algolia-search.njk
+++ b/layout/_partials/search/algolia-search.njk
@@ -8,7 +8,7 @@
   </span>
 </div>
 <div class="search-result-container">
-  <div id="algolia-stats"></div>
-  <div id="algolia-hits"></div>
-  <div id="algolia-pagination"></div>
+  <div class="algolia-stats"></div>
+  <div class="algolia-hits"></div>
+  <div class="algolia-pagination"></div>
 </div>
diff --git a/layout/_partials/search/localsearch.njk b/layout/_partials/search/localsearch.njk
index 7ee3859..5e33cfb 100644
--- a/layout/_partials/search/localsearch.njk
+++ b/layout/_partials/search/localsearch.njk
@@ -12,7 +12,7 @@
   </span>
 </div>
 <div class="search-result-container">
-  <div id="no-result">
+  <div class="no-result">
     <i class="fa fa-spinner fa-pulse fa-5x"></i>
   </div>
 </div>
diff --git a/layout/_partials/widgets.njk b/layout/_partials/widgets.njk
index 80aa8de..cb4bc15 100644
--- a/layout/_partials/widgets.njk
+++ b/layout/_partials/widgets.njk
@@ -23,5 +23,5 @@
 {%- endif %}
 
 <noscript>
-  <div id="noscript-warning">Theme NexT works best with JavaScript enabled</div>
+  <div class="noscript-warning">Theme NexT works best with JavaScript enabled</div>
 </noscript>
diff --git a/source/css/_common/components/components.styl b/source/css/_common/components/components.styl
index 5595ac2..332578e 100644
--- a/source/css/_common/components/components.styl
+++ b/source/css/_common/components/components.styl
@@ -12,7 +12,7 @@ if (hexo-config('back2top.enable')) {
   @import (hexo-config('back2top.sidebar') ? 'back-to-top-sidebar' : 'back-to-top');
 }
 
-#noscript-warning {
+.noscript-warning {
   background-color: lighten($red, 20%);
   color: #fff;
   font-family: sans-serif;
diff --git a/source/css/_common/components/post/post-reward.styl b/source/css/_common/components/post/post-reward.styl
index 4e201d8..154d6fa 100644
--- a/source/css/_common/components/post/post-reward.styl
+++ b/source/css/_common/components/post/post-reward.styl
@@ -24,7 +24,7 @@
   }
 }
 
-#post-reward {
+.post-reward {
   padding-top: 20px;
   display: none;
 
diff --git a/source/css/_common/components/third-party/search.styl b/source/css/_common/components/third-party/search.styl
index 435a46a..4507878 100644
--- a/source/css/_common/components/third-party/search.styl
+++ b/source/css/_common/components/third-party/search.styl
@@ -152,7 +152,7 @@ if (hexo-config('local_search.enable')) {
       width: 100%;
     }
 
-    #no-result {
+    .no-result {
       color: $grey-light;
       margin: auto;
     }
diff --git a/source/css/_common/outline/sidebar/sidebar-dimmer.styl b/source/css/_common/outline/sidebar/sidebar-dimmer.styl
index ff0c652..e9ad510 100644
--- a/source/css/_common/outline/sidebar/sidebar-dimmer.styl
+++ b/source/css/_common/outline/sidebar/sidebar-dimmer.styl
@@ -1,9 +1,9 @@
-#sidebar-dimmer {
+.sidebar-dimmer {
   display: none;
 }
 
 +mobile() {
-  #sidebar-dimmer {
+  .sidebar-dimmer {
     background: black;
     display: block;
     height: 100%;
diff --git a/source/js/algolia-search.js b/source/js/algolia-search.js
index 630bad0..b289b22 100644
--- a/source/js/algolia-search.js
+++ b/source/js/algolia-search.js
@@ -37,7 +37,7 @@ document.addEventListener('DOMContentLoaded', () => {
     }),
 
     instantsearch.widgets.stats({
-      container: '#algolia-stats',
+      container: '.algolia-stats',
       templates: {
         text: data => {
           const stats = algoliaSettings.labels.hits_stats
@@ -53,7 +53,7 @@ document.addEventListener('DOMContentLoaded', () => {
     }),
 
     instantsearch.widgets.hits({
-      container : '#algolia-hits',
+      container : '.algolia-hits',
       escapeHTML: false,
       templates : {
         item: data => {
@@ -79,7 +79,7 @@ document.addEventListener('DOMContentLoaded', () => {
     }),
 
     instantsearch.widgets.pagination({
-      container: '#algolia-pagination',
+      container: '.algolia-pagination',
       scrollTo : false,
       showFirst: false,
       showLast : false,
diff --git a/source/js/local-search.js b/source/js/local-search.js
index d47dc9e..a4f04fb 100644
--- a/source/js/local-search.js
+++ b/source/js/local-search.js
@@ -171,9 +171,9 @@ document.addEventListener('DOMContentLoaded', () => {
       resultItems = getResultItems(keywords);
     }
     if (keywords.length === 1 && keywords[0] === '') {
-      resultContent.innerHTML = '<div id="no-result"><i class="fa fa-search fa-5x"></i></div>';
+      resultContent.innerHTML = '<div class="no-result"><i class="fa fa-search fa-5x"></i></div>';
     } else if (resultItems.length === 0) {
-      resultContent.innerHTML = '<div id="no-result"><i class="far fa-frown fa-5x"></i></div>';
+      resultContent.innerHTML = '<div class="no-result"><i class="far fa-frown fa-5x"></i></div>';
     } else {
       resultItems.sort((left, right) => {
         if (left.includedCount !== right.includedCount) {
diff --git a/source/js/schemes/muse.js b/source/js/schemes/muse.js
index 14f811e..feae9c8 100644
--- a/source/js/schemes/muse.js
+++ b/source/js/schemes/muse.js
@@ -10,7 +10,7 @@ document.addEventListener('DOMContentLoaded', () => {
     init : function() {
       window.addEventListener('mousedown', this.mousedownHandler);
       window.addEventListener('mouseup', this.mouseupHandler.bind(this));
-      document.querySelector('#sidebar-dimmer').addEventListener('click', this.clickHandler.bind(this));
+      document.querySelector('.sidebar-dimmer').addEventListener('click', this.clickHandler.bind(this));
       document.querySelector('.sidebar-toggle').addEventListener('click', this.clickHandler.bind(this));
       window.addEventListener('sidebar:show', this.showSidebar);
       window.addEventListener('sidebar:hide', this.hideSidebar);