From 1501440d8d06070790328fbf7a22f70ae037ff2f Mon Sep 17 00:00:00 2001 From: Mimi <1119186082@qq.com> Date: Sat, 4 Mar 2023 12:23:06 +0800 Subject: [PATCH] Fix .footer-fixed toggle and position * See: https://github.com/next-theme/hexo-theme-next/pull/31 --- source/css/_common/outline/footer/index.styl | 2 ++ source/css/_schemes/Muse/_sidebar.styl | 8 ++++++++ source/js/schemes/muse.js | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/source/css/_common/outline/footer/index.styl b/source/css/_common/outline/footer/index.styl index f5ed5bc..0371a2b 100644 --- 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 index d5758eb..87b0ef2 100644 --- 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 index e5fc8bd..ba60b51 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('.column').offsetHeight + document.querySelector('.main').offsetHeight + footer.offsetHeight; + const containerHeight = document.querySelector('.main').offsetHeight + footer.offsetHeight; footer.classList.toggle('footer-fixed', containerHeight <= window.innerHeight); }