From f31c10d3295530ab0dedd59670462e90b719ae77 Mon Sep 17 00:00:00 2001 From: Mimi <1119186082@qq.com> Date: Sat, 14 May 2022 12:12:47 +0800 Subject: [PATCH] Fix class name conflict with pandoc * See: https://github.com/next-theme/hexo-theme-next/issues/521 --- source/css/_common/outline/header/index.styl | 5 +++-- source/css/noscript.styl | 2 +- source/js/motion.js | 2 +- source/js/schemes/muse.js | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/source/css/_common/outline/header/index.styl b/source/css/_common/outline/header/index.styl index 82cf049..9f5a67e 100644 --- a/source/css/_common/outline/header/index.styl +++ b/source/css/_common/outline/header/index.styl @@ -9,7 +9,8 @@ } } -.header { +// Fix issue #521 +header.header { background: $head-bg; } @@ -24,7 +25,7 @@ } .use-motion { - .header, .site-brand-container .toggle { + header.header, .site-brand-container .toggle { opacity: 0; } } diff --git a/source/css/noscript.styl b/source/css/noscript.styl index 9b71ddb..2ca321f 100644 --- a/source/css/noscript.styl +++ b/source/css/noscript.styl @@ -11,7 +11,7 @@ body { margin-top: 2rem; } visibility: visible; } -.use-motion .header, +.use-motion header.header, .use-motion .site-brand-container .toggle, .use-motion .footer { opacity: initial; } diff --git a/source/js/motion.js b/source/js/motion.js index faaab32..2f38249 100644 --- a/source/js/motion.js +++ b/source/js/motion.js @@ -51,7 +51,7 @@ NexT.motion.middleWares = { }); } - pushToSequence('.header'); + pushToSequence('header.header'); 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 15f9dbe..ae5addb 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').offsetHeight + document.querySelector('.main').offsetHeight + footer.offsetHeight; + const containerHeight = document.querySelector('header.header').offsetHeight + document.querySelector('.main').offsetHeight + footer.offsetHeight; footer.classList.toggle('footer-fixed', containerHeight <= window.innerHeight); }