chore: add changelog 4.6.9

[build] 4.6.9
fix: upgrade medium-zoom, fixed #417
2026-08-09 21:36:10 +10:00 · 2018-03-10 11:17:07 +08:00 · 2018-03-10 11:17:06 +08:00 · 2018-03-10 11:16:32 +08:00 · 2018-03-07 17:54:50 +08:00 · 2018-03-06 11:58:41 +08:00
27 changed files with 123 additions and 2392 deletions
@@ -1,3 +1,38 @@
+<a name="4.6.9"></a>
+## [4.6.9](https://github.com/QingWei-Li/docsify/compare/v4.6.8...v4.6.9) (2018-03-10)
+
+
+### Bug Fixes
+
+* upgrade medium-zoom, fixed [#417](https://github.com/QingWei-Li/docsify/issues/417) ([6a3d69a](https://github.com/QingWei-Li/docsify/commit/6a3d69a))
+
+
+
+<a name="4.6.8"></a>
+## [4.6.8](https://github.com/QingWei-Li/docsify/compare/v4.6.7...v4.6.8) (2018-03-06)
+
+
+### Bug Fixes
+
+* resolve path of image and embed files, fixed [#412](https://github.com/QingWei-Li/docsify/issues/412) ([bfd0d18](https://github.com/QingWei-Li/docsify/commit/bfd0d18))
+
+
+
+<a name="4.6.7"></a>
+## [4.6.7](https://github.com/QingWei-Li/docsify/compare/v4.6.6...v4.6.7) (2018-03-03)
+
+
+### Bug Fixes
+
+* layout css, fixed [#409](https://github.com/QingWei-Li/docsify/issues/409) ([aeb692e](https://github.com/QingWei-Li/docsify/commit/aeb692e))
+
+
+
+<a name="4.6.6"></a>
+## [4.6.6](https://github.com/QingWei-Li/docsify/compare/v4.6.5...v4.6.6) (2018-03-03)
+
+
+
 <a name="4.6.5"></a>
 ## [4.6.5](https://github.com/QingWei-Li/docsify/compare/v4.6.4...v4.6.5) (2018-03-03)

@@ -0,0 +1,12 @@
+const cssnano = require('cssnano').process
+const path = require('path')
+const fs = require('fs')
+
+files = fs.readdirSync(path.resolve('lib/themes'))
+
+files.forEach(file => {
+  file = path.resolve('lib/themes', file)
+  cssnano(fs.readFileSync(file)).then(result => {
+    fs.writeFileSync(file, result.css)
+  })
+})
@@ -1,6 +1,6 @@
 ![logo](_media/icon.svg)

-# docsify <small>4.6.5</small>
+# docsify <small>4.6.9</small>

 > A magical documentation site generator.

@@ -68,7 +68,7 @@ Du kannst untergeordnete Listen erstellen, indem du untergeordnete Punkte einem

 wird also wie folgt aussehen

-![Nesting navbar](_images/nested-navbar.png 'Nesting navbar')
+![Nesting navbar](../_images/nested-navbar.png 'Nesting navbar')

 ## Angepasste Navigationsleisten in Verbindung mit dem emoji Erweiterung

@@ -12,7 +12,7 @@ Du kannst folgende drei Orte verwenden, um die Dokumentation für dein Github re

 Es wird empfohlen, deine Dateien im `./docs` Unterordner im `master` branch deines repository zu speichern. Wechsle dann zu den Einstellungen deines repository und wähle `master branch /docs folder` als deine Github Pages Quelle.

-![github pages](_images/deploy-github-pages.png)
+![github pages](../_images/deploy-github-pages.png)

 !> Du kannst die Dateien auch im Hauptverzeichnis speichern und dann `master branch` in den Einstellungen auswählen.

@@ -6,14 +6,14 @@ You can embed these files as video, audio, iframes, or code blocks, and even Mar
 For example, here embedded a Markdown file. You only need to do this:

 ```markdown
-[filename](_media/example.md ':include')
+[filename](../_media/example.md ':include')
 ```

 Then the content of `example.md` will be displayed directly here

-[filename](_media/example.md ':include')
+[filename](../_media/example.md ':include')

-You can check the original content for [example.md](_media/example.md ':ignore').
+You can check the original content for [example.md](../_media/example.md ':ignore').

 Normally, this will compiled into a link, but in docsify, if you add `:include` it will be embedded.

@@ -32,12 +32,12 @@ This is a supported embedding type:
 Of course, you can force the specified. For example, you want to Markdown file as code block embedded.

 ```markdown
-[filename](_media/example.md ':include :type=code')
+[filename](../_media/example.md ':include :type=code')
 ```

 You will get it

-[filename](_media/example.md ':include :type=code')
+[filename](../_media/example.md ':include :type=code')

 ## Tag attribute

@@ -56,11 +56,11 @@ Did you see it? You only need to write directly. You can check [MDN](https://dev
 Embedding any type of source code file, you can specify the highlighted language or automatically identify.

 ```markdown
-[](_media/example.html ':include :type=code text')
+[](../_media/example.html ':include :type=code text')
 ```

 ⬇️

-[](_media/example.html ':include :type=code text')
+[](../_media/example.html ':include :type=code text')

 ?> How to set highlight? You can see [here](language-highlight.md).
@@ -1,6 +1,6 @@
 # Markdown Einstellungen

-**docsify** verwendet [marked](https://github.com/chjj/marked), um Markdown umzuwandeln. Du kannst einstellen, wie es deine Markdown Seiten in HTML umwandelt, indem du `renderer` konfigurierst:
+**docsify** verwendet [marked](https://github.com/markedjs/marked), um Markdown umzuwandeln. Du kannst einstellen, wie es deine Markdown Seiten in HTML umwandelt, indem du `renderer` konfigurierst:

 ```js
 window.$docsify = {
@@ -15,7 +15,7 @@ window.$docsify = {
 }
 ```

-?> Für mögliche Einstellungen, siehe [marked Dokumentation](https://github.com/chjj/marked#options-1)
+?> Für mögliche Einstellungen, siehe [marked Dokumentation](https://github.com/markedjs/marked#options-1)

 Du kannst die Regeln auch beliebig anpassen.

@@ -62,7 +62,7 @@

            return editHtml
              + html
-              + '\n----\n'
+              + '\n\n----\n\n'
              + '<a href="https://docsify.js.org" target="_blank" style="color: inherit; font-weight: normal; text-decoration: none;">Powered by docsify</a>'
          })
        }
@@ -61,4 +61,4 @@ _\_navbar.md_

 效果图

-![嵌套导航栏](_images/zh-cn/nested-navbar.png '嵌套导航栏')
+![嵌套导航栏](../_images/zh-cn/nested-navbar.png '嵌套导航栏')
@@ -11,7 +11,7 @@ GitHub Pages 支持从三个地方读取文件

 我们推荐直接将文档放在 `docs/` 目录下，在设置页面开启 **GitHub Pages** 功能并选择 `master branch /docs folder` 选项。

-![github pages](_images/deploy-github-pages.png)
+![github pages](../_images/deploy-github-pages.png)

 !> 可以将文档放在根目录下，然后选择 **master 分支** 作为文档目录。

@@ -5,14 +5,14 @@ docsify 4.6 开始支持嵌入任何类型的文件到文档里。你可以将
 这是一个嵌入 Markdown 文件的例子。

 ```markdown
-[filename](_media/example.md ':include')
+[filename](../_media/example.md ':include')
 ```

 `example.md` 文件的内容将会直接显示在这里

-[filename](_media/example.md ':include')
+[filename](../_media/example.md ':include')

-你可以查看 [example.md](_media/example.md ':ignore') 原始内容对比效果。
+你可以查看 [example.md](../_media/example.md ':ignore') 原始内容对比效果。

 通常情况下，这样的语法将会被当作链接处理。但是在 docsify 里，如果你添加一个 `:include` 选项，它就会被当作文件嵌入。

@@ -29,12 +29,12 @@ docsify 4.6 开始支持嵌入任何类型的文件到文档里。你可以将
 当然，你也可以强制设置嵌入类型。例如你想将 Markdown 文件当作一个 `code block` 嵌入。

 ```markdown
-[filename](_media/example.md ':include :type=code')
+[filename](../_media/example.md ':include :type=code')
 ```

 你将得到

-[filename](_media/example.md ':include :type=code')
+[filename](../_media/example.md ':include :type=code')

 ## 标签属性

@@ -53,11 +53,11 @@ docsify 4.6 开始支持嵌入任何类型的文件到文档里。你可以将
 如果是嵌入一个代码块，你可以设置高亮的语言，或者让它自动识别。这里是手动设置高亮语言

 ```markdown
-[](_media/example.html ':include :type=code text')
+[](../_media/example.html ':include :type=code text')
 ```

 ⬇️

-[](_media/example.html ':include :type=code text')
+[](../_media/example.html ':include :type=code text')

 ?> 如何高亮代码？你可以查看[这份文档](language-highlight.md).
@@ -1,6 +1,6 @@
 # Markdown 配置

-内置的 Markdown 解析器是 [marked](https://github.com/chjj/marked)，可以修改它的配置。同时可以直接配置 `renderer`。
+内置的 Markdown 解析器是 [marked](https://github.com/markedjs/marked)，可以修改它的配置。同时可以直接配置 `renderer`。

 ```js
 window.$docsify = {
@@ -15,7 +15,7 @@ window.$docsify = {
 }
 ```

-?> 完整配置参数参考 [marked 文档](https://github.com/chjj/marked#options-1)
+?> 完整配置参数参考 [marked 文档](https://github.com/markedjs/marked#options-1)

 当然也可以完全定制 Markdown 解析规则。

@@ -43,7 +43,7 @@

            return editHtml
              + html
-              + '\n----\n'
+              + '\n\n----\n\n'
              + 'Last modified {docsify-updated} '
              + editHtml
          })
@@ -3015,7 +3015,11 @@ Compiler.prototype.compileEmbed = function compileEmbed (href, title) {

  if (config.include) {
    if (!isAbsolutePath(href)) {
-      href = getPath(this.contentBase, href);
+      href = getPath(
+        this.contentBase,
+        getParentPath(this.router.getCurrentPath()),
+        href
+      );
    }

    var media;
@@ -3168,7 +3172,7 @@ Compiler.prototype._initRenderer = function _initRenderer () {
    }

    if (!isAbsolutePath(href)) {
-      url = getPath(contentBase, href);
+      url = getPath(contentBase, getParentPath(router.getCurrentPath()), href);
    }

    return ("<img src=\"" + url + "\"data-origin=\"" + href + "\" alt=\"" + text + "\"" + attrs + ">")
@@ -4569,7 +4573,7 @@ initGlobalAPI();
 /**
 * Version
 */
-Docsify.version = '4.6.5';
+Docsify.version = '4.6.9';

 /**
 * Run Docsify
@@ -1,6 +1,6 @@
 {
  "name": "docsify",
-  "version": "4.6.5",
+  "version": "4.6.9",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -555,7 +555,7 @@
      "dev": true,
      "requires": {
        "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000810",
+        "caniuse-db": "1.0.30000811",
        "normalize-range": "0.1.2",
        "num2fraction": "1.2.2",
        "postcss": "5.2.18",
@@ -765,7 +765,7 @@
      "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
      "dev": true,
      "requires": {
-        "caniuse-db": "1.0.30000810",
+        "caniuse-db": "1.0.30000811",
        "electron-to-chromium": "1.3.34"
      }
    },
@@ -903,15 +903,15 @@
      "dev": true,
      "requires": {
        "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000810",
+        "caniuse-db": "1.0.30000811",
        "lodash.memoize": "4.1.2",
        "lodash.uniq": "4.5.0"
      }
    },
    "caniuse-db": {
-      "version": "1.0.30000810",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000810.tgz",
-      "integrity": "sha1-vSWDDEHvq2Qzmi44H0lnc0PIRQk=",
+      "version": "1.0.30000811",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000811.tgz",
+      "integrity": "sha1-Ge+5I4OT1AB4Myw0SFyBjWQcQwU=",
      "dev": true
    },
    "caniuse-lite": {
@@ -1723,26 +1723,6 @@
        "postcss-zindex": "2.2.0"
      }
    },
-    "cssnano-cli": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/cssnano-cli/-/cssnano-cli-1.0.5.tgz",
-      "integrity": "sha1-mMYZsyfZCsrLQjArwMhPWS4oAfU=",
-      "dev": true,
-      "requires": {
-        "cssnano": "3.10.0",
-        "minimist": "1.2.0",
-        "read-file-stdin": "0.2.1",
-        "write-file-stdout": "0.0.2"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        }
-      }
-    },
    "csso": {
      "version": "2.3.2",
      "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz",
@@ -3409,12 +3389,6 @@
      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
      "dev": true
    },
-    "gather-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gather-stream/-/gather-stream-1.0.0.tgz",
-      "integrity": "sha1-szmUr0V6gRVwDUEPMXczy+egkEs=",
-      "dev": true
-    },
    "gauge": {
      "version": "2.7.4",
      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
@@ -5045,9 +5019,9 @@
      "dev": true
    },
    "medium-zoom": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/medium-zoom/-/medium-zoom-0.3.0.tgz",
-      "integrity": "sha512-26CJAykAcm1IYx2XjUB04dmZ7iRLtyTDKZSrm5kEqHJWVMo7pafUZEPcRGvYCNWW4f1utlEOzbtbaOvwNg7g1g=="
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/medium-zoom/-/medium-zoom-0.4.0.tgz",
+      "integrity": "sha512-0z7yMfd6I1BTCAa8QaR4cp5AqDkQD571GzhHIbbfefKEssGLSvs+4Xai/itOAncm4FBlF5gUoMQ22yW9/f8Sig=="
    },
    "mem": {
      "version": "1.1.0",
@@ -6480,15 +6454,6 @@
        "graceful-fs": "4.1.11"
      }
    },
-    "read-file-stdin": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/read-file-stdin/-/read-file-stdin-0.2.1.tgz",
-      "integrity": "sha1-JezP86FTtoCa+ssj7hU4fbng7mE=",
-      "dev": true,
-      "requires": {
-        "gather-stream": "1.0.0"
-      }
-    },
    "read-pkg": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
@@ -8245,12 +8210,6 @@
        "signal-exit": "3.0.2"
      }
    },
-    "write-file-stdout": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/write-file-stdout/-/write-file-stdout-0.0.2.tgz",
-      "integrity": "sha1-wlLXx8WxtAKJdjDjRTx7/mkNnKE=",
-      "dev": true
-    },
    "write-json-file": {
      "version": "2.3.0",
      "resolved": "https://registry.npmjs.org/write-json-file/-/write-json-file-2.3.0.tgz",
@@ -1,6 +1,6 @@
 {
  "name": "docsify",
-  "version": "4.6.5",
+  "version": "4.6.9",
  "description": "A magical documentation generator.",
  "author": {
    "name": "qingwei-li",
@@ -30,7 +30,7 @@
    "css": "stylus src/themes/*.styl -u autoprefixer-stylus",
    "watch:css": "run-p 'css -- -o themes -w'",
    "watch:js": "node build/build.js",
-    "build:css:min": "mkdir lib/themes && run-p 'css -- -o lib/themes' && cssnano lib/themes/*",
+    "build:css:min": "mkdir lib/themes && run-p 'css -- -o lib/themes' && node build/mincss.js",
    "build:css": "mkdir themes && run-p 'css --  -o themes'",
    "build:js": "cross-env NODE_ENV=production node build/build.js",
    "build:ssr": "node build/ssr.js",
@@ -42,7 +42,7 @@
  },
  "dependencies": {
    "marked": "^0.3.12",
-    "medium-zoom": "^0.3.0",
+    "medium-zoom": "^0.4.0",
    "opencollective": "^1.0.3",
    "prismjs": "^1.9.0",
    "tinydate": "^1.0.0",
@@ -53,7 +53,7 @@
    "chokidar": "^2.0.2",
    "conventional-changelog-cli": "^1.3.5",
    "cross-env": "^5.1.3",
-    "cssnano-cli": "^1.0.5",
+    "cssnano": "^3.10.0",
    "eslint": "^4.14.0",
    "eslint-config-xo-space": "^0.18.0",
    "lerna": "^2.5.1",
@@ -37,5 +37,5 @@
      "integrity": "sha1-6DWIAbhrg7F1YNTjw4LXrvIQCUQ="
    }
  },
-  "version": "4.6.5"
+  "version": "4.6.9"
 }
@@ -1,6 +1,6 @@
 {
  "name": "docsify-server-renderer",
-  "version": "4.6.5",
+  "version": "4.6.9",
  "description": "docsify server renderer",
  "author": {
    "name": "qingwei-li",
@@ -4,7 +4,7 @@ import {helper as helperTpl, tree as treeTpl} from './tpl'
 import {genTree} from './gen-tree'
 import {slugify} from './slugify'
 import {emojify} from './emojify'
-import {isAbsolutePath, getPath} from '../router/util'
+import {isAbsolutePath, getPath, getParentPath} from '../router/util'
 import {isFn, merge, cached, isPrimitive} from '../util/core'

 const cachedLinks = {}
@@ -112,7 +112,11 @@ export class Compiler {

    if (config.include) {
      if (!isAbsolutePath(href)) {
-        href = getPath(process.env.SSR ? '' : this.contentBase, href)
+        href = getPath(
+          process.env.SSR ? '' : this.contentBase,
+          getParentPath(this.router.getCurrentPath()),
+          href
+        )
      }

      let media
@@ -254,7 +258,7 @@ export class Compiler {
      }

      if (!isAbsolutePath(href)) {
-        url = getPath(contentBase, href)
+        url = getPath(contentBase, getParentPath(router.getCurrentPath()), href)
      }

      return `<img src="${url}"data-origin="${href}" alt="${text}"${attrs}>`
@@ -388,7 +388,7 @@ body.sticky

 body.close
  .sidebar
-    transform translateX(-$sidebar-width)
+    transform translateX(- $sidebar-width)

  .sidebar-toggle
    width auto
@@ -415,7 +415,7 @@ body.close
    overflow-x hidden

  .sidebar
-    left -$sidebar-width
+    left - $sidebar-width
    transition transform 250ms ease-out

  .content
Author	SHA1	Message	Date
qingwei.li	4cd0e5eb49	chore: add changelog 4.6.9	2018-03-10 11:17:07 +08:00
qingwei.li	531e483c31	[build] 4.6.9	2018-03-10 11:17:06 +08:00
qingwei.li	6a3d69ae1a	fix: upgrade medium-zoom, fixed #417	2018-03-10 11:16:32 +08:00
qingwei.li	ef1b42be23	chore: fix index.html	2018-03-07 17:54:50 +08:00
qingwei.li	54f45ecb0a	chore: add changelog 4.6.8	2018-03-06 11:58:41 +08:00
qingwei.li	4c91fbc7cb	[build] 4.6.8	2018-03-06 11:58:40 +08:00
qingwei.li	bfd0d18e48	fix: resolve path of image and embed files, fixed #412	2018-03-06 11:57:48 +08:00
Stevenandcinwell.li	74ff68a40e	Update url to markedjs (#410 ) * Update markdown.md * Update markdown.md * Update markdown.md	2018-03-04 07:35:01 +08:00
qingwei.li	e737a42f75	chore: add changelog 4.6.7	2018-03-03 23:29:17 +08:00
qingwei.li	a850b29545	[build] 4.6.7	2018-03-03 23:29:16 +08:00
qingwei.li	aeb692ed6b	fix: layout css, fixed #409	2018-03-03 23:28:33 +08:00
qingwei.li	01140ceb54	chore: add changelog 4.6.6	2018-03-03 23:21:12 +08:00
qingwei.li	87129c0fb2	[build] 4.6.6	2018-03-03 23:21:11 +08:00
qingwei.li	95e95bd23b	chore: remove fuck cssnano-cli	2018-03-03 23:20:07 +08:00