From b4e0d54d7bdcef8856d22f71e0022d3310c070a7 Mon Sep 17 00:00:00 2001 From: "qingwei.li" Date: Sat, 31 Dec 2016 14:53:27 +0800 Subject: [PATCH 001/903] Fix menu toggle style --- CHANGELOG.md | 4 ++++ src/event.js | 15 +++++---------- src/themes/basic/_layout.css | 23 ++++++++++++++++++----- src/tpl.js | 6 ++++-- 4 files changed, 31 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f4d176..26ce04e 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 45f558a..802ddc3 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 4e240cc..4fd34c7 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 644a8ef..d9cd691 100644 --- a/src/tpl.js +++ b/src/tpl.js @@ -47,8 +47,10 @@ export function cover () { export function toggle () { return `` + + ` } /** From d6b996f4c19bca76ba195239177bf54449303701 Mon Sep 17 00:00:00 2001 From: "qingwei.li" Date: Sat, 31 Dec 2016 15:07:02 +0800 Subject: [PATCH 002/903] Add changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26ce04e..6f2dfe5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## xxx + +### Bug fixes +- Fix toggle button style. + + ## 1.4.2 ### Bug fixes - Fix scroll to top. From 580767bf78c5c80df8c7b60c4eb799be4f93ad34 Mon Sep 17 00:00:00 2001 From: "qingwei.li" Date: Sat, 31 Dec 2016 15:12:28 +0800 Subject: [PATCH 003/903] Clear dev.html --- dev.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/dev.html b/dev.html index 7edecde..dba5d41 100644 --- a/dev.html +++ b/dev.html @@ -8,7 +8,5 @@
- - From 66d7919fa9ebdf1ef9cec0d066ae024cd3673904 Mon Sep 17 00:00:00 2001 From: "qingwei.li" Date: Sat, 31 Dec 2016 22:04:14 +0800 Subject: [PATCH 004/903] Fix href type, fixed #46 --- CHANGELOG.md | 1 + src/render.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f2dfe5..499ce14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ### Bug fixes - Fix toggle button style. +- Support `mailto`, `tel`, etc. href type ## 1.4.2 diff --git a/src/render.js b/src/render.js index d6f33f5..13d1fd1 100644 --- a/src/render.js +++ b/src/render.js @@ -40,7 +40,7 @@ renderer.code = function (code, lang = '') { return `
${hl}
` } renderer.link = function (href, title, text) { - if (OPTIONS.router && !/^(?:\w+:)?\/\/([^\s\.]+\.\S{2}|localhost[\:?\d]*)\S*$/.test(href)) { + if (OPTIONS.router && !/:/.test(href)) { href = `#/${href}`.replace(/\/\//g, '/') } From 2bb8641303ed655190f043778b66fcc09df4da96 Mon Sep 17 00:00:00 2001 From: "qingwei.li" Date: Sat, 31 Dec 2016 22:04:54 +0800 Subject: [PATCH 005/903] bump 1.4.3 --- CHANGELOG.md | 2 +- lib/docsify.js | 19 +++++++------------ lib/docsify.min.js | 4 ++-- lib/themes/buble.css | 2 +- lib/themes/pure.css | 2 +- lib/themes/vue.css | 2 +- 6 files changed, 13 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 499ce14..0291c00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## xxx +## 1.4.3 ### Bug fixes - Fix toggle button style. diff --git a/lib/docsify.js b/lib/docsify.js index 87ad602..e61c0ff 100644 --- a/lib/docsify.js +++ b/lib/docsify.js @@ -235,19 +235,14 @@ function bindToggle (dom) { dom.addEventListener('click', function () { return body.classList.toggle('close'); }); - if (!/mobile/i.test(navigator.userAgent)) { return } - document.querySelector('aside').addEventListener('click', function (event) { - body.classList.toggle('close'); - }); + if (isMobile()) { + document.querySelector('aside') + .addEventListener('click', function (_) { return body.classList.toggle('close'); }); + } } -var cacheContentDOM; function scroll2Top () { - if (!cacheContentDOM) { - var dom = isMobile() ? 'body' : 'section.content'; - cacheContentDOM = document.querySelector(dom); - } - cacheContentDOM.scrollTop = 0; + document.body.scrollTop = 0; } function sticky () { @@ -2388,7 +2383,7 @@ function cover () { } function toggle () { - return "" + return "" } /** @@ -2450,7 +2445,7 @@ renderer.code = function (code, lang) { return ("
" + hl + "
") }; renderer.link = function (href, title, text) { - if (OPTIONS$1.router && !/^(?:\w+:)?\/\/([^\s\.]+\.\S{2}|localhost[\:?\d]*)\S*$/.test(href)) { + if (OPTIONS$1.router && !/:/.test(href)) { href = ("#/" + href).replace(/\/\//g, '/'); } diff --git a/lib/docsify.min.js b/lib/docsify.min.js index 6937f66..842ecea 100644 --- a/lib/docsify.min.js +++ b/lib/docsify.min.js @@ -1,2 +1,2 @@ -var Docsify=function(){"use strict";function e(e,t,n){void 0===t&&(t="GET");var r=new XMLHttpRequest;return r.open(t,e),r.send(),{then:function(e,t){if(void 0===t&&(t=function(){}),n){var a=setInterval(function(e){return n({step:Math.floor(5*Math.random()+1)})},500);r.addEventListener("progress",n),r.addEventListener("loadend",function(e){n(e),clearInterval(a)})}r.addEventListener("error",t),r.addEventListener("load",function(n){var r=n.target;r.status>=400?t(r):e(r.response)})},abort:function(){return 4!==r.readyState&&r.abort()}}}function t(e,t){var n=[],r={};return e.forEach(function(e){var a=e.level||1,i=a-1;a>t||(r[i]?(r[i].children=r[i].children||[],r[i].children.push(e)):n.push(e),r[a]=e)}),n}function n(e){return e.replace(/([A-Z])/g,function(e){return"-"+e.toLowerCase()})}function r(e){return null===e||void 0===e}function a(){var e=window.location;if(E===e.hash&&!r($))return $;var t=e.hash.match(/^#\/([^#]+)/);return t=t&&2===t.length?t[1]:/^#\//.test(e.hash)?"":e.pathname,$=t,E=e.hash,t}function i(){return document.body.clientWidth<=600}function s(e){var t=/[\u2000-\u206F\u2E00-\u2E7F\\'!"#$%&()*+,.\/:;<=>?@\[\]^`{|}~]/g,n=!1,r="-";if(s.occurrences=s.occurrences||{},"string"!=typeof e)return"";n||(e=e.toLowerCase());var a=e.trim().replace(t,"").replace(/\s/g,r),i=s.occurrences[a];return s.occurrences.hasOwnProperty(a)?i++:i=0,s.occurrences[a]=i,i&&(a=a+"-"+i),a}function o(){function e(){for(var e=0,r=t.length;e10){var o=n[i.getAttribute("data-id")];if(!o||o===a)return;return a&&a.setAttribute("class",""),o.setAttribute("class","active"),void(a=o)}}}if(!i()){for(var t=document.querySelectorAll(".anchor"),n={},r=document.querySelectorAll(".sidebar li"),a=null,s=0,o=r.length;s=t||e.classList.contains("hidden")?document.body.classList.add("sticky"):document.body.classList.remove("sticky")}()}function g(e,t){return t={exports:{}},e(t,t.exports),t.exports}function h(e){return e?(/\/\//.test(e)||(e="https://github.com/"+e),e=e.replace(/^git\+/,""),'\n \n \n '):""}function f(e){return"
\n "+e+'\n \n
\n
\n
\n
'}function m(){var e=", 100%, 85%",t="linear-gradient(to left bottom, hsl("+(Math.floor(255*Math.random())+e)+") 0%, hsl("+(Math.floor(255*Math.random())+e)+") 100%)";return'
\n
\n
\n
'}function b(){return''}function y(e,t){return void 0===t&&(t=""),e&&e.length?(e.forEach(function(e){t+='
  • '+e.title+"
  • ",e.children&&(t+='
    • '+y(e.children)+"
    ")}),t):""}function v(e,t){var n=document.querySelector("nav")||document.createElement("nav");M.repo||n.classList.add("no-badge"),e[t?"outerHTML":"innerHTML"]=h(M.repo)+(M.coverpage?m():"")+f(M.sidebarToggle?b():""),document.body.insertBefore(n,document.body.children[0]),c("button.sidebar-toggle"),M.coverpage?!i()&&window.addEventListener("scroll",d):document.body.classList.add("sticky")}function k(e){if(P("article",e?j(e):"not found"),M.sidebar||M.loadSidebar||w(),e&&"undefined"!=typeof Vue&&"undefined"!=typeof Vuep){var t=new Vue({el:"main"});t.$nextTick(function(e){return o()})}M.auto2top&&p()}function x(e){N.navbar&&N.navbar===e||(N.navbar=e,e&&P("nav",j(e)),u("nav"))}function w(e){var n;n=e?j(e):M.sidebar?y(M.sidebar,"