From b78fb3ac907d283655a3efef3c1e4b503d66a138 Mon Sep 17 00:00:00 2001
From: Mimi <1119186082@qq.com>
Date: Thu, 10 Nov 2022 00:11:53 +0800
Subject: [PATCH] Optimize semantic elements' name

---
 layout/_layout.njk                           | 8 ++++----
 layout/_macro/sidebar.njk                    | 1 -
 layout/page.njk                              | 2 +-
 layout/post.njk                              | 2 +-
 source/css/_common/outline/header/index.styl | 7 +++----
 source/css/_schemes/Mist/_header.styl        | 2 +-
 source/css/_schemes/Muse/_header.styl        | 2 +-
 source/css/_schemes/Muse/_layout.styl        | 2 +-
 source/css/_schemes/Pisces/_layout.styl      | 2 +-
 source/css/noscript.styl                     | 2 +-
 source/js/motion.js                          | 2 +-
 source/js/schemes/muse.js                    | 2 +-
 12 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/layout/_layout.njk b/layout/_layout.njk
index 2ade234..8a9bd73 100644
--- a/layout/_layout.njk
+++ b/layout/_layout.njk
@@ -15,14 +15,14 @@
   <div class="headband"></div>
 
   <main class="main">
-    <header class="header" itemscope itemtype="http://schema.org/WPHeader">
-      <div class="header-inner">
+    <div class="column">
+      <header class="header" itemscope itemtype="http://schema.org/WPHeader">
         {%- include '_partials/header/index.njk' -%}
-      </div>
+      </header>
       {%- if theme.sidebar.display !== 'remove' %}
         {% block sidebar %}{% endblock %}
       {%- endif %}
-    </header>
+    </div>
 
     <div class="main-inner {% block class %}{% endblock %}">
       {%- include '_partials/header/sub-menu.njk' -%}
diff --git a/layout/_macro/sidebar.njk b/layout/_macro/sidebar.njk
index 37d16b9..d892e08 100644
--- a/layout/_macro/sidebar.njk
+++ b/layout/_macro/sidebar.njk
@@ -1,6 +1,5 @@
 {% macro render(display_toc) %}
   <aside class="sidebar">
-    {%- set display_toc = page.toc.enable and display_toc %}
     {%- if display_toc %}
       {%- set toc = toc(page.content, {class: 'nav', list_number: page.toc.number, max_depth: page.toc.max_depth}) %}
       {%- set display_toc = toc.length > 1 and display_toc %}
diff --git a/layout/page.njk b/layout/page.njk
index d30ac6e..9bf5cf1 100644
--- a/layout/page.njk
+++ b/layout/page.njk
@@ -50,5 +50,5 @@
 {% endblock %}
 
 {% block sidebar %}
-  {{ sidebar_template.render(true) }}
+  {{ sidebar_template.render(page.toc.enable) }}
 {% endblock %}
diff --git a/layout/post.njk b/layout/post.njk
index 8c45a2a..24bd548 100644
--- a/layout/post.njk
+++ b/layout/post.njk
@@ -12,5 +12,5 @@
 {% endblock %}
 
 {% block sidebar %}
-  {{ sidebar_template.render(true) }}
+  {{ sidebar_template.render(page.toc.enable) }}
 {% endblock %}
diff --git a/source/css/_common/outline/header/index.styl b/source/css/_common/outline/header/index.styl
index 9f5a67e..7b734cc 100644
--- a/source/css/_common/outline/header/index.styl
+++ b/source/css/_common/outline/header/index.styl
@@ -9,12 +9,11 @@
   }
 }
 
-// Fix issue #521
-header.header {
+.column {
   background: $head-bg;
 }
 
-.header-inner {
+.header {
   main-container();
 }
 
@@ -25,7 +24,7 @@ header.header {
 }
 
 .use-motion {
-  header.header, .site-brand-container .toggle {
+  .column, .site-brand-container .toggle {
     opacity: 0;
   }
 }
diff --git a/source/css/_schemes/Mist/_header.styl b/source/css/_schemes/Mist/_header.styl
index d5fad4e..69f9605 100644
--- a/source/css/_schemes/Mist/_header.styl
+++ b/source/css/_schemes/Mist/_header.styl
@@ -1,6 +1,6 @@
 // Header
 // --------------------------------------------------
-.header-inner {
+.header {
   align-items: center;
   display: flex;
   padding: 20px 0;
diff --git a/source/css/_schemes/Muse/_header.styl b/source/css/_schemes/Muse/_header.styl
index bd13547..7752364 100644
--- a/source/css/_schemes/Muse/_header.styl
+++ b/source/css/_schemes/Muse/_header.styl
@@ -9,7 +9,7 @@
   background: var(--btn-default-bg);
 }
 
-.header-inner {
+.header {
   padding-top: 100px;
 
   +mobile() {
diff --git a/source/css/_schemes/Muse/_layout.styl b/source/css/_schemes/Muse/_layout.styl
index 33831c9..ec93221 100644
--- a/source/css/_schemes/Muse/_layout.styl
+++ b/source/css/_schemes/Muse/_layout.styl
@@ -7,7 +7,7 @@
   }
 }
 
-.header-inner, .main-inner, .footer-inner {
+.header, .main-inner, .footer-inner {
   +mobile() {
     width: auto;
   }
diff --git a/source/css/_schemes/Pisces/_layout.styl b/source/css/_schemes/Pisces/_layout.styl
index 1d40564..6fdcc0c 100644
--- a/source/css/_schemes/Pisces/_layout.styl
+++ b/source/css/_schemes/Pisces/_layout.styl
@@ -1,4 +1,4 @@
-.header-inner {
+.header {
   background: var(--content-bg-color);
   border-radius: $border-radius-inner;
   box-shadow: $box-shadow-inner;
diff --git a/source/css/noscript.styl b/source/css/noscript.styl
index 2ca321f..0230c80 100644
--- a/source/css/noscript.styl
+++ b/source/css/noscript.styl
@@ -11,7 +11,7 @@ body { margin-top: 2rem; }
   visibility: visible;
 }
 
-.use-motion header.header,
+.use-motion .column,
 .use-motion .site-brand-container .toggle,
 .use-motion .footer { opacity: initial; }
 
diff --git a/source/js/motion.js b/source/js/motion.js
index 2f38249..3192ec5 100644
--- a/source/js/motion.js
+++ b/source/js/motion.js
@@ -51,7 +51,7 @@ NexT.motion.middleWares = {
       });
     }
 
-    pushToSequence('header.header');
+    pushToSequence('.column');
     CONFIG.scheme === 'Mist' && getMistLineSettings('.logo-line');
     CONFIG.scheme === 'Muse' && pushToSequence('.custom-logo-image');
     pushToSequence('.site-title');
diff --git a/source/js/schemes/muse.js b/source/js/schemes/muse.js
index ae5addb..e5fc8bd 100644
--- a/source/js/schemes/muse.js
+++ b/source/js/schemes/muse.js
@@ -50,7 +50,7 @@ document.addEventListener('DOMContentLoaded', () => {
 
   function updateFooterPosition() {
     const footer = document.querySelector('.footer');
-    const containerHeight = document.querySelector('header.header').offsetHeight + document.querySelector('.main').offsetHeight + footer.offsetHeight;
+    const containerHeight = document.querySelector('.column').offsetHeight + document.querySelector('.main').offsetHeight + footer.offsetHeight;
     footer.classList.toggle('footer-fixed', containerHeight <= window.innerHeight);
   }