bump: 3.6.0

Author: QingWei-Li

CHANGELOG.md

@@ -1,3 +1,8 @@
+
+# 3.6.0 / 2017-04-09
+
+  * feat(render): add mergeNavbar option, close ([#125](https://github.com/QingWei-Li/docsify/issues/125)
+
 # 3.5.2/ 2017-04-05
 
   * add optional current route param to toURL and use it to properly compose local anchor links

docs/_coverpage.md

@@ -1,6 +1,6 @@
 ![logo](_media/icon.svg)
 
-# docsify <small>3.5</small>
+# docsify <small>3.6</small>
 
 > A magical documentation site generator.
 

lib/docsify.js

@@ -76,7 +76,8 @@ var config = merge({
   autoHeader: false,
   executeScript: null,
   noEmoji: false,
-  ga: ''
+  ga: '',
+  mergeNavbar: false
 }, window.$docsify);
 
 var script = document.currentScript ||
@@ -3263,12 +3264,8 @@ function initRender (vm) {
 
   var el = find(id);
   var html = '';
+  var navAppendToTarget = body;
 
-  navEl.classList.add('app-nav');
-
-  if (!config.repo) {
-    navEl.classList.add('no-badge');
-  }
   if (!el) {
     el = create(id);
     appendTo(body, el);
@@ -3283,8 +3280,19 @@ function initRender (vm) {
   html += main(config);
   // Render main app
   vm._renderTo(el, html, true);
+
+  if (config.mergeNavbar && isMobile) {
+    navAppendToTarget = find('.sidebar');
+  } else {
+    navEl.classList.add('app-nav');
+
+    if (!config.repo) {
+      navEl.classList.add('no-badge');
+    }
+  }
+
   // Add nav
-  before(body, navEl);
+  before(navAppendToTarget, navEl);
 
   if (config.themeColor) {
     $.head.innerHTML += theme(config.themeColor);