From 282b177e6f829132d1660f6f3d7c352e63134cd2 Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Mon, 8 Jul 2019 01:41:04 +0800
Subject: [PATCH 1/7] Sidebar position

---
 _config.yml                                   |  2 +-
 source/css/_schemes/Mist/index.styl           |  3 +-
 .../Mist/sidebar/sidebar-blogroll.styl        |  1 -
 source/css/_schemes/Muse/index.styl           |  1 +
 .../css/_schemes/Muse/sidebar/_sidebar.styl   | 10 ++++++
 source/js/motion.js                           | 36 ++++++++++++++++---
 6 files changed, 45 insertions(+), 8 deletions(-)
 delete mode 100644 source/css/_schemes/Mist/sidebar/sidebar-blogroll.styl
 create mode 100644 source/css/_schemes/Muse/sidebar/_sidebar.styl

diff --git a/_config.yml b/_config.yml
index 85f42fd03b..a06ae8ef34 100644
--- a/_config.yml
+++ b/_config.yml
@@ -248,7 +248,7 @@ toc:
   max_depth: 6
 
 sidebar:
-  # Sidebar Position, available values: left | right (only for Pisces | Gemini).
+  # Sidebar Position, available values: left | right.
   position: left
   #position: right
 
diff --git a/source/css/_schemes/Mist/index.styl b/source/css/_schemes/Mist/index.styl
index 9729c9439b..fb479f70f6 100644
--- a/source/css/_schemes/Mist/index.styl
+++ b/source/css/_schemes/Mist/index.styl
@@ -9,7 +9,8 @@
 @import "_menu";
 @import "_search.styl";
 @import "_posts-expanded";
-@import "sidebar/sidebar-blogroll";
+@import "../Muse/sidebar/_sidebar";
+@import "../Muse/sidebar/sidebar-blogroll";
 
 // Components
 // --------------------------------------------------
diff --git a/source/css/_schemes/Mist/sidebar/sidebar-blogroll.styl b/source/css/_schemes/Mist/sidebar/sidebar-blogroll.styl
deleted file mode 100644
index 6db1ed79ba..0000000000
--- a/source/css/_schemes/Mist/sidebar/sidebar-blogroll.styl
+++ /dev/null
@@ -1 +0,0 @@
-.links-of-blogroll-inline .links-of-blogroll-item { display: inline-block; }
diff --git a/source/css/_schemes/Muse/index.styl b/source/css/_schemes/Muse/index.styl
index 35effe878d..3710d0ddeb 100644
--- a/source/css/_schemes/Muse/index.styl
+++ b/source/css/_schemes/Muse/index.styl
@@ -2,4 +2,5 @@
 @import "_logo.styl";
 @import "_menu.styl";
 @import "_search.styl";
+@import "sidebar/_sidebar";
 @import "sidebar/sidebar-blogroll";
diff --git a/source/css/_schemes/Muse/sidebar/_sidebar.styl b/source/css/_schemes/Muse/sidebar/_sidebar.styl
new file mode 100644
index 0000000000..fa8d87d9e0
--- /dev/null
+++ b/source/css/_schemes/Muse/sidebar/_sidebar.styl
@@ -0,0 +1,10 @@
+if (hexo-config('sidebar.position') == 'left') {
+  .sidebar {
+    right: auto;
+    left: 0;
+  }
+  .sidebar-toggle {
+    right: auto;
+    left: 50px;
+  }
+}
diff --git a/source/js/motion.js b/source/js/motion.js
index 57a039ba49..71d98bcb30 100644
--- a/source/js/motion.js
+++ b/source/js/motion.js
@@ -51,26 +51,52 @@ $(document).ready(function() {
     this.el.velocity('stop').velocity(this.status[status]);
   };
 
-  var sidebarToggleLine1st = new SidebarToggleLine({
+  var isRight = ((NexT.utils.isMist() || NexT.utils.isMuse()) && (CONFIG.sidebar.position != 'left'));
+
+  var sidebarToggleLine1st = isRight
+  ? new SidebarToggleLine({
     el    : '.sidebar-toggle-line-first',
     status: {
       arrow: {width: '50%', rotateZ: '-45deg', top: '2px'},
       close: {width: '100%', rotateZ: '-45deg', top: '5px'}
     }
+  })
+  : new SidebarToggleLine({
+    el: '.sidebar-toggle-line-first',
+    status: {
+      arrow: {width: '50%', rotateZ: '45deg', top: '2px', left: '50%'},
+      close: {width: '100%', rotateZ: '-45deg', top: '5px', left: '0px'}
+    }
   });
-  var sidebarToggleLine2nd = new SidebarToggleLine({
+  var sidebarToggleLine2nd = isRight
+  ? new SidebarToggleLine({
     el    : '.sidebar-toggle-line-middle',
     status: {
       arrow: {width: '90%'},
       close: {opacity: 0}
     }
+  })
+  : new SidebarToggleLine({
+    el     : '.sidebar-toggle-line-middle',
+    status : {
+      arrow: {width: '90%', left: '2px'},
+      close: {opacity: 0, left: '0px'}
+    }
   });
-  var sidebarToggleLine3rd = new SidebarToggleLine({
+  var sidebarToggleLine3rd = isRight
+  ? new SidebarToggleLine({
     el    : '.sidebar-toggle-line-last',
     status: {
       arrow: {width: '50%', rotateZ: '45deg', top: '-2px'},
       close: {width: '100%', rotateZ: '45deg', top: '-5px'}
     }
+  })
+  : new SidebarToggleLine({
+    el    : '.sidebar-toggle-line-last',
+    status: {
+      arrow: {width: '50%', rotateZ: '-45deg', top: '-2px', left: '50%'},
+      close: {width: '100%', rotateZ: '45deg', top: '-5px', left: '0px'}
+    }
   });
 
   sidebarToggleLines.push(sidebarToggleLine1st);
@@ -98,7 +124,7 @@ $(document).ready(function() {
       $(document)
         .on('sidebar.isShowing', function() {
           NexT.utils.isDesktop() && $('body').velocity('stop').velocity(
-            {paddingRight: SIDEBAR_WIDTH},
+            isRight ? {paddingRight: SIDEBAR_WIDTH} : {paddingLeft: SIDEBAR_WIDTH},
             SIDEBAR_DISPLAY_DURATION
           );
         })
@@ -169,7 +195,7 @@ $(document).ready(function() {
       this.sidebarEl.trigger('sidebar.isShowing');
     },
     hideSidebar: function() {
-      NexT.utils.isDesktop() && $('body').velocity('stop').velocity({paddingRight: 0});
+      NexT.utils.isDesktop() && $('body').velocity('stop').velocity(isRight ? {paddingRight: 0} : {paddingLeft: 0});
       this.sidebarEl.find('.motion-element').velocity('stop').css('display', 'none');
       this.sidebarEl.velocity('stop').velocity({width: 0}, {display: 'none'});
 

From 560b5ec21c15bd94896936218b5db769c9f3f127 Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Mon, 8 Jul 2019 01:48:51 +0800
Subject: [PATCH 2/7] Indentation

---
 source/js/motion.js | 86 ++++++++++++++++++++++-----------------------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/source/js/motion.js b/source/js/motion.js
index 71d98bcb30..f5f21123b7 100644
--- a/source/js/motion.js
+++ b/source/js/motion.js
@@ -51,53 +51,53 @@ $(document).ready(function() {
     this.el.velocity('stop').velocity(this.status[status]);
   };
 
-  var isRight = ((NexT.utils.isMist() || NexT.utils.isMuse()) && (CONFIG.sidebar.position != 'left'));
+  var isRight = ((NexT.utils.isMist() || NexT.utils.isMuse()) && (CONFIG.sidebar.position !== 'left'));
 
   var sidebarToggleLine1st = isRight
-  ? new SidebarToggleLine({
-    el    : '.sidebar-toggle-line-first',
-    status: {
-      arrow: {width: '50%', rotateZ: '-45deg', top: '2px'},
-      close: {width: '100%', rotateZ: '-45deg', top: '5px'}
-    }
-  })
-  : new SidebarToggleLine({
-    el: '.sidebar-toggle-line-first',
-    status: {
-      arrow: {width: '50%', rotateZ: '45deg', top: '2px', left: '50%'},
-      close: {width: '100%', rotateZ: '-45deg', top: '5px', left: '0px'}
-    }
-  });
+    ? new SidebarToggleLine({
+      el    : '.sidebar-toggle-line-first',
+      status: {
+        arrow: {width: '50%', rotateZ: '-45deg', top: '2px'},
+        close: {width: '100%', rotateZ: '-45deg', top: '5px'}
+      }
+    })
+    : new SidebarToggleLine({
+      el: '.sidebar-toggle-line-first',
+      status: {
+        arrow: {width: '50%', rotateZ: '45deg', top: '2px', left: '50%'},
+        close: {width: '100%', rotateZ: '-45deg', top: '5px', left: '0px'}
+      }
+    });
   var sidebarToggleLine2nd = isRight
-  ? new SidebarToggleLine({
-    el    : '.sidebar-toggle-line-middle',
-    status: {
-      arrow: {width: '90%'},
-      close: {opacity: 0}
-    }
-  })
-  : new SidebarToggleLine({
-    el     : '.sidebar-toggle-line-middle',
-    status : {
-      arrow: {width: '90%', left: '2px'},
-      close: {opacity: 0, left: '0px'}
-    }
-  });
+    ? new SidebarToggleLine({
+      el    : '.sidebar-toggle-line-middle',
+      status: {
+        arrow: {width: '90%'},
+        close: {opacity: 0}
+      }
+    })
+    : new SidebarToggleLine({
+      el     : '.sidebar-toggle-line-middle',
+      status : {
+        arrow: {width: '90%', left: '2px'},
+        close: {opacity: 0, left: '0px'}
+      }
+    });
   var sidebarToggleLine3rd = isRight
-  ? new SidebarToggleLine({
-    el    : '.sidebar-toggle-line-last',
-    status: {
-      arrow: {width: '50%', rotateZ: '45deg', top: '-2px'},
-      close: {width: '100%', rotateZ: '45deg', top: '-5px'}
-    }
-  })
-  : new SidebarToggleLine({
-    el    : '.sidebar-toggle-line-last',
-    status: {
-      arrow: {width: '50%', rotateZ: '-45deg', top: '-2px', left: '50%'},
-      close: {width: '100%', rotateZ: '45deg', top: '-5px', left: '0px'}
-    }
-  });
+    ? new SidebarToggleLine({
+      el    : '.sidebar-toggle-line-last',
+      status: {
+        arrow: {width: '50%', rotateZ: '45deg', top: '-2px'},
+        close: {width: '100%', rotateZ: '45deg', top: '-5px'}
+      }
+    })
+    : new SidebarToggleLine({
+      el    : '.sidebar-toggle-line-last',
+      status: {
+        arrow: {width: '50%', rotateZ: '-45deg', top: '-2px', left: '50%'},
+        close: {width: '100%', rotateZ: '45deg', top: '-5px', left: '0px'}
+      }
+    });
 
   sidebarToggleLines.push(sidebarToggleLine1st);
   sidebarToggleLines.push(sidebarToggleLine2nd);

From 1f2ce4bc09805f9d498106bdfcfb746a7313a945 Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Mon, 8 Jul 2019 06:10:47 +0800
Subject: [PATCH 3/7] motion.js -> muse.js

---
 source/js/motion.js       | 213 -------------------------------------
 source/js/schemes/muse.js | 214 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 214 insertions(+), 213 deletions(-)

diff --git a/source/js/motion.js b/source/js/motion.js
index f5f21123b7..e6124f5acb 100644
--- a/source/js/motion.js
+++ b/source/js/motion.js
@@ -3,219 +3,6 @@
 $(document).ready(function() {
   NexT.motion = {};
 
-  var sidebarToggleLines = {
-    lines: [],
-    push : function(line) {
-      this.lines.push(line);
-    },
-    init: function() {
-      this.lines.forEach(function(line) {
-        line.init();
-      });
-    },
-    arrow: function() {
-      this.lines.forEach(function(line) {
-        line.arrow();
-      });
-    },
-    close: function() {
-      this.lines.forEach(function(line) {
-        line.close();
-      });
-    }
-  };
-
-  function SidebarToggleLine(settings) {
-    this.el = $(settings.el);
-    this.status = $.extend({}, {
-      init: {
-        width  : '100%',
-        opacity: 1,
-        left   : 0,
-        rotateZ: 0,
-        top    : 0
-      }
-    }, settings.status);
-  }
-
-  SidebarToggleLine.prototype.init = function() {
-    this.transform('init');
-  };
-  SidebarToggleLine.prototype.arrow = function() {
-    this.transform('arrow');
-  };
-  SidebarToggleLine.prototype.close = function() {
-    this.transform('close');
-  };
-  SidebarToggleLine.prototype.transform = function(status) {
-    this.el.velocity('stop').velocity(this.status[status]);
-  };
-
-  var isRight = ((NexT.utils.isMist() || NexT.utils.isMuse()) && (CONFIG.sidebar.position !== 'left'));
-
-  var sidebarToggleLine1st = isRight
-    ? new SidebarToggleLine({
-      el    : '.sidebar-toggle-line-first',
-      status: {
-        arrow: {width: '50%', rotateZ: '-45deg', top: '2px'},
-        close: {width: '100%', rotateZ: '-45deg', top: '5px'}
-      }
-    })
-    : new SidebarToggleLine({
-      el: '.sidebar-toggle-line-first',
-      status: {
-        arrow: {width: '50%', rotateZ: '45deg', top: '2px', left: '50%'},
-        close: {width: '100%', rotateZ: '-45deg', top: '5px', left: '0px'}
-      }
-    });
-  var sidebarToggleLine2nd = isRight
-    ? new SidebarToggleLine({
-      el    : '.sidebar-toggle-line-middle',
-      status: {
-        arrow: {width: '90%'},
-        close: {opacity: 0}
-      }
-    })
-    : new SidebarToggleLine({
-      el     : '.sidebar-toggle-line-middle',
-      status : {
-        arrow: {width: '90%', left: '2px'},
-        close: {opacity: 0, left: '0px'}
-      }
-    });
-  var sidebarToggleLine3rd = isRight
-    ? new SidebarToggleLine({
-      el    : '.sidebar-toggle-line-last',
-      status: {
-        arrow: {width: '50%', rotateZ: '45deg', top: '-2px'},
-        close: {width: '100%', rotateZ: '45deg', top: '-5px'}
-      }
-    })
-    : new SidebarToggleLine({
-      el    : '.sidebar-toggle-line-last',
-      status: {
-        arrow: {width: '50%', rotateZ: '-45deg', top: '-2px', left: '50%'},
-        close: {width: '100%', rotateZ: '45deg', top: '-5px', left: '0px'}
-      }
-    });
-
-  sidebarToggleLines.push(sidebarToggleLine1st);
-  sidebarToggleLines.push(sidebarToggleLine2nd);
-  sidebarToggleLines.push(sidebarToggleLine3rd);
-
-  var SIDEBAR_WIDTH = CONFIG.sidebar.width ? CONFIG.sidebar.width : '320px';
-  var SIDEBAR_DISPLAY_DURATION = 200;
-  var xPos, yPos;
-
-  var sidebarToggleMotion = {
-    toggleEl        : $('.sidebar-toggle'),
-    dimmerEl        : $('#sidebar-dimmer'),
-    sidebarEl       : $('.sidebar'),
-    isSidebarVisible: false,
-    init            : function() {
-      this.toggleEl.on('click', this.clickHandler.bind(this));
-      this.dimmerEl.on('click', this.clickHandler.bind(this));
-      this.toggleEl.on('mouseenter', this.mouseEnterHandler.bind(this));
-      this.toggleEl.on('mouseleave', this.mouseLeaveHandler.bind(this));
-      this.sidebarEl.on('touchstart', this.touchstartHandler.bind(this));
-      this.sidebarEl.on('touchend', this.touchendHandler.bind(this));
-      this.sidebarEl.on('touchmove', function(e) { e.preventDefault(); });
-
-      $(document)
-        .on('sidebar.isShowing', function() {
-          NexT.utils.isDesktop() && $('body').velocity('stop').velocity(
-            isRight ? {paddingRight: SIDEBAR_WIDTH} : {paddingLeft: SIDEBAR_WIDTH},
-            SIDEBAR_DISPLAY_DURATION
-          );
-        })
-        .on('sidebar.isHiding', function() {
-        });
-    },
-    clickHandler: function() {
-      this.isSidebarVisible ? this.hideSidebar() : this.showSidebar();
-      this.isSidebarVisible = !this.isSidebarVisible;
-    },
-    mouseEnterHandler: function() {
-      if (this.isSidebarVisible) {
-        return;
-      }
-      sidebarToggleLines.arrow();
-    },
-    mouseLeaveHandler: function() {
-      if (this.isSidebarVisible) {
-        return;
-      }
-      sidebarToggleLines.init();
-    },
-    touchstartHandler: function(e) {
-      xPos = e.originalEvent.touches[0].clientX;
-      yPos = e.originalEvent.touches[0].clientY;
-    },
-    touchendHandler: function(e) {
-      var _xPos = e.originalEvent.changedTouches[0].clientX;
-      var _yPos = e.originalEvent.changedTouches[0].clientY;
-      if (_xPos - xPos > 30 && Math.abs(_yPos - yPos) < 20) {
-        this.clickHandler();
-      }
-    },
-    showSidebar: function() {
-      var self = this;
-
-      sidebarToggleLines.close();
-
-      this.sidebarEl.velocity('stop').velocity({
-        width: SIDEBAR_WIDTH
-      }, {
-        display : 'block',
-        duration: SIDEBAR_DISPLAY_DURATION,
-        begin   : function() {
-          $('.sidebar .motion-element').not('.site-state').velocity(
-            'transition.slideRightIn', {
-              stagger : 50,
-              drag    : true,
-              complete: function() {
-                self.sidebarEl.trigger('sidebar.motion.complete');
-              }
-            }
-          );
-          $('.site-state').velocity(
-            'transition.slideRightIn', {
-              stagger : 50,
-              drag    : true,
-              display : 'flex'
-            }
-          );
-        },
-        complete: function() {
-          self.sidebarEl.addClass('sidebar-active');
-          self.sidebarEl.trigger('sidebar.didShow');
-        }
-      });
-
-      this.sidebarEl.trigger('sidebar.isShowing');
-    },
-    hideSidebar: function() {
-      NexT.utils.isDesktop() && $('body').velocity('stop').velocity(isRight ? {paddingRight: 0} : {paddingLeft: 0});
-      this.sidebarEl.find('.motion-element').velocity('stop').css('display', 'none');
-      this.sidebarEl.velocity('stop').velocity({width: 0}, {display: 'none'});
-
-      sidebarToggleLines.init();
-
-      this.sidebarEl.removeClass('sidebar-active');
-      this.sidebarEl.trigger('sidebar.isHiding');
-
-      // Prevent adding TOC to Overview if Overview was selected when close & open sidebar.
-      if ($('.post-toc-wrap')) {
-        if ($('.site-overview-wrap').css('display') === 'block') {
-          $('.post-toc-wrap').removeClass('motion-element');
-        } else {
-          $('.post-toc-wrap').addClass('motion-element');
-        }
-      }
-    }
-  };
-  sidebarToggleMotion.init();
-
   NexT.motion.integrator = {
     queue : [],
     cursor: -1,
diff --git a/source/js/schemes/muse.js b/source/js/schemes/muse.js
index a0e2c5662f..7a015d72b0 100644
--- a/source/js/schemes/muse.js
+++ b/source/js/schemes/muse.js
@@ -1,9 +1,223 @@
+/* global NexT, CONFIG */
+
 $(document).ready(function() {
+
+  var sidebarToggleLines = {
+    lines: [],
+    push: function(line) {
+      this.lines.push(line);
+    },
+    init: function() {
+      this.lines.forEach(function(line) {
+        line.init();
+      });
+    },
+    arrow: function() {
+      this.lines.forEach(function(line) {
+        line.arrow();
+      });
+    },
+    close: function() {
+      this.lines.forEach(function(line) {
+        line.close();
+      });
+    }
+  };
+
+  function SidebarToggleLine(settings) {
+    this.el = $(settings.el);
+    this.status = $.extend({}, {
+      init: {
+        width  : '100%',
+        opacity: 1,
+        left   : 0,
+        rotateZ: 0,
+        top    : 0
+      }
+    }, settings.status);
+    this.init = function() {
+      this.transform('init');
+    };
+    this.arrow = function() {
+      this.transform('arrow');
+    };
+    this.close = function() {
+      this.transform('close');
+    };
+    this.transform = function(status) {
+      this.el.velocity('stop').velocity(this.status[status]);
+    };
+  }
+
+  var isRight = CONFIG.sidebar.position !== 'left';
+
+  var sidebarToggleLine1st = isRight
+    ? new SidebarToggleLine({
+      el    : '.sidebar-toggle-line-first',
+      status: {
+        arrow: {width: '50%', rotateZ: '-45deg', top: '2px'},
+        close: {width: '100%', rotateZ: '-45deg', top: '5px'}
+      }
+    })
+    : new SidebarToggleLine({
+      el: '.sidebar-toggle-line-first',
+      status: {
+        arrow: {width: '50%', rotateZ: '45deg', top: '2px', left: '50%'},
+        close: {width: '100%', rotateZ: '-45deg', top: '5px', left: '0px'}
+      }
+    });
+  var sidebarToggleLine2nd = isRight
+    ? new SidebarToggleLine({
+      el    : '.sidebar-toggle-line-middle',
+      status: {
+        arrow: {width: '90%'},
+        close: {opacity: 0}
+      }
+    })
+    : new SidebarToggleLine({
+      el     : '.sidebar-toggle-line-middle',
+      status : {
+        arrow: {width: '90%', left: '2px'},
+        close: {opacity: 0, left: '0px'}
+      }
+    });
+  var sidebarToggleLine3rd = isRight
+    ? new SidebarToggleLine({
+      el    : '.sidebar-toggle-line-last',
+      status: {
+        arrow: {width: '50%', rotateZ: '45deg', top: '-2px'},
+        close: {width: '100%', rotateZ: '45deg', top: '-5px'}
+      }
+    })
+    : new SidebarToggleLine({
+      el    : '.sidebar-toggle-line-last',
+      status: {
+        arrow: {width: '50%', rotateZ: '-45deg', top: '-2px', left: '50%'},
+        close: {width: '100%', rotateZ: '45deg', top: '-5px', left: '0px'}
+      }
+    });
+
+  sidebarToggleLines.push(sidebarToggleLine1st);
+  sidebarToggleLines.push(sidebarToggleLine2nd);
+  sidebarToggleLines.push(sidebarToggleLine3rd);
+
+  var SIDEBAR_WIDTH = CONFIG.sidebar.width ? CONFIG.sidebar.width : '320px';
+  var SIDEBAR_DISPLAY_DURATION = 200;
+  var xPos, yPos;
+
+  var sidebarToggleMotion = {
+    toggleEl        : $('.sidebar-toggle'),
+    dimmerEl        : $('#sidebar-dimmer'),
+    sidebarEl       : $('.sidebar'),
+    isSidebarVisible: false,
+    init            : function() {
+      this.toggleEl.on('click', this.clickHandler.bind(this));
+      this.dimmerEl.on('click', this.clickHandler.bind(this));
+      this.toggleEl.on('mouseenter', this.mouseEnterHandler.bind(this));
+      this.toggleEl.on('mouseleave', this.mouseLeaveHandler.bind(this));
+      this.sidebarEl.on('touchstart', this.touchstartHandler.bind(this));
+      this.sidebarEl.on('touchend', this.touchendHandler.bind(this));
+      this.sidebarEl.on('touchmove', function(e) { e.preventDefault(); });
+
+      $(document)
+        .on('sidebar.isShowing', function() {
+          NexT.utils.isDesktop() && $('body').velocity('stop').velocity(
+            isRight ? {paddingRight: SIDEBAR_WIDTH} : {paddingLeft: SIDEBAR_WIDTH},
+            SIDEBAR_DISPLAY_DURATION
+          );
+        });
+    },
+    clickHandler: function() {
+      this.isSidebarVisible ? this.hideSidebar() : this.showSidebar();
+      this.isSidebarVisible = !this.isSidebarVisible;
+    },
+    mouseEnterHandler: function() {
+      if (this.isSidebarVisible) {
+        return;
+      }
+      sidebarToggleLines.arrow();
+    },
+    mouseLeaveHandler: function() {
+      if (this.isSidebarVisible) {
+        return;
+      }
+      sidebarToggleLines.init();
+    },
+    touchstartHandler: function(e) {
+      xPos = e.originalEvent.touches[0].clientX;
+      yPos = e.originalEvent.touches[0].clientY;
+    },
+    touchendHandler: function(e) {
+      var _xPos = e.originalEvent.changedTouches[0].clientX;
+      var _yPos = e.originalEvent.changedTouches[0].clientY;
+      if (_xPos - xPos > 30 && Math.abs(_yPos - yPos) < 20) {
+        this.clickHandler();
+      }
+    },
+    showSidebar: function() {
+      var self = this;
+
+      sidebarToggleLines.close();
+
+      this.sidebarEl.velocity('stop').velocity({
+        width: SIDEBAR_WIDTH
+      }, {
+        display : 'block',
+        duration: SIDEBAR_DISPLAY_DURATION,
+        begin   : function() {
+          $('.sidebar .motion-element').not('.site-state').velocity(
+            'transition.slideRightIn', {
+              stagger : 50,
+              drag    : true,
+              complete: function() {
+                self.sidebarEl.trigger('sidebar.motion.complete');
+              }
+            }
+          );
+          $('.site-state').velocity(
+            'transition.slideRightIn', {
+              stagger : 50,
+              drag    : true,
+              display : 'flex'
+            }
+          );
+        },
+        complete: function() {
+          self.sidebarEl.addClass('sidebar-active');
+          self.sidebarEl.trigger('sidebar.didShow');
+        }
+      });
+
+      this.sidebarEl.trigger('sidebar.isShowing');
+    },
+    hideSidebar: function() {
+      NexT.utils.isDesktop() && $('body').velocity('stop').velocity(isRight ? {paddingRight: 0} : {paddingLeft: 0});
+      this.sidebarEl.find('.motion-element').velocity('stop').css('display', 'none');
+      this.sidebarEl.velocity('stop').velocity({width: 0}, {display: 'none'});
+
+      sidebarToggleLines.init();
+
+      this.sidebarEl.removeClass('sidebar-active');
+      this.sidebarEl.trigger('sidebar.isHiding');
+
+      // Prevent adding TOC to Overview if Overview was selected when close & open sidebar.
+      if ($('.post-toc-wrap')) {
+        if ($('.site-overview-wrap').css('display') === 'block') {
+          $('.post-toc-wrap').removeClass('motion-element');
+        } else {
+          $('.post-toc-wrap').addClass('motion-element');
+        }
+      }
+    }
+  };
+  sidebarToggleMotion.init();
+
   function updateFooterPosition() {
     var containerHeight = $('#footer').attr('position') ? $('.container').height() + $('#footer').outerHeight(true) : $('.container').height();
     if (containerHeight < window.innerHeight) $('#footer').css({ 'position': 'fixed', 'bottom': 0, 'left': 0, 'right': 0 }).attr('position', 'fixed');
     else $('#footer').removeAttr('style position');
   }
+
   updateFooterPosition();
   $(window).on('resize scroll', updateFooterPosition);
 });

From d8418e14add947fa2e380054af434d24315b68e8 Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Mon, 8 Jul 2019 06:14:52 +0800
Subject: [PATCH 4/7] velocity direction

---
 source/js/schemes/muse.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/js/schemes/muse.js b/source/js/schemes/muse.js
index 7a015d72b0..0a8dab7982 100644
--- a/source/js/schemes/muse.js
+++ b/source/js/schemes/muse.js
@@ -166,7 +166,7 @@ $(document).ready(function() {
         duration: SIDEBAR_DISPLAY_DURATION,
         begin   : function() {
           $('.sidebar .motion-element').not('.site-state').velocity(
-            'transition.slideRightIn', {
+            isRight ? 'transition.slideRightIn' : 'transition.slideLeftIn', {
               stagger : 50,
               drag    : true,
               complete: function() {
@@ -175,7 +175,7 @@ $(document).ready(function() {
             }
           );
           $('.site-state').velocity(
-            'transition.slideRightIn', {
+            isRight ? 'transition.slideRightIn' : 'transition.slideLeftIn', {
               stagger : 50,
               drag    : true,
               display : 'flex'

From 08c38ee691809a3cd2982f0d2bf0507536a283ad Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Mon, 8 Jul 2019 06:41:39 +0800
Subject: [PATCH 5/7] back2top

---
 source/css/_schemes/Muse/sidebar/_sidebar.styl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/source/css/_schemes/Muse/sidebar/_sidebar.styl b/source/css/_schemes/Muse/sidebar/_sidebar.styl
index fa8d87d9e0..2d6ccc3b13 100644
--- a/source/css/_schemes/Muse/sidebar/_sidebar.styl
+++ b/source/css/_schemes/Muse/sidebar/_sidebar.styl
@@ -3,8 +3,12 @@ if (hexo-config('sidebar.position') == 'left') {
     right: auto;
     left: 0;
   }
-  .sidebar-toggle {
+  .sidebar-toggle, .back-to-top {
     right: auto;
-    left: 50px;
+    left: $b2t-position-right;
+
+    +tablet-mobile() {
+      left: $b2t-position-right-mobile;
+    }
   }
 }

From 97b185bc894dbcfa67a40567bcda17f19b1764bc Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Mon, 8 Jul 2019 06:56:40 +0800
Subject: [PATCH 6/7] codacy-bot

---
 source/js/schemes/muse.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/source/js/schemes/muse.js b/source/js/schemes/muse.js
index 0a8dab7982..7b23a675a0 100644
--- a/source/js/schemes/muse.js
+++ b/source/js/schemes/muse.js
@@ -101,9 +101,7 @@ $(document).ready(function() {
   sidebarToggleLines.push(sidebarToggleLine2nd);
   sidebarToggleLines.push(sidebarToggleLine3rd);
 
-  var SIDEBAR_WIDTH = CONFIG.sidebar.width ? CONFIG.sidebar.width : '320px';
-  var SIDEBAR_DISPLAY_DURATION = 200;
-  var xPos, yPos;
+  var SIDEBAR_WIDTH = CONFIG.sidebar.width || '320px', SIDEBAR_DISPLAY_DURATION = 200, xPos, yPos;
 
   var sidebarToggleMotion = {
     toggleEl        : $('.sidebar-toggle'),

From bf4b3a09657c1caadbcc1b10e7ed6eb749f5edf2 Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Mon, 8 Jul 2019 12:11:37 +0800
Subject: [PATCH 7/7] docs

---
 _config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_config.yml b/_config.yml
index a06ae8ef34..1ebe4fb8e5 100644
--- a/_config.yml
+++ b/_config.yml
@@ -248,7 +248,7 @@ toc:
   max_depth: 6
 
 sidebar:
-  # Sidebar Position, available values: left | right.
+  # Sidebar Position.
   position: left
   #position: right