From eb5625c3ae2f9b8971b8839873ed7ead4e789ad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=93=E5=8F=91=E5=8F=97=E9=95=BF=E7=94=9F?= Date: Sun, 25 Aug 2019 14:22:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=88=E6=9E=9C=E7=BE=8E=E5=8C=96=E5=8F=8A?= =?UTF-8?q?=E8=8B=A5=E5=B9=B2=E6=95=88=E6=9E=9Cbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/yilia/layout/_partial/left-col.ejs | 1 - themes/yilia/layout/categories.ejs | 4 +- themes/yilia/source-src/css/grid.scss | 11 ++++-- themes/yilia/source-src/css/img/left_bg.jpg | Bin 0 -> 7049 bytes themes/yilia/source-src/css/left.scss | 16 ++------ themes/yilia/source-src/css/night.scss | 3 -- themes/yilia/source-src/js/aside.js | 22 +++++------ themes/yilia/source-src/js/main.js | 6 +-- themes/yilia/source-src/js/photo-wall.js | 7 +--- themes/yilia/source-src/js/util.js | 39 +++++++------------- themes/yilia/source-src/js/viewer.js | 1 - 11 files changed, 43 insertions(+), 67 deletions(-) create mode 100644 themes/yilia/source-src/css/img/left_bg.jpg diff --git a/themes/yilia/layout/_partial/left-col.ejs b/themes/yilia/layout/_partial/left-col.ejs index 2f7357f..19dd6a2 100644 --- a/themes/yilia/layout/_partial/left-col.ejs +++ b/themes/yilia/layout/_partial/left-col.ejs @@ -1,5 +1,4 @@ <% var defaultBg = '#4d4d4d'; %> -
\ No newline at end of file diff --git a/themes/yilia/source-src/css/grid.scss b/themes/yilia/source-src/css/grid.scss index 87ef19d..eaa1b41 100644 --- a/themes/yilia/source-src/css/grid.scss +++ b/themes/yilia/source-src/css/grid.scss @@ -27,10 +27,13 @@ html, body, #container { .anm-canvas { display: none; } - &.show .anm-canvas { - display: block; - position: fixed; - } + &.show { + overflow-y: hidden; + .anm-canvas { + display: block; + position: fixed; + } + } } .body-wrap{ padding-top: 30px; diff --git a/themes/yilia/source-src/css/img/left_bg.jpg b/themes/yilia/source-src/css/img/left_bg.jpg new file mode 100644 index 0000000000000000000000000000000000000000..d5b3b302f14315568218d4d26e550dd9f75df9a1 GIT binary patch literal 7049 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 literal 0 HcmV?d00001 diff --git a/themes/yilia/source-src/css/left.scss b/themes/yilia/source-src/css/left.scss index 4d06dd8..da07e81 100644 --- a/themes/yilia/source-src/css/left.scss +++ b/themes/yilia/source-src/css/left.scss @@ -1,21 +1,13 @@ .left-col { - background: $colorBg; + background: $colorBg url(./img/left_bg.jpg) no-repeat; + background-size: cover; width: 300px; position:fixed; opacity:1; @extend %trans; height:100%; - z-index: 999; - &.show { - @extend %shadow; - } - .overlay{ - width: 100%; - height: 130px; - position: absolute; - background: #4d4d4d; - @extend %trans; - } + z-index: 999; + @extend %shadow; .intrude-less { width: 76%; diff --git a/themes/yilia/source-src/css/night.scss b/themes/yilia/source-src/css/night.scss index 5f43093..1fda0d6 100644 --- a/themes/yilia/source-src/css/night.scss +++ b/themes/yilia/source-src/css/night.scss @@ -105,9 +105,6 @@ body.night { display: none; } } - .overlay { - background: none; - } // 头像 看板娘 图标 -> 降低亮度滤镜 .profilepic, .waifu, #header .header-nav .social a { filter: brightness(30%); diff --git a/themes/yilia/source-src/js/aside.js b/themes/yilia/source-src/js/aside.js index 7eeafec..5d1f4a1 100644 --- a/themes/yilia/source-src/js/aside.js +++ b/themes/yilia/source-src/js/aside.js @@ -1,13 +1,12 @@ var backTop = function (domE, ctn, distance) { if (!domE) return - var timer = null - var _onscroll = ctn.onscroll - ctn.onscroll = throttle(function () { // 滚动到一定高度才显示"回到顶部"按钮 - typeof _onscroll === 'function' && _onscroll.apply(this, arguments) - toggleDomE() - }, 100) + ctn.addEventListener('scroll', function(){ + // 滚动到一定高度才显示"回到顶部"按钮 + throttle(toggleDomE, 200)(domE, ctn, distance) + }) if(!window.getComputedStyle || window.getComputedStyle(ctn).scrollBehavior === undefined) { // 浏览器不支持scroll-behavior属性 + let timer = null domE.querySelector('a[href="#top"]').addEventListener('click', function (event) { event.preventDefault() timer = setInterval(function () { //设置一个计时器 @@ -26,16 +25,15 @@ var backTop = function (domE, ctn, distance) { }) } - function toggleDomE() { - domE.style.display = (ctn.scrollTop || document.documentElement.scrollTop || document.body.scrollTop) > distance ? 'block' : 'none' + function toggleDomE(targetDom, containerDom, distance) { + targetDom.style.display = (containerDom.scrollTop || document.documentElement.scrollTop || document.body.scrollTop) > distance ? 'block' : 'none' } function throttle(func, wait) { var timer = null - return function () { - var self = this, args = arguments + return function (...args) { if (timer) clearTimeout(timer) - timer = setTimeout(function () { - return typeof func === 'function' && func.apply(self, args) + timer = setTimeout(() => { + return typeof func === 'function' && func.apply(this, args) }, wait) } } diff --git a/themes/yilia/source-src/js/main.js b/themes/yilia/source-src/js/main.js index f472775..c6657ac 100644 --- a/themes/yilia/source-src/js/main.js +++ b/themes/yilia/source-src/js/main.js @@ -27,17 +27,17 @@ Util.addLoadEvent(function() { },{ // 放大 scale: 0.8 },{ // 缩小 - scale: 1.2 + scale: 1.1 },{ // 绕X轴旋转 rotate: { x: 30 } },{ // 绕Y轴旋转 - rotate: { y: 30 } + rotate: { y: 20 } }] import(/* webpackChunkName: "scrollreveal" */ 'scrollreveal').then(ScrollReveal => { let index = Math.floor(Math.random() * animateTypes.length) ScrollReveal.default().reveal('.article-index', Object.assign({ delay: 200, - container: document.querySelector('#container') + container: document.getElementById('container') }, animateTypes[index])) }) } diff --git a/themes/yilia/source-src/js/photo-wall.js b/themes/yilia/source-src/js/photo-wall.js index 5ff497b..dd3aebd 100644 --- a/themes/yilia/source-src/js/photo-wall.js +++ b/themes/yilia/source-src/js/photo-wall.js @@ -92,11 +92,8 @@ function checkScrollSlide(){ } function init() { - var _onscroll = scrollDom.onscroll var timer = null - scrollDom.onscroll = function () { - // 保留已有的滚动事件回调函数并在新的回调函数中进行调用 - typeof _onscroll === 'function' && _onscroll.apply(this, arguments) + scrollDom.addEventListener('scroll', function(){ if(scrollLock) return if(timer) clearTimeout(timer) timer = setTimeout(()=>{ @@ -105,7 +102,7 @@ function init() { } timer = null }, 200) - } + }) loadMoreItems(defaultStep) } export default { init } \ No newline at end of file diff --git a/themes/yilia/source-src/js/util.js b/themes/yilia/source-src/js/util.js index 3e7ae42..0f48f4f 100644 --- a/themes/yilia/source-src/js/util.js +++ b/themes/yilia/source-src/js/util.js @@ -8,22 +8,23 @@ const Util = (function(){ var t = /"|<|>|&| |'|&#(\d+);|&#(\d+)/g , o = /['<> "&]/g , u = { - """: '"', - "<": "<", - ">": ">", - "&": "&", - " ": " " - } + """: '"', + "<": "<", + ">": ">", + "&": "&", + " ": " " + } , c = /\u00a0/g , a = //gi , i = /\r?\n/g , f = /\s/g , p = {} - for (var s in u) - p[u[s]] = s; - return u["'"] = "'", - p["'"] = "'", - { + for (let s in u) { + p[u[s]] = s + } + u["'"] = "'" + p["'"] = "'" + return { encode: function(e) { return e ? ("" + e).replace(o, n).replace(i, "
").replace(f, " ") : "" }, @@ -67,21 +68,9 @@ const Util = (function(){ return e.encode(r) return r }, - loadScript: function(path) { - var $script = document.createElement('script') - document.getElementsByTagName('body')[0].appendChild($script) - $script.setAttribute('src', path) - }, addLoadEvent: function(func){ - var oldonload = window.onload - if (typeof window.onload !== "function") { - window.onload = func - } else { - window.onload = function() { - oldonload() - func() - } - } + if(typeof func !== 'function') return + document.addEventListener("DOMContentLoaded", func) } } })() diff --git a/themes/yilia/source-src/js/viewer.js b/themes/yilia/source-src/js/viewer.js index 241d71c..2ca84d7 100644 --- a/themes/yilia/source-src/js/viewer.js +++ b/themes/yilia/source-src/js/viewer.js @@ -43,7 +43,6 @@ function init() { }) } -// export default { init } if(!window.themeConfig.pageid) { // 非个性化页面的普通文章 Util.addLoadEvent(init) } \ No newline at end of file