From 02a0adb872b57c79a034be8e84d5c9d5e6e2b05f Mon Sep 17 00:00:00 2001 From: "cinwell.li" Date: Wed, 30 Nov 2016 21:33:44 +0800 Subject: [PATCH 0001/1003] 0.7.0 (#16) * add ignore * Use postcss * delete themes/ * fix build script * fix css, fixed #15, fixed #13 * Add changelog * Fix horizontal scroll for code block, fixed #11 * Fix sidebar animation --- .gitignore | 1 + CHANGELOG.md | 7 + build/build-css.js | 26 +- lib/docsify.js | 4 +- lib/docsify.min.js | 2 +- lib/themes/buble.css | 2 +- lib/themes/pure.css | 2 +- lib/themes/vue.css | 2 +- package.json | 6 +- src/render.js | 4 +- src/themes/basic/_layout.css | 279 ++++++++++++++++++ src/themes/buble.css | 260 ++++++++++++++++ src/themes/pure.css | 3 + src/themes/vue.css | 305 +++++++++++++++++++ themes/buble.css | 519 -------------------------------- themes/pure.css | 267 ----------------- themes/vue.css | 558 ----------------------------------- 17 files changed, 888 insertions(+), 1359 deletions(-) create mode 100644 src/themes/basic/_layout.css create mode 100644 src/themes/buble.css create mode 100644 src/themes/pure.css create mode 100644 src/themes/vue.css delete mode 100644 themes/buble.css delete mode 100644 themes/pure.css delete mode 100644 themes/vue.css diff --git a/.gitignore b/.gitignore index b915831..012dc25 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.log node_modules yarn.lock +/themes \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 25575c9..a8ae119 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 0.7.0 +### Breaking change +- `themes/` was removed, only exists in the npm package. + +### Bug fixes +- Fix style + ## 0.6.1 ### Bug fixes - In the mobile, it should collapse the sidebar when toggle is clicked. diff --git a/build/build-css.js b/build/build-css.js index 48732d2..0890c29 100644 --- a/build/build-css.js +++ b/build/build-css.js @@ -1,20 +1,38 @@ var fs = require('fs') var cssnano = require('cssnano').process var resolve = require('path').resolve +var postcss = require('postcss') -var save = function (file, content) { +var processor = postcss([require('postcss-salad')]) + +var saveMin = function (file, content) { fs.writeFileSync(resolve(__dirname, '../lib/themes/', file), content) } +var save = function (file, content) { + fs.writeFileSync(resolve(__dirname, '../themes/', file), content) +} var load = function (file) { + return fs.readFileSync(resolve(__dirname, '../src/themes/', file)).toString() +} +var loadLib = function (file) { return fs.readFileSync(resolve(__dirname, '../themes/', file)).toString() } -var list = fs.readdirSync(resolve(__dirname, '../themes')) +var list = fs.readdirSync(resolve(__dirname, '../src/themes')) list.forEach(function (file) { - cssnano(load(file)) + if (!/\.css$/.test(file)) return + processor.process(load(file), { from: resolve(__dirname, '../src/themes/', file) }) .then(function (result) { save(file, result.css) - console.log('cssnao - ' + file) + console.log('salad - ' + file) + cssnano(loadLib(file)) + .then(function (result) { + saveMin(file, result.css) + console.log('cssnao - ' + file) + }) + }).catch(function (err) { + console.log(err) }) }) + diff --git a/lib/docsify.js b/lib/docsify.js index 82602b9..216bed9 100644 --- a/lib/docsify.js +++ b/lib/docsify.js @@ -2352,9 +2352,7 @@ function renderApp (dom, replace, opts) { * article */ function renderArticle (content, OPTIONS) { - if ( content === void 0 ) content = 'not found'; - - renderTo('article', marked(content)); + renderTo('article', content ? marked(content) : 'not found'); if (!renderSidebar.rendered) { renderSidebar(null, OPTIONS); } if (!renderNavbar.rendered) { renderNavbar(null, OPTIONS); } } diff --git a/lib/docsify.min.js b/lib/docsify.min.js index e26ff41..b27672a 100644 --- a/lib/docsify.min.js +++ b/lib/docsify.min.js @@ -1 +1 @@ -var Docsify=function(){"use strict";function e(e,t){void 0===t&&(t="get");var n=new XMLHttpRequest;return n.open(t,e),n.send(),{then:function(e,t){void 0===t&&(t=function(){}),n.addEventListener("error",t),n.addEventListener("load",function(n){var r=n.target;r.status>=400?t(r):e(r.response)})}}}function t(e,t){var n=[],r={};return e.forEach(function(e){var i=e.level||1,a=i-1;i>t||(r[a]?(r[a].children=r[a].children||[],r[a].children.push(e)):n.push(e),r[i]=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 i(e,t){return t={exports:{}},e(t,t.exports),t.exports}function a(e){return e?(/\/\//.test(e)||(e="https://github.com/"+e),e=e.replace(/^git\+/,""),'\n \n \n '):""}function s(){return'
\n \n
\n
\n
\n
'}function o(e){return e?'':""}function l(e,t){return void 0===t&&(t=""),e&&e.length?(e.forEach(function(e){t+='
  • '+e.title+"
    • ",e.children&&(t+='
  • ")}),t):""}function u(){function e(){for(var e=0,t=n.length;e10){var o=r[i.id];if(!o)return;if(o===a)return;return a&&a.setAttribute("class",""),o.setAttribute("class","active"),void(a=o)}}}function t(){var e=window.location.hash.slice(1);if(e){var t=document.querySelector("#"+e);t&&t.scrollIntoView()}}if(!/mobile/i.test(navigator.userAgent)){for(var n=document.querySelectorAll(".anchor"),r={},i=document.querySelectorAll(".sidebar li"),a=null,s=0,o=i.length;s"):(e=l(t(v,n.maxLevel),"