diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f4d1767..26ce04e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.4.2 +### Bug fixes +- Fix scroll to top. + ## 1.4.1 ### Bug fixes - Fix generate slug. diff --git a/src/event.js b/src/event.js index 45f558a1..802ddc39 100644 --- a/src/event.js +++ b/src/event.js @@ -94,19 +94,14 @@ export function bindToggle (dom) { dom.addEventListener('click', () => body.classList.toggle('close')) - if (!/mobile/i.test(navigator.userAgent)) return - document.querySelector('aside').addEventListener('click', event => { - body.classList.toggle('close') - }) + if (isMobile()) { + document.querySelector('aside') + .addEventListener('click', _ => body.classList.toggle('close')) + } } -let cacheContentDOM export function scroll2Top () { - if (!cacheContentDOM) { - const dom = isMobile() ? 'body' : 'section.content' - cacheContentDOM = document.querySelector(dom) - } - cacheContentDOM.scrollTop = 0 + document.body.scrollTop = 0 } export function sticky () { diff --git a/src/themes/basic/_layout.css b/src/themes/basic/_layout.css index 4e240cc0..4fd34c7b 100644 --- a/src/themes/basic/_layout.css +++ b/src/themes/basic/_layout.css @@ -177,7 +177,7 @@ main { .sidebar { border-right: 1px solid rgba(0, 0, 0, .07); overflow-y: auto; - padding-top: 40px; + padding: 40px 0; position: absolute 0 * 0 0; transition: transform 250ms ease-out; width: $sidebar-width; @@ -206,17 +206,18 @@ main { .sidebar-toggle { background-color: transparent; border: 0; - bottom: 10px; - left: 10px; outline: none; - position: absolute; + position: absolute * * 0 0; text-align: center; transition: opacity .3s; width: 30px; z-index: 30; outline: none; + width: calc($sidebar-width - 16px); + padding: 10px; + background-color: rgba($color-bg, .8); - &:hover { + .sidebar-toggle-button:hover { opacity: .4; } @@ -290,6 +291,10 @@ body.close { transform: translateX(-$sidebar-width); } + .sidebar-toggle { + width: auto; + } + .content { left: 0; } @@ -323,11 +328,19 @@ body.close { transition: transform 250ms ease-out; } + .sidebar-toggle { + width: auto; + } + body.close { .sidebar { transform: translateX($sidebar-width); } + .sidebar-toggle { + width: calc($sidebar-width - 16px); + } + .content { transform: translateX($sidebar-width); } diff --git a/src/tpl.js b/src/tpl.js index 644a8efb..d9cd691c 100644 --- a/src/tpl.js +++ b/src/tpl.js @@ -47,8 +47,10 @@ export function cover () { export function toggle () { return `` +
+ ` } /**