Merge branch 'unki11'

js/customscripts.js

@@ -3,13 +3,8 @@ $('#mysidebar').height($(".nav").height());
 
 $( document ).ready(function() {
 
-    //this script says, if the height of the viewport is greater than 800px, then insert affix class, which makes the nav bar float in a fixed
-    // position as your scroll. if you have a lot of nav items, this height may not work for you.
-    var h = $(window).height();
-    //console.log (h);
-    if (h > 800) {
     $( "#mysidebar" ).attr("class", "nav affix");
-    }
+
     // activate tooltips. although this is a bootstrap js function, it must be activated this way in your theme.
     $('[data-toggle="tooltip"]').tooltip({
         placement : 'top'