From c7b92c3af8e8c40545464c2de0f272f7ff7ac40a Mon Sep 17 00:00:00 2001
From: Mimi <1119186082@qq.com>
Date: Wed, 9 Nov 2022 20:11:52 +0800
Subject: [PATCH] Refactor sidebar-toggle, sidebar-dimmer & back-to-top

---
 layout/_layout.njk                            |  4 +--
 layout/_macro/sidebar.njk                     |  7 ------
 layout/_partials/widgets.njk                  | 11 ++++++++
 source/css/_common/outline/sidebar/index.styl |  1 -
 .../outline/sidebar/sidebar-dimmer.styl       | 24 ------------------
 source/css/_schemes/Muse/_sidebar.styl        | 25 +++++++++++++++++++
 source/css/_schemes/Pisces/_sidebar.styl      |  4 ---
 7 files changed, 38 insertions(+), 38 deletions(-)
 delete mode 100644 source/css/_common/outline/sidebar/sidebar-dimmer.styl

diff --git a/layout/_layout.njk b/layout/_layout.njk
index 9dff4c5..2ade234 100644
--- a/layout/_layout.njk
+++ b/layout/_layout.njk
@@ -24,8 +24,6 @@
       {%- endif %}
     </header>
 
-    {{ partial('_partials/widgets.njk', {}, {cache: theme.cache.enable}) }}
-
     <div class="main-inner {% block class %}{% endblock %}">
       {%- include '_partials/header/sub-menu.njk' -%}
       {% block content %}{% endblock %}
@@ -40,6 +38,8 @@
     </div>
   </footer>
 
+  {{ partial('_partials/widgets.njk', {}, {cache: theme.cache.enable}) }}
+
   {{ partial('_scripts/index.njk', {}, {cache: theme.cache.enable}) }}
   {{ partial('_third-party/index.njk', {}, {cache: theme.cache.enable}) }}
   {{ partial('_third-party/statistics/index.njk', {}, {cache: theme.cache.enable}) }}
diff --git a/layout/_macro/sidebar.njk b/layout/_macro/sidebar.njk
index bae7322..37d16b9 100644
--- a/layout/_macro/sidebar.njk
+++ b/layout/_macro/sidebar.njk
@@ -1,10 +1,4 @@
 {% macro render(display_toc) %}
-  <div class="toggle sidebar-toggle" role="button">
-    <span class="toggle-line"></span>
-    <span class="toggle-line"></span>
-    <span class="toggle-line"></span>
-  </div>
-
   <aside class="sidebar">
     {%- set display_toc = page.toc.enable and display_toc %}
     {%- if display_toc %}
@@ -46,5 +40,4 @@
       {%- endif %}
     </div>
   </aside>
-  <div class="sidebar-dimmer"></div>
 {% endmacro %}
diff --git a/layout/_partials/widgets.njk b/layout/_partials/widgets.njk
index 996a931..5af3a75 100644
--- a/layout/_partials/widgets.njk
+++ b/layout/_partials/widgets.njk
@@ -1,3 +1,14 @@
+{# Widgets with fixed position #}
+
+{%- if theme.sidebar.display !== 'remove' and (theme.scheme === 'Muse' or theme.scheme === 'Mist') %}
+  <div class="toggle sidebar-toggle" role="button">
+    <span class="toggle-line"></span>
+    <span class="toggle-line"></span>
+    <span class="toggle-line"></span>
+  </div>
+  <div class="sidebar-dimmer"></div>
+{%- endif %}
+
 {%- if theme.back2top.enable and not theme.back2top.sidebar %}
   <div class="back-to-top" role="button" aria-label="{{ __('accessibility.back_to_top') }}">
     <i class="fa fa-arrow-up"></i>
diff --git a/source/css/_common/outline/sidebar/index.styl b/source/css/_common/outline/sidebar/index.styl
index 7fa5a1f..a059ee7 100644
--- a/source/css/_common/outline/sidebar/index.styl
+++ b/source/css/_common/outline/sidebar/index.styl
@@ -31,7 +31,6 @@
 @import 'sidebar-author-links';
 @import 'sidebar-button';
 @import 'sidebar-blogroll';
-@import 'sidebar-dimmer';
 @import 'sidebar-nav';
 @import 'sidebar-toggle';
 @import 'sidebar-toc';
diff --git a/source/css/_common/outline/sidebar/sidebar-dimmer.styl b/source/css/_common/outline/sidebar/sidebar-dimmer.styl
deleted file mode 100644
index 4ce022d..0000000
--- a/source/css/_common/outline/sidebar/sidebar-dimmer.styl
+++ /dev/null
@@ -1,24 +0,0 @@
-.sidebar-dimmer {
-  display: none;
-}
-
-+tablet-mobile() {
-  .sidebar-dimmer {
-    background: black;
-    display: block;
-    height: 100%;
-    left: 0;
-    opacity: 0;
-    position: fixed;
-    top: 0;
-    transition: visibility .4s, opacity .4s;
-    visibility: hidden;
-    width: 100%;
-    z-index: $zindex-1;
-
-    .sidebar-active & {
-      opacity: .7;
-      visibility: visible;
-    }
-  }
-}
diff --git a/source/css/_schemes/Muse/_sidebar.styl b/source/css/_schemes/Muse/_sidebar.styl
index c1b73bd..7e786ef 100644
--- a/source/css/_schemes/Muse/_sidebar.styl
+++ b/source/css/_schemes/Muse/_sidebar.styl
@@ -92,3 +92,28 @@ if (hexo-config('sidebar.position') == 'right') {
     white-space: nowrap;
   }
 }
+
+.sidebar-dimmer {
+  display: none;
+}
+
++tablet-mobile() {
+  .sidebar-dimmer {
+    background: black;
+    display: block;
+    height: 100%;
+    left: 0;
+    opacity: 0;
+    position: fixed;
+    top: 0;
+    transition: visibility .4s, opacity .4s;
+    visibility: hidden;
+    width: 100%;
+    z-index: $zindex-1;
+
+    .sidebar-active & {
+      opacity: .7;
+      visibility: visible;
+    }
+  }
+}
diff --git a/source/css/_schemes/Pisces/_sidebar.styl b/source/css/_schemes/Pisces/_sidebar.styl
index 385850a..62d971b 100644
--- a/source/css/_schemes/Pisces/_sidebar.styl
+++ b/source/css/_schemes/Pisces/_sidebar.styl
@@ -15,10 +15,6 @@
   }
 }
 
-.sidebar-toggle {
-  display: none;
-}
-
 .sidebar-inner {
   background: var(--content-bg-color);
   border-radius: $border-radius;