diff --git a/themes/yilia/source-src/css/tools.scss b/themes/yilia/source-src/css/tools.scss index 704c9c2..8d47381 100644 --- a/themes/yilia/source-src/css/tools.scss +++ b/themes/yilia/source-src/css/tools.scss @@ -269,7 +269,8 @@ label.bui-switch-label { } } .search-result { - height: 700px; + height: 600px; + overflow-y: auto; .search-result-item { text-align: left; border-bottom: 1px dashed $colorC; diff --git a/themes/yilia/source-src/js/share.js b/themes/yilia/source-src/js/share.js index d500bac..a7e78b1 100644 --- a/themes/yilia/source-src/js/share.js +++ b/themes/yilia/source-src/js/share.js @@ -15,15 +15,6 @@ function showWXModal() { mask.classList.add('in') } -function hideModal() { - let modals = document.querySelectorAll('.page-modal') - let mask = document.querySelector('.mask') - Array.prototype.forEach.call(modals, modal => { - modal.classList.remove('in') - }) - mask.classList.remove('in') -} - function handleClick(type, opts) { let url = null switch(type) { @@ -79,10 +70,6 @@ let init = function() { }) } }) - document.querySelector('.mask').addEventListener('click', hideModal) - Array.prototype.forEach.call(document.querySelectorAll('.js-modal-close'), modalClose => { - modalClose.addEventListener('click', hideModal) - }) } export default { init } \ No newline at end of file diff --git a/themes/yilia/source-src/js/slider.js b/themes/yilia/source-src/js/slider.js index f0d98c3..7b117d6 100644 --- a/themes/yilia/source-src/js/slider.js +++ b/themes/yilia/source-src/js/slider.js @@ -175,6 +175,18 @@ new Vue({ try { if(night && eval(night)) document.querySelector('body').classList.add('night') } catch (e){} + + let hideModal = (function() { + let modals = document.querySelectorAll('.page-modal') + Array.prototype.forEach.call(modals, modal => { + modal.classList.remove('in') + }) + this.$refs.mask.classList.remove('in') + }).bind(this) + this.$refs.mask.addEventListener('click', hideModal) + Array.prototype.forEach.call(document.querySelectorAll('.js-modal-close'), modalClose => { + modalClose.addEventListener('click', hideModal) + }) } })