Merge branch 'release/6.7.x' into develop

# Conflicts: # conf/_application.php
b2evolution · Jan 10, 2017 · f6705d6 · f6705d6
2 parents 92acd9f + ee7b21e
commit f6705d6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/skins/bootstrap_manual_skin/left_navigation.js b/skins/bootstrap_manual_skin/left_navigation.js
@@ -38,7 +38,7 @@ jQuery( document ).ready( function()
 			if( $sidebar.hasClass( 'fixed' ) )
 			{ // Check and fix an overlapping of footer with sidebar
 				$sidebar.css( 'top', sidebar_top + 'px' );
-				var diff = parseInt( $sidebar.offset().top + $sidebar.outerHeight() - jQuery( '#evo_container__footer' ).offset().top );
+				var diff = parseInt( $sidebar.offset().top + $sidebar.outerHeight() - jQuery( '.evo_container__footer' ).offset().top );
 				if( diff >= 0 )
 				{
 					$sidebar.css( 'top', parseInt( sidebar_top - diff - 5 ) + 'px' );