Fix .footer-fixed toggle and position

* See: next-theme#31
gtn1024 · Jul 20, 2023 · 7aefa44 · 7aefa44
1 parent ed39710
commit 7aefa44
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/source/css/_common/outline/footer/index.styl b/source/css/_common/outline/footer/index.styl
@@ -4,6 +4,8 @@
   color: $grey-dark;
   font-size: $font-size-small;
   padding: 20px 0;
+  transition: $transition-ease;
+  transition-property: left, right;
 
   &.footer-fixed {
     bottom: 0;

diff --git a/source/css/_schemes/Muse/_sidebar.styl b/source/css/_schemes/Muse/_sidebar.styl
@@ -4,6 +4,10 @@ if (hexo-config('sidebar.position') == 'right') {
     // Otherwise a horizontal scrollbar will appear
     +desktop-large() {
       padding-right: $sidebar-desktop;
+
+      .footer-fixed {
+        right: $sidebar-desktop;
+      }
     }
   }
 
@@ -18,6 +22,10 @@ if (hexo-config('sidebar.position') == 'right') {
   .sidebar-active {
     +desktop-large() {
       padding-left: $sidebar-desktop;
+
+      .footer-fixed {
+        left: $sidebar-desktop;
+      }
     }
   }
 

diff --git 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('.column').offsetHeight + document.querySelector('.main').offsetHeight + footer.offsetHeight;
+    const containerHeight = document.querySelector('.main').offsetHeight + footer.offsetHeight;
     footer.classList.toggle('footer-fixed', containerHeight <= window.innerHeight);
   }