Merge branch 'master' of github.com:qingwei-li/docsify

QingWei-Li · QingWei-Li · commit b8a96b867be4 · 2017-07-26T08:37:02.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="4.2.2"></a>
+## [4.2.2](https://github.com/QingWei-Li/docsify/compare/v4.2.1...v4.2.2) (2017-07-24)
+
+
+### Bug Fixes
+
+* style rerender due to setting themeColor ([17ff3d1](https://github.com/QingWei-Li/docsify/commit/17ff3d1))
+
+
+
 <a name="4.2.1"></a>
 ## [4.2.1](https://github.com/QingWei-Li/docsify/compare/v4.2.0...v4.2.1) (2017-07-19)
 
diff --git a/README.md b/README.md
@@ -73,6 +73,7 @@ These projects are using docsify to generate their sites. Pull requests welcome
 | [samlify](https://samlify.js.org) | Node.js SAML2 library |
 | [palettify](https://dobromir-hristov.github.io/palettify/) | A color palette effects assistant |
 | [commitlint](https://marionebl.github.io/commitlint/) | Lint commit messages |
+| [vue-data-tables](https://github.com/njleonzhang/vue-data-tables/) | A simple and customizable data table，based on vue2 and element-ui. |
 
 ## Similar projects
 
diff --git a/build/release.sh b/build/release.sh
@@ -33,7 +33,7 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then
   npm version $VERSION --message "[release] $VERSION $RELEASE_TAG"
 
   # changelog
-  node_modules/.bin/conventional-changelog -p angular -i CHANGELOG.md -s
+  node_modules/.bin/conventional-changelog -p angular -i CHANGELOG.md -s -r 2
 
   git add .
   git commit -m "chore: add changelog $VERSION"
diff --git a/docs/_coverpage.md b/docs/_coverpage.md
@@ -1,6 +1,6 @@
 ![logo](_media/icon.svg)
 
-# docsify <small>4.2.1</small>
+# docsify <small>4.2.2</small>
 
 > A magical documentation site generator.
 
diff --git a/lib/docsify.js b/lib/docsify.js
@@ -3318,7 +3318,9 @@ function initRender (vm) {
   before(navAppendToTarget, navEl);
 
   if (config.themeColor) {
-    $.head.innerHTML += theme(config.themeColor);
+    $.head.appendChild(
+      create('div', theme(config.themeColor)).getRootNode()
+    );
     // Polyfll
     cssVars(config.themeColor);
   }
@@ -3800,7 +3802,7 @@ initGlobalAPI();
 /**
  * Version
  */
-Docsify.version = '4.2.1';
+Docsify.version = '4.2.2';
 
 /**
  * Run Docsify
diff --git a/lib/docsify.min.js b/lib/docsify.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "docsify",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "description": "A magical documentation generator.",
   "author": {
     "name": "qingwei-li",
diff --git a/packages/docsify-server-renderer/package-lock.json b/packages/docsify-server-renderer/package-lock.json
diff --git a/packages/docsify-server-renderer/package.json b/packages/docsify-server-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "docsify-server-renderer",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "description": "docsify server renderer",
   "author": {
     "name": "qingwei-li",
diff --git a/src/core/render/index.js b/src/core/render/index.js
@@ -211,7 +211,9 @@ export function initRender (vm) {
   dom.before(navAppendToTarget, navEl)
 
   if (config.themeColor) {
-    dom.$.head.innerHTML += tpl.theme(config.themeColor)
+    dom.$.head.appendChild(
+      dom.create('div', tpl.theme(config.themeColor)).getRootNode()
+    )
     // Polyfll
     cssVars(config.themeColor)
   }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "docsify",`
`3`		`- "version": "4.2.1",`
	`3`	`+ "version": "4.2.2",`
`4`	`4`	`"description": "A magical documentation generator.",`
`5`	`5`	`"author": {`
`6`	`6`	`"name": "qingwei-li",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "docsify-server-renderer",`
`3`		`- "version": "4.2.1",`
	`3`	`+ "version": "4.2.2",`
`4`	`4`	`"description": "docsify server renderer",`
`5`	`5`	`"author": {`
`6`	`6`	`"name": "qingwei-li",`