Permalink
Browse files

Merge branch 'release/6.7.x' into develop

# Conflicts:
#	conf/_application.php
  • Loading branch information...
2 parents 92acd9f + ee7b21e commit f6705d677b291567c520c15def882174a6641f3c @yurabakhtin yurabakhtin committed Jan 10, 2017
Showing with 1 addition and 1 deletion.
  1. +1 −1 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' );

0 comments on commit f6705d6

Please sign in to comment.