From afc770239a665bc4b8442f49549cf17b7de239a2 Mon Sep 17 00:00:00 2001
From: Mimi <1119186082@qq.com>
Date: Wed, 23 Nov 2022 11:59:43 +0800
Subject: [PATCH] Place blogroll and related-posts in separate sidebar-inner
 elements (#593)

---
 _config.yml                                   |  2 +-
 layout/_macro/post.njk                        |  4 ---
 layout/_macro/sidebar.njk                     | 35 +++++++++++++++++++
 layout/_partials/post/post-related.njk        | 20 +++++------
 layout/_partials/sidebar/site-overview.njk    | 27 +++-----------
 .../_common/components/third-party/index.styl |  1 -
 .../components/third-party/related-posts.styl | 23 ------------
 source/css/_common/outline/sidebar/index.styl |  8 +----
 .../outline/sidebar/related-posts.styl        | 31 ++++++++++++++++
 .../outline/sidebar/sidebar-blogroll.styl     |  1 -
 .../_common/outline/sidebar/sidebar-nav.styl  |  3 +-
 source/css/_schemes/Muse/_sidebar.styl        |  6 ++++
 source/css/_schemes/Pisces/_sidebar.styl      |  9 ++---
 source/css/noscript.styl                      |  1 +
 source/js/motion.js                           | 16 +++++----
 source/js/pjax.js                             |  2 ++
 source/js/utils.js                            |  4 +--
 17 files changed, 110 insertions(+), 83 deletions(-)
 delete mode 100644 source/css/_common/components/third-party/related-posts.styl
 create mode 100644 source/css/_common/outline/sidebar/related-posts.styl

diff --git a/_config.yml b/_config.yml
index 1bd01d3..ba7ebbe 100644
--- a/_config.yml
+++ b/_config.yml
@@ -286,7 +286,7 @@ follow_me:
 # Dependencies: https://github.com/sergeyzwezdin/hexo-related-posts
 related_posts:
   enable: false
-  display_in_home: false
+  icon: fa fa-signs-post
 
 # Post edit
 # Easily browse and edit blog source code online.
diff --git a/layout/_macro/post.njk b/layout/_macro/post.njk
index 87d27eb..7a58350 100644
--- a/layout/_macro/post.njk
+++ b/layout/_macro/post.njk
@@ -98,10 +98,6 @@
     {### END POST BODY ###}
     {#####################}
 
-    {%- if theme.related_posts.enable and (theme.related_posts.display_in_home or not is_index) %}
-      {{ partial('_partials/post/post-related.njk') }}
-    {%- endif %}
-
     <footer class="post-footer">
       {%- if is_index %}
         <div class="post-eof"></div>
diff --git a/layout/_macro/sidebar.njk b/layout/_macro/sidebar.njk
index d892e08..cb92c04 100644
--- a/layout/_macro/sidebar.njk
+++ b/layout/_macro/sidebar.njk
@@ -38,5 +38,40 @@
         </div>
       {%- endif %}
     </div>
+
+    {# Blogroll #}
+    {%- if theme.links %}
+    <div class="sidebar-inner sidebar-blogroll">
+      <div class="links-of-blogroll animated">
+        <div class="links-of-blogroll-title">
+          {%- if theme.links_settings.icon %}<i class="{{ theme.links_settings.icon }} fa-fw"></i>{% endif %}
+          {{ __('sidebar.links') }}
+        </div>
+        <ul class="links-of-blogroll-list">
+          {%- for blogrollText, blogrollURL in theme.links %}
+            <li class="links-of-blogroll-item">
+              {{ next_url(blogrollURL, blogrollText, {title: blogrollURL}) }}
+            </li>
+          {%- endfor %}
+        </ul>
+      </div>
+    </div>
+    {%- endif %}
+
+    {%- if theme.related_posts.enable %}
+      {%- if theme.pjax %}
+        <div class="pjax">
+      {%- endif %}
+      {%- if page.related_posts and page.related_posts.length > 0 %}
+        <div class="sidebar-inner sidebar-post-related">
+          <div class="animated">
+            {{ partial('_partials/post/post-related.njk') }}
+          </div>
+        </div>
+      {%- endif %}
+      {%- if theme.pjax %}
+        </div>
+      {%- endif %}
+    {%- endif %}
   </aside>
 {% endmacro %}
diff --git a/layout/_partials/post/post-related.njk b/layout/_partials/post/post-related.njk
index b11744c..ccf1286 100644
--- a/layout/_partials/post/post-related.njk
+++ b/layout/_partials/post/post-related.njk
@@ -1,20 +1,18 @@
-{%- if page.related_posts and page.related_posts.length > 0 %}
-  <div class="popular-posts-header">{{ __('post.related_posts') }}</div>
+  <div class="links-of-blogroll-title">
+    {%- if theme.related_posts.icon %}<i class="{{ theme.related_posts.icon }} fa-fw"></i>{% endif %}
+    {{ __('post.related_posts') }}
+  </div>
   <ul class="popular-posts">
   {%- for path in page.related_posts %}
     {%- set popular_post = site.posts.findOne({ path: path }) %}
     <li class="popular-posts-item">
+      <a class="popular-posts-link" href="{{ url_for(popular_post.path) }}" rel="bookmark">
       {%- if popular_post.date %}
-        <div class="popular-posts-date">{{ date(popular_post.date) }}</div>
-      {%- endif %}
-      {%- if popular_post.img %}
-        <div class="popular-posts-img"><img src="{{ popular_post.img }}" alt="{{ popular_post.title }}"></div>
-      {%- endif %}
-      <div class="popular-posts-title"><a href="{{ url_for(popular_post.path) }}" rel="bookmark">{{ popular_post.title }}</a></div>
-      {%- if popular_post.excerpt and popular_post.excerpt != '' %}
-        <div class="popular-posts-excerpt"><p>{{ popular_post.excerpt }}</p></div>
+        <time class="popular-posts-time">{{ date(popular_post.date) }}</time>
+        <br>
       {%- endif %}
+      {{ popular_post.title }}
+      </a>
     </li>
   {%- endfor %}
   </ul>
-{%- endif %}
diff --git a/layout/_partials/sidebar/site-overview.njk b/layout/_partials/sidebar/site-overview.njk
index 48025fd..9411517 100644
--- a/layout/_partials/sidebar/site-overview.njk
+++ b/layout/_partials/sidebar/site-overview.njk
@@ -1,4 +1,4 @@
-<div class="site-author site-overview-item animated" itemprop="author" itemscope itemtype="http://schema.org/Person">
+<div class="site-author animated" itemprop="author" itemscope itemtype="http://schema.org/Person">
   {%- if theme.avatar.url %}
     <img class="site-author-image" itemprop="image" alt="{{ author }}"
       src="{{ url_for(theme.avatar.url) }}">
@@ -8,7 +8,7 @@
 </div>
 
 {%- if theme.site_state %}
-<div class="site-state-wrap site-overview-item animated">
+<div class="site-state-wrap animated">
   <nav class="site-state">
     {%- if config.archive_dir != '/' and site.posts.length > 0 %}
       <div class="site-state-item site-state-posts">
@@ -52,7 +52,7 @@
 {%- endif %}
 
 {%- if theme.chat.enable and (theme.chatra.enable or theme.tidio.enable or theme.gitter.enable) %}
-  <div class="sidebar-button site-overview-item animated">
+  <div class="sidebar-button animated">
     <button{% if theme.gitter.enable %} class="js-gitter-toggle-chat-button"{% endif %}>
       {%- if theme.chat.icon %}<i class="{{ theme.chat.icon }}"></i>{% endif %}
       {{ __('widget.chat') }}
@@ -61,7 +61,7 @@
 {%- endif %}
 
 {%- if theme.social %}
-  <div class="links-of-author site-overview-item animated">
+  <div class="links-of-author animated">
     {%- for name, link in theme.social %}
       <span class="links-of-author-item">
         {%- set sidebarURL = link.split('||')[0] | trim %}
@@ -74,25 +74,8 @@
 {%- endif %}
 
 {%- if theme.creative_commons.license and theme.creative_commons.sidebar %}
-  <div class="cc-license site-overview-item animated" itemprop="license">
+  <div class="cc-license animated" itemprop="license">
     {%- set ccImage = '<img src="' + theme.vendors.creative_commons.url + '" alt="Creative Commons">' %}
     {{ next_url(ccURL, ccImage, {class: 'cc-opacity'}) }}
   </div>
 {%- endif %}
-
-{# Blogroll #}
-{%- if theme.links %}
-  <div class="links-of-blogroll site-overview-item animated">
-    <div class="links-of-blogroll-title">
-      {%- if theme.links_settings.icon %}<i class="{{ theme.links_settings.icon }} fa-fw"></i>{% endif %}
-      {{ __('sidebar.links') }}
-    </div>
-    <ul class="links-of-blogroll-list">
-      {%- for blogrollText, blogrollURL in theme.links %}
-        <li class="links-of-blogroll-item">
-          {{ next_url(blogrollURL, blogrollText, {title: blogrollURL}) }}
-        </li>
-      {%- endfor %}
-    </ul>
-  </div>
-{%- endif %}
diff --git a/source/css/_common/components/third-party/index.styl b/source/css/_common/components/third-party/index.styl
index 101dc72..9f068a7 100644
--- a/source/css/_common/components/third-party/index.styl
+++ b/source/css/_common/components/third-party/index.styl
@@ -2,7 +2,6 @@
 @import 'gitalk';
 @import 'utterances';
 @import 'search';
-@import 'related-posts';
 @import 'math';
 @import 'gitter';
 
diff --git a/source/css/_common/components/third-party/related-posts.styl b/source/css/_common/components/third-party/related-posts.styl
deleted file mode 100644
index 294153f..0000000
--- a/source/css/_common/components/third-party/related-posts.styl
+++ /dev/null
@@ -1,23 +0,0 @@
-if (hexo-config('related_posts.enable')) {
-  .popular-posts-header {
-    border-bottom: 1px solid $gainsboro;
-    font-size: $font-size-large;
-    margin-bottom: 10px;
-    margin-top: $post-eof-margin-bottom;
-  }
-
-  .popular-posts {
-    padding: 0;
-
-    .popular-posts-item {
-      margin-left: 2em;
-
-      .popular-posts-title {
-        font-size: $font-size-small;
-        font-weight: normal;
-        line-height: $line-height-base * 1.2;
-        margin: 0;
-      }
-    }
-  }
-}
diff --git a/source/css/_common/outline/sidebar/index.styl b/source/css/_common/outline/sidebar/index.styl
index a059ee7..5b04716 100644
--- a/source/css/_common/outline/sidebar/index.styl
+++ b/source/css/_common/outline/sidebar/index.styl
@@ -1,17 +1,10 @@
 .sidebar-inner {
   color: $grey-dark;
-  // Init Sidebar & TOC inner dimensions on all pages and for all schemes.
-  $offset = (($scheme == 'Pisces') or ($scheme == 'Gemini')) ? $sidebar-offset : $sidebar-padding;
-  max-height: 'calc(100vh - %s)' % unit($offset * 2, 'px');
   padding: $sidebar-padding 10px;
   text-align: center;
   flex-column();
 }
 
-.site-overview-item:not(:first-child) {
-  margin-top: 10px;
-}
-
 .cc-license {
   .cc-opacity {
     border-bottom: 0;
@@ -35,3 +28,4 @@
 @import 'sidebar-toggle';
 @import 'sidebar-toc';
 @import 'site-state';
+@import 'related-posts';
diff --git a/source/css/_common/outline/sidebar/related-posts.styl b/source/css/_common/outline/sidebar/related-posts.styl
new file mode 100644
index 0000000..157b43b
--- /dev/null
+++ b/source/css/_common/outline/sidebar/related-posts.styl
@@ -0,0 +1,31 @@
+if (hexo-config('related_posts.enable')) {
+  .sidebar-post-related {
+    font-size: $font-size-smaller;
+    padding: $sidebar-padding 0 0 0;
+  }
+
+  .popular-posts {
+    margin: 0;
+    padding: 1em 0;
+    text-align: left;
+
+    .popular-posts-item {
+      display: block;
+
+      .popular-posts-link {
+        border-bottom: 0;
+        display: block;
+        padding: 5px 20px;
+        transition: background .2s ease-in-out;
+
+        &:hover {
+          background: var(--menu-item-bg-color);
+        }
+      }
+
+      .popular-posts-time {
+        color: $site-state-item-name-color;
+      }
+    }
+  }
+}
diff --git a/source/css/_common/outline/sidebar/sidebar-blogroll.styl b/source/css/_common/outline/sidebar/sidebar-blogroll.styl
index ec51087..a1a3eb8 100644
--- a/source/css/_common/outline/sidebar/sidebar-blogroll.styl
+++ b/source/css/_common/outline/sidebar/sidebar-blogroll.styl
@@ -5,7 +5,6 @@
 .links-of-blogroll-title {
   font-size: $font-size-small;
   font-weight: 600;
-  margin-top: 0;
 }
 
 .links-of-blogroll-list {
diff --git a/source/css/_common/outline/sidebar/sidebar-nav.styl b/source/css/_common/outline/sidebar/sidebar-nav.styl
index 268a59d..5a49bee 100644
--- a/source/css/_common/outline/sidebar/sidebar-nav.styl
+++ b/source/css/_common/outline/sidebar/sidebar-nav.styl
@@ -48,8 +48,9 @@
 
 .sidebar-overview-active .site-overview-wrap {
   // Flexbox layout makes it possible to reorder the child
-  // elements of .site-overview-item through the `order` CSS property
+  // elements of .site-overview-wrap through the `order` CSS property
   flex-column();
+  gap: 10px;
 }
 
 .sidebar-toc-active .post-toc-wrap {
diff --git a/source/css/_schemes/Muse/_sidebar.styl b/source/css/_schemes/Muse/_sidebar.styl
index 3492185..d5758eb 100644
--- a/source/css/_schemes/Muse/_sidebar.styl
+++ b/source/css/_schemes/Muse/_sidebar.styl
@@ -36,6 +36,8 @@ if (hexo-config('sidebar.position') == 'right') {
   if (not hexo-config('back2top.sidebar')) {
     box-shadow: inset 0 2px 6px black;
   }
+  max-height: 100vh;
+  overflow-y: auto;
   position: fixed;
   top: 0;
   transition: all $transition-ease-out;
@@ -95,6 +97,10 @@ if (hexo-config('sidebar.position') == 'right') {
   }
 }
 
+.popular-posts .popular-posts-item .popular-posts-link:hover {
+  background: none;
+}
+
 .sidebar-dimmer {
   background: black;
   height: 100%;
diff --git a/source/css/_schemes/Pisces/_sidebar.styl b/source/css/_schemes/Pisces/_sidebar.styl
index 9197923..2ce83a7 100644
--- a/source/css/_schemes/Pisces/_sidebar.styl
+++ b/source/css/_schemes/Pisces/_sidebar.styl
@@ -7,10 +7,6 @@
   +tablet-mobile() {
     display: none;
   }
-
-  if (hexo-config('motion.enable') and hexo-config('motion.transition.sidebar')) {
-    visibility: hidden;
-  }
 }
 
 .sidebar-inner {
@@ -20,6 +16,11 @@
   box-sizing: border-box;
   color: var(--text-color);
   margin-top: $sidebar-offset;
+  max-height: 'calc(100vh - %s)' % unit($sidebar-offset * 2, 'px');
+
+  if (hexo-config('motion.enable') and hexo-config('motion.transition.sidebar')) {
+    visibility: hidden;
+  }
 }
 
 .site-state-item {
diff --git a/source/css/noscript.styl b/source/css/noscript.styl
index 1a1eea5..8891cf4 100644
--- a/source/css/noscript.styl
+++ b/source/css/noscript.styl
@@ -4,6 +4,7 @@ body { margin-top: 2rem; }
 
 .use-motion .menu-item,
 .use-motion .sidebar,
+.use-motion .sidebar-inner,
 .use-motion .post-block,
 .use-motion .pagination,
 .use-motion .comments,
diff --git a/source/js/motion.js b/source/js/motion.js
index 0bc8900..7ef54b0 100644
--- a/source/js/motion.js
+++ b/source/js/motion.js
@@ -107,16 +107,20 @@ NexT.motion.middleWares = {
   },
 
   sidebar: function() {
-    const sidebar = document.querySelector('.sidebar');
+    const sequence = [];
+    const sidebar = document.querySelectorAll('.sidebar-inner');
     const sidebarTransition = CONFIG.motion.transition.sidebar;
     // Only for Pisces | Gemini.
     if (sidebarTransition && (CONFIG.scheme === 'Pisces' || CONFIG.scheme === 'Gemini')) {
-      return [{
-        targets : sidebar,
-        complete: () => sidebar.classList.add('animated', sidebarTransition)
-      }];
+      sidebar.forEach(targets => {
+        sequence.push({
+          targets,
+          complete: () => targets.classList.add('animated', sidebarTransition),
+          deltaT  : '-=100'
+        });
+      });
     }
-    return [];
+    return sequence;
   },
 
   footer: function() {
diff --git a/source/js/pjax.js b/source/js/pjax.js
index da61136..ec24341 100644
--- a/source/js/pjax.js
+++ b/source/js/pjax.js
@@ -23,6 +23,8 @@ document.addEventListener('pjax:success', () => {
       .init()
       .add(NexT.motion.middleWares.subMenu)
       .add(NexT.motion.middleWares.postList)
+      // Add sidebar-post-related transition.
+      .add(NexT.motion.middleWares.sidebar)
       .bootstrap();
   }
   if (CONFIG.sidebar.display !== 'remove') {
diff --git a/source/js/utils.js b/source/js/utils.js
index 0f2dad3..b6aad90 100644
--- a/source/js/utils.js
+++ b/source/js/utils.js
@@ -275,8 +275,8 @@ NexT.utils = {
       parent = parent.parentNode;
     }
     // Scrolling to center active TOC element if TOC content is taller then viewport.
-    const tocElement = document.querySelector('.sidebar-panel-container');
-    if (!tocElement.parentNode.classList.contains('sidebar-toc-active')) return;
+    const tocElement = document.querySelector(CONFIG.scheme === 'Pisces' || CONFIG.scheme === 'Gemini' ? '.sidebar-panel-container' : '.sidebar');
+    if (!document.querySelector('.sidebar-toc-active')) return;
     window.anime({
       targets  : tocElement,
       duration : 200,