[Bugfix]Redmine #726 & #725 ->scroll & filter

wp-content/themes/nap/assets/js/main.js

@@ -279,10 +279,11 @@ $.fn.loadPageContent = function(){
 	$.fn.open_filter = function(){
 		$(this).on('click','.filter-btn',function(){
 			var filterW = $('.filter-list').outerWidth(),
-			filterBtn =$('.filter-btn .btn-container').outerWidth();
+			mainW = $('.main-nav').outerWidth(),
+			filterBtn = $('.filter-btn .btn-container').outerWidth();
 			tlFilter = new TimelineMax();
 			tlFilter.staggerFromTo('.filter-bloc',0.5,{opacity:0,y:100},{opacity:1,y:0},0.1,0);
-			tlFilter.fromTo('.filter-list',0.5,{opacity:0,left:'0',visibility:"hidden"},{opacity:1,left:filterW - filterBtn ,visibility:"visible"},0);
+			tlFilter.fromTo('.filter-list',0.5,{opacity:0,left:'0',visibility:"hidden"},{opacity:1,left:mainW,visibility:"visible"},0);
 			tlFilter.to('.filter-btn .btn-container',0.5,{opacity:0,left:filterW, width:"0px"},0);
 
 			//tl.fromTo('#slides',0.5,{opacity:1},{opacity:0},0);
@@ -462,7 +463,6 @@ $.fn.appendMobileMenu = function(){
 		maxHeight = productHeight > windowHeight ? productHeight : containerHeight,
 		galleryWidth = windowWidth - navPhototequeWidth,
 		filterWidth = $('.right-container .left-panel').outerWidth(),
-		lastSectionHeight = $('#catalogue .panel-content section').last().outerHeight(),
 		footerContact = $('.contact-form .footer').outerHeight();
 		$('.gallery-wrapper').outerWidth(galleryWidth).css('margin-left',navPhototequeWidth) ;
 		$('.main,.load-page').outerHeight(containerHeight);
@@ -474,10 +474,17 @@ $.fn.appendMobileMenu = function(){
 		$('.right-panel').outerWidth(windowWidth - (navMenuWidth + filterWidth));
 		$('.contact-form').height(windowHeight - footerHeight);
 		$('.contact-form .inner-form').outerHeight(windowHeight - footerContact);
-		if (lastSectionHeight < windowHeight - footerHeight){
-			var lastSection = $('#catalogue .panel-content section').last();
-			lastSection.height(2 * windowHeight/3 + lastSection.find('h2') - footerHeight );
-		}	
+		$('#catalogue .panel-content section').last().css('height','auto');
+		setTimeout(function(){
+		var lastSection = $('#catalogue .panel-content section').last();
+		var lastSectionHeight = lastSection.outerHeight() + 50;
+			if (lastSectionHeight < windowHeight - footerHeight){
+					lastSection.height(2 * windowHeight/3 + lastSection.find('h2').outerHeight() - footerHeight );
+				}else{
+					lastSection.css('height','auto');
+				}
+		},1000)
+		
 		$('.nav-phototeque .nav-content').outerHeight(navPhototequeHeight - $('.circle-btn').outerHeight()- $('.phototheque-content .header h2').outerHeight() - footerHeight);
 		if (windowWidth > 860){
 			$('#fullpage .chevron').css('left',navMenuWidth);