Merge branch 'develop' of https://gitlab.netisse.fr/msfari/NAP-wordpress into develop

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

@@ -948,6 +948,7 @@ VII/ Pages...............ALL pages
 #home {
   position: relative;
   height: 100%;
+  overflow: auto;
 }
 .img-wrapper{
   height: 100%;
@@ -2328,6 +2329,9 @@ div.wpcf7-mail-sent-ok{
   border: none !important;
   text-align: center;
 }
+.wpcf7-form-control-wrap{
+  position: initial !important;
+}
 /* --------------*/ /* ---------->>> Woocommerce <<<-----------*/ /* --------------*/
 .woocommerce-variation-description,
 .woocommerce-info,

wp-content/themes/nap/assets/css/responsive.css

@@ -201,10 +201,6 @@
 	.display--only-mobile{
 		display: block;
 	}
-	.main{
-		/*height: auto !important;*/
-		overflow: auto;
-	}
 	.container-bg{
 		left: 0;
 		height: 100%;
@@ -212,6 +208,8 @@
 		z-index: 9999999;
 		position: fixed;
 		top: 0 !important;
+		bottom: auto;
+		transform: translate3d(0,0,0);
 	}
 	.right-container{
 		width: 100% !important;
@@ -389,8 +387,10 @@
 		float: right;
 	}
 	.contact-wrapper .form-wrapper h2.on:after{
-		content: '\002014';
-		font-size: 22px
+		content: '';
+		height: 2px;
+		width: 16px;
+		background: #182566;
 	}
 	.left-panel .map{
 		display: none !important;
@@ -532,6 +532,7 @@
 		position: absolute;
 		background-size: 14px;
 	}
+	.commercial-details,
 	.filter-bloc{
 		width: 82%;
 		margin: 0 auto 9px;

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

@@ -25,12 +25,14 @@ $(function(){
 			if ($(".c-hamburger").hasClass('is-active')) { //Open menu
 				nav.removeClass('OFF').addClass("ON");
 				nav.parent().addClass("show-nav transition");
+				$('body').addClass('fixed');
 				if (!($('.main-nav .nav-content .footer').length)){
 					$('.main-nav .nav-content').append($('footer .footer').clone());
 				}
 			}
 	        else { //Close menu
 	        	nav.removeClass('ON').addClass("OFF");
+	        	$('body').addClass('fixed');
 	        	nav.parent().removeClass("show-nav");
 	        	$('.main-nav .nav-content .footer').remove();
 	        }
@@ -38,8 +40,6 @@ $(function(){
 	        	checkFooterNavPosition();
 	        },330)
 	        nav.stop().slideToggle();
-
-
 	    });
 	}
 	//load content page on left Panel
@@ -84,12 +84,16 @@ $('.footer-home-content').on('click','.home-down:not(.scrolled)',function(e){
 		$('.main').outerHeight(mainHeight + $('.footer-home-content').outerHeight());
 		$('.home-down-wrapper').css('top', - ($('.home-down-wrapper').outerHeight()));
 		$('.home-down').css('top', -($('.home-down').outerHeight()));
+
 		//$('.home-down-wrapper').css('top','121px');
 	}
 		//scroll to bottom
 		$('body').animate({
 			scrollTop: div.outerHeight()
-		}, 1000,'swing');
+		}, 1000,'swing',function(){
+
+		});
+
 	}).on('click','.scrolled',function(){
 		$(this).removeClass('scrolled');
 		$("html, body").animate({ scrollTop: 0 }, "slow");
@@ -98,7 +102,7 @@ $('.footer-home-content').on('click','.home-down:not(.scrolled)',function(e){
 		//$('.home-footer-nav .nav-wrapper').css('top','initial');
 		$('.home-down-wrapper').css('top','initial');
 		$('.footer-home-content').removeClass('fixed');
-		$('.main').height($(window).height());
+		$('.main').height($(window).innerHeight());
 		return false;
 		
 	});
@@ -167,7 +171,7 @@ $('.footer-home-content').on('click','.home-down:not(.scrolled)',function(e){
 		{
 			srcImage = $('#home .img-wrapper').data('defaultimg');
 		}
-$('.img-wrapper').removeClass('animate');
+		$('.img-wrapper').removeClass('animate');
 		$('.img-wrapper').stop().animate({
 			opacity:0,
 		}, 500, function() {});
@@ -359,12 +363,12 @@ $.fn.appendMap = function(){
 $.fn.appendMobileMenu = function(){
 	var $this = $(this);
 	setTimeout(function(){
-	if (!($this.find('li.current').length)){
-		$('.main-nav .nav-content li.current').addClass('to-replace');
-		$('.main-nav .nav-content li.current').clone().find('ul').remove().end().appendTo($this);
-		$this.find("li.current").append($('.main-nav.nav-wrapper li.current ul'));
-	}
-	$('.right-container').css('padding-top',$this.parent().outerHeight());
+		if (!($this.find('li.current').length)){
+			$('.main-nav .nav-content li.current').addClass('to-replace');
+			$('.main-nav .nav-content li.current').clone().find('ul').remove().end().appendTo($this);
+			$this.find("li.current").append($('.main-nav.nav-wrapper li.current ul'));
+		}
+		$('.right-container').css('padding-top',$this.parent().outerHeight());
 	},2000)
 
 }
@@ -373,7 +377,7 @@ $.fn.appendMobileMenu = function(){
 		var footerHeight = $('footer').height(),
 		productHeight = $(".product-details").outerHeight(),
 		productWidth = $(".product-details").outerWidth(),	
-		windowHeight = $(window).height(),
+		windowHeight = $(window).innerHeight(),
 		windowWidth = $(window).width(),
 		navMenuWidth = $('.nav-wrapper').outerWidth(),
 		navHeight = $('.nav-header').outerHeight(),
@@ -403,6 +407,7 @@ $.fn.appendMobileMenu = function(){
 			$('.container-bg').css({'height':'100%' , 'width' : navMenuWidth});
 			$('.main').css('padding-top',0);
 			$('.search-filter h2').removeClass('show-filter');
+			$('.contact-form h2').removeClass('show-comm');
 			$('.filter, .left-panel .map, .details').show();
 			$('.left-panel').appendMap();
 			$('.filter-list,#home').css('margin-top',0);
@@ -414,6 +419,7 @@ $.fn.appendMobileMenu = function(){
 			$('.main').css('padding-top',navHeight);
 			$('.container-bg').css({'height':navHeight});
 			$('.search-filter h2').addClass('show-filter');
+			$('.contact-form h2').addClass('show-comm');
 			$('.filter-list').css('margin-top',navHeight);
 			$('.filter-list .top-header, .mobile-nav').css('top',navHeight);
 			$('.mobile-nav .nav-wrapper ul').appendMobileMenu();
@@ -551,7 +557,7 @@ function checkFooterNavPosition(){
 }	
 $(window).load( function() {
 	initFunction();
-		$('.header .nav-wrapper .nav-content > ul > li').each(function(){
+	$('.header .nav-wrapper .nav-content > ul > li').each(function(){
 		url = $(this).data('img');
 		$('.img-wrapper').append('<img src='+ url +'>');
 	})

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

@@ -68,7 +68,7 @@ function selectZone(zone, initialClassDep, initialClassNum) {
 	window.selectedZone = zone;
 }
 function showMap(){
-	jQuery(document).find('.search-filter h2').on('click', function(){
+	jQuery(document).find('.show-filter').on('click', function(){
 		$('.filter').appendMap();
 		$('.filter, .details, .active-com, .map').slideToggle();
 		$(this).toggleClass('on');
@@ -96,7 +96,6 @@ jQuery(document).find("#selectCountry").on('change',function(e) {
 	initialClassDep = 'st3',
 	initialClassNum = 'st5';
 	if (country === 'FR') {
-		console.log('ffff'); 
 		jQuery('.form-element.cp').slideDown('slow');
 		selectZone(null, initialClassDep, initialClassNum);
 		return;