Merge remote-tracking branch 'origin/master'

NuxDev · May 6, 2014 · c6541bf · c6541bf
2 parents 73f8061 + d7c2eb8
commit c6541bf
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/less/navmenu.less b/less/navmenu.less
@@ -10,7 +10,7 @@
 .navmenu,
 .navbar-offcanvas {
   width: @navmenu-width;
-  height: 100%;
+  height: auto;
   border-width: 1px;
   border-style: solid;
   border-radius: @border-radius-base;
@@ -22,15 +22,15 @@
   position: fixed;
   z-index: @zindex-navmenu-fixed;
   top: 0;
+  bottom: 0;
+  overflow-y: auto;
   border-radius: 0;
 }
 .navmenu-fixed-left,
 .navbar-offcanvas.navmenu-fixed-left {
   left: 0;
   right: auto;
   border-width: 0 1px 0 0;
-  bottom: 0;
-  overflow-y: auto;
 }
 .navmenu-fixed-right,
 .navbar-offcanvas {