Skip to content

N
NAP-wordpress
Commit bfb65b0d authored by Nahla Shiri's avatar Nahla Shiri
Browse files
Options

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

parents 7cb2e887 79e9c59d
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 21 deletions
wp-content/themes/nap/assets/css/main.css
View file @ bfb65b0d
...@@ -948,6 +948,7 @@ VII/ Pages...............ALL pages ...@@ -948,6 +948,7 @@ VII/ Pages...............ALL pages
#home { #home {
position: relative; position: relative;
height: 100%; height: 100%;
overflow: auto;
} }
.img-wrapper{ .img-wrapper{
height: 100%; height: 100%;
...@@ -2328,6 +2329,9 @@ div.wpcf7-mail-sent-ok{ ...@@ -2328,6 +2329,9 @@ div.wpcf7-mail-sent-ok{
border: none !important; border: none !important;
text-align: center; text-align: center;
} }
.wpcf7-form-control-wrap{
position: initial !important;
}
/* --------------*/ /* ---------->>> Woocommerce <<<-----------*/ /* --------------*/ /* --------------*/ /* ---------->>> Woocommerce <<<-----------*/ /* --------------*/
.woocommerce-variation-description, .woocommerce-variation-description,
.woocommerce-info, .woocommerce-info,
......
wp-content/themes/nap/assets/css/responsive.css
View file @ bfb65b0d
...@@ -201,10 +201,6 @@ ...@@ -201,10 +201,6 @@
.display--only-mobile{ .display--only-mobile{
display: block; display: block;
} }
.main{
/*height: auto !important;*/
overflow: auto;
}
.container-bg{ .container-bg{
left: 0; left: 0;
height: 100%; height: 100%;
...@@ -212,6 +208,8 @@ ...@@ -212,6 +208,8 @@
z-index: 9999999; z-index: 9999999;
position: fixed; position: fixed;
top: 0 !important; top: 0 !important;
bottom: auto;
transform: translate3d(0,0,0);
} }
.right-container{ .right-container{
width: 100% !important; width: 100% !important;
...@@ -389,8 +387,10 @@ ...@@ -389,8 +387,10 @@
float: right; float: right;
} }
.contact-wrapper .form-wrapper h2.on:after{ .contact-wrapper .form-wrapper h2.on:after{
content: '\002014'; content: '';
font-size: 22px height: 2px;
width: 16px;
background: #182566;
} }
.left-panel .map{ .left-panel .map{
display: none !important; display: none !important;
...@@ -532,6 +532,7 @@ ...@@ -532,6 +532,7 @@
position: absolute; position: absolute;
background-size: 14px; background-size: 14px;
} }
.commercial-details,
.filter-bloc{ .filter-bloc{
width: 82%; width: 82%;
margin: 0 auto 9px; margin: 0 auto 9px;
......
wp-content/themes/nap/assets/js/main.js
View file @ bfb65b0d
...@@ -25,12 +25,14 @@ $(function(){ ...@@ -25,12 +25,14 @@ $(function(){
if ($(".c-hamburger").hasClass('is-active')) { //Open menu if ($(".c-hamburger").hasClass('is-active')) { //Open menu
nav.removeClass('OFF').addClass("ON"); nav.removeClass('OFF').addClass("ON");
nav.parent().addClass("show-nav transition"); nav.parent().addClass("show-nav transition");
$('body').addClass('fixed');
if (!($('.main-nav .nav-content .footer').length)){ if (!($('.main-nav .nav-content .footer').length)){
$('.main-nav .nav-content').append($('footer .footer').clone()); $('.main-nav .nav-content').append($('footer .footer').clone());
} }
} }
else { //Close menu else { //Close menu
nav.removeClass('ON').addClass("OFF"); nav.removeClass('ON').addClass("OFF");
$('body').addClass('fixed');
nav.parent().removeClass("show-nav"); nav.parent().removeClass("show-nav");
$('.main-nav .nav-content .footer').remove(); $('.main-nav .nav-content .footer').remove();
} }
...@@ -38,8 +40,6 @@ $(function(){ ...@@ -38,8 +40,6 @@ $(function(){
checkFooterNavPosition(); checkFooterNavPosition();
},330) },330)
nav.stop().slideToggle(); nav.stop().slideToggle();
}); });
} }
//load content page on left Panel //load content page on left Panel
...@@ -84,12 +84,16 @@ $('.footer-home-content').on('click','.home-down:not(.scrolled)',function(e){ ...@@ -84,12 +84,16 @@ $('.footer-home-content').on('click','.home-down:not(.scrolled)',function(e){
$('.main').outerHeight(mainHeight + $('.footer-home-content').outerHeight()); $('.main').outerHeight(mainHeight + $('.footer-home-content').outerHeight());
$('.home-down-wrapper').css('top', - ($('.home-down-wrapper').outerHeight())); $('.home-down-wrapper').css('top', - ($('.home-down-wrapper').outerHeight()));
$('.home-down').css('top', -($('.home-down').outerHeight())); $('.home-down').css('top', -($('.home-down').outerHeight()));
//$('.home-down-wrapper').css('top','121px'); //$('.home-down-wrapper').css('top','121px');
} }
//scroll to bottom //scroll to bottom
$('body').animate({ $('body').animate({
scrollTop: div.outerHeight() scrollTop: div.outerHeight()
}, 1000,'swing'); }, 1000,'swing',function(){
});
}).on('click','.scrolled',function(){ }).on('click','.scrolled',function(){
$(this).removeClass('scrolled'); $(this).removeClass('scrolled');
$("html, body").animate({ scrollTop: 0 }, "slow"); $("html, body").animate({ scrollTop: 0 }, "slow");
...@@ -98,7 +102,7 @@ $('.footer-home-content').on('click','.home-down:not(.scrolled)',function(e){ ...@@ -98,7 +102,7 @@ $('.footer-home-content').on('click','.home-down:not(.scrolled)',function(e){
//$('.home-footer-nav .nav-wrapper').css('top','initial'); //$('.home-footer-nav .nav-wrapper').css('top','initial');
$('.home-down-wrapper').css('top','initial'); $('.home-down-wrapper').css('top','initial');
$('.footer-home-content').removeClass('fixed'); $('.footer-home-content').removeClass('fixed');
$('.main').height($(window).height()); $('.main').height($(window).innerHeight());
return false; return false;
}); });
...@@ -167,7 +171,7 @@ $('.footer-home-content').on('click','.home-down:not(.scrolled)',function(e){ ...@@ -167,7 +171,7 @@ $('.footer-home-content').on('click','.home-down:not(.scrolled)',function(e){
{ {
srcImage = $('#home .img-wrapper').data('defaultimg'); srcImage = $('#home .img-wrapper').data('defaultimg');
} }
$('.img-wrapper').removeClass('animate'); $('.img-wrapper').removeClass('animate');
$('.img-wrapper').stop().animate({ $('.img-wrapper').stop().animate({
opacity:0, opacity:0,
}, 500, function() {}); }, 500, function() {});
...@@ -359,12 +363,12 @@ $.fn.appendMap = function(){ ...@@ -359,12 +363,12 @@ $.fn.appendMap = function(){
$.fn.appendMobileMenu = function(){ $.fn.appendMobileMenu = function(){
var $this = $(this); var $this = $(this);
setTimeout(function(){ setTimeout(function(){
if (!($this.find('li.current').length)){ if (!($this.find('li.current').length)){
$('.main-nav .nav-content li.current').addClass('to-replace'); $('.main-nav .nav-content li.current').addClass('to-replace');
$('.main-nav .nav-content li.current').clone().find('ul').remove().end().appendTo($this); $('.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')); $this.find("li.current").append($('.main-nav.nav-wrapper li.current ul'));
} }
$('.right-container').css('padding-top',$this.parent().outerHeight()); $('.right-container').css('padding-top',$this.parent().outerHeight());
},2000) },2000)
} }
...@@ -373,7 +377,7 @@ $.fn.appendMobileMenu = function(){ ...@@ -373,7 +377,7 @@ $.fn.appendMobileMenu = function(){
var footerHeight = $('footer').height(), var footerHeight = $('footer').height(),
productHeight = $(".product-details").outerHeight(), productHeight = $(".product-details").outerHeight(),
productWidth = $(".product-details").outerWidth(), productWidth = $(".product-details").outerWidth(),
windowHeight = $(window).height(), windowHeight = $(window).innerHeight(),
windowWidth = $(window).width(), windowWidth = $(window).width(),
navMenuWidth = $('.nav-wrapper').outerWidth(), navMenuWidth = $('.nav-wrapper').outerWidth(),
navHeight = $('.nav-header').outerHeight(), navHeight = $('.nav-header').outerHeight(),
...@@ -403,6 +407,7 @@ $.fn.appendMobileMenu = function(){ ...@@ -403,6 +407,7 @@ $.fn.appendMobileMenu = function(){
$('.container-bg').css({'height':'100%' , 'width' : navMenuWidth}); $('.container-bg').css({'height':'100%' , 'width' : navMenuWidth});
$('.main').css('padding-top',0); $('.main').css('padding-top',0);
$('.search-filter h2').removeClass('show-filter'); $('.search-filter h2').removeClass('show-filter');
$('.contact-form h2').removeClass('show-comm');
$('.filter, .left-panel .map, .details').show(); $('.filter, .left-panel .map, .details').show();
$('.left-panel').appendMap(); $('.left-panel').appendMap();
$('.filter-list,#home').css('margin-top',0); $('.filter-list,#home').css('margin-top',0);
...@@ -414,6 +419,7 @@ $.fn.appendMobileMenu = function(){ ...@@ -414,6 +419,7 @@ $.fn.appendMobileMenu = function(){
$('.main').css('padding-top',navHeight); $('.main').css('padding-top',navHeight);
$('.container-bg').css({'height':navHeight}); $('.container-bg').css({'height':navHeight});
$('.search-filter h2').addClass('show-filter'); $('.search-filter h2').addClass('show-filter');
$('.contact-form h2').addClass('show-comm');
$('.filter-list').css('margin-top',navHeight); $('.filter-list').css('margin-top',navHeight);
$('.filter-list .top-header, .mobile-nav').css('top',navHeight); $('.filter-list .top-header, .mobile-nav').css('top',navHeight);
$('.mobile-nav .nav-wrapper ul').appendMobileMenu(); $('.mobile-nav .nav-wrapper ul').appendMobileMenu();
...@@ -551,7 +557,7 @@ function checkFooterNavPosition(){ ...@@ -551,7 +557,7 @@ function checkFooterNavPosition(){
} }
$(window).load( function() { $(window).load( function() {
initFunction(); initFunction();
$('.header .nav-wrapper .nav-content > ul > li').each(function(){ $('.header .nav-wrapper .nav-content > ul > li').each(function(){
url = $(this).data('img'); url = $(this).data('img');
$('.img-wrapper').append('<img src='+ url +'>'); $('.img-wrapper').append('<img src='+ url +'>');
}) })
......
wp-content/themes/nap/assets/js/map.js
View file @ bfb65b0d
...@@ -68,7 +68,7 @@ function selectZone(zone, initialClassDep, initialClassNum) { ...@@ -68,7 +68,7 @@ function selectZone(zone, initialClassDep, initialClassNum) {
window.selectedZone = zone; window.selectedZone = zone;
} }
function showMap(){ function showMap(){
jQuery(document).find('.search-filter h2').on('click', function(){ jQuery(document).find('.show-filter').on('click', function(){
$('.filter').appendMap(); $('.filter').appendMap();
$('.filter, .details, .active-com, .map').slideToggle(); $('.filter, .details, .active-com, .map').slideToggle();
$(this).toggleClass('on'); $(this).toggleClass('on');
...@@ -96,7 +96,6 @@ jQuery(document).find("#selectCountry").on('change',function(e) { ...@@ -96,7 +96,6 @@ jQuery(document).find("#selectCountry").on('change',function(e) {
initialClassDep = 'st3', initialClassDep = 'st3',
initialClassNum = 'st5'; initialClassNum = 'st5';
if (country === 'FR') { if (country === 'FR') {
console.log('ffff');
jQuery('.form-element.cp').slideDown('slow'); jQuery('.form-element.cp').slideDown('slow');
selectZone(null, initialClassDep, initialClassNum); selectZone(null, initialClassDep, initialClassNum);
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment