Skip to content

N
NAP-wordpress
Commit 2549582a authored by imac's avatar imac
Browse files
Options

[Bugfix]JIRA-4 -> Product page

parent 1f844753
Hide whitespace changes
Inline Side-by-side
Showing with 170 additions and 41 deletions
wp-content/themes/nap/assets/css/main.css
View file @ 2549582a
......@@ -1219,6 +1219,11 @@ aside.news-wrapper {
display: block;
height: 25px;
line-height: 25px;
-webkit-transition: all .2s ease-in-out;
-moz-transition: all .2s ease-in-out;
-o-transition: all .2s ease-in-out;
-ms-transition: all .2s ease-in-out;
transition: all .2s ease-in-out;
}
.nav-slider ul li.active{
background: #FF6A5F;
......@@ -1282,6 +1287,7 @@ aside.news-wrapper {
background: url(img/download.svg) no-repeat;
background-size: 9px;
margin: 0px;
margin-left: 6px;
}
.product-details{
width: calc(40.7% - 5px);
......@@ -1607,6 +1613,7 @@ label.chevron.bottom::first-letter {
text-align: center;
margin-bottom: 20px;
}
.color-list input.is-white:after,
.color-list input[type='radio']:checked:after {
border: 1px solid #071D3D;
}
......@@ -1642,6 +1649,8 @@ label.chevron.bottom::first-letter {
}
.phototheque-content nav{
padding-left: 24px;
width: 100%;
overflow-wrap: break-word;
}
.phototheque-content nav li{
display: block;
......@@ -1818,7 +1827,8 @@ label.chevron.bottom::first-letter {
background: #fff;
color: inherit;
padding: 98px 31px 30px 30px;
width: 245px;
/*width: 245px;*/
width: 270px;
left: 0;
opacity: 0;
visibility: hidden;
......@@ -1829,6 +1839,21 @@ label.chevron.bottom::first-letter {
margin-bottom: 25px;
position: relative;
}
.top-header span:first-child{
padding-left: 23px;
position: relative;
}
.top-header span:first-child:before{
content: '';
background: url(img/filtre_bleu.svg) no-repeat;
height: 16px;
width: 12px;
display: block;
z-index: 99999;
position: absolute;
background-size: 14px;
margin-top: 2px;
}
.filter-list .header>span:first-child{
font-size: 15px;
}
......@@ -1840,7 +1865,7 @@ label.chevron.bottom::first-letter {
.filter-bloc .header{
padding: 4px 13px 0px;
cursor: pointer;
overflow: hidden;
/*overflow: hidden;*/
}
.filter-bloc p{
padding-bottom: 6px;
......@@ -1861,11 +1886,13 @@ label.chevron.bottom::first-letter {
float: right;
font-size: 17px;
line-height: 14px;
display: inline-block;
float: right;
}
.filter-bloc.active > p:first-child:after{
content:'\002014';
.filter-bloc.active p:first-child:after{
content: '';
height: 1px;
width: 8px;
background-color: #182566;
margin-top: 7px;
}
.filter-bloc .bloc-content{
border-top: 1px solid rgba(0, 0, 0, 0.1);
......@@ -1919,7 +1946,7 @@ label.chevron.bottom::first-letter {
.filter-bloc ul li.disabled{
opacity: 0.4;
}
.filter-bloc .pa_couleur-filter li:last-child:before,
.filter-bloc li.reinit:before,
.filter-btn-list span:before,
.filter-bloc ul li:before{
content: 'x';
......@@ -2227,6 +2254,9 @@ label.chevron.bottom::first-letter {
padding: 73px 29px 35px;
position: relative;
}
.contact-wrapper .form-wrapper form{
padding-bottom: 35px;
}
.contact-form .footer{
bottom: 0;
left: 0;
......
wp-content/themes/nap/assets/css/responsive.css
View file @ 2549582a
......@@ -352,6 +352,9 @@
width: 100%;
left: initial !important;
}
.contact-wrapper .right-panel{
height: auto !important;
}
.left-panel .map{
display: none;
}
......@@ -374,7 +377,7 @@
width: 100%;
height: auto !important;
}
.contact-wrapper .form-wrapper h2{
.header-filter-contact .open-filter{
cursor: pointer;
}
.contact-wrapper .form-wrapper h2:after{
......@@ -397,6 +400,7 @@
}
.contact-form{
background: #fff;
float: none;
}
.map {
text-align: center;
......@@ -430,6 +434,10 @@
position: relative !important;
margin-top: 38px;
}
.contact-form .footer.fixed{
position: fixed !important;
bottom: 0;
}
.contact-wrapper .details,
.contact-wrapper form{
text-align: center;
......@@ -443,7 +451,7 @@
}
.commercial-details figure{
margin-right: auto;
margin-left: 0;
margin-left: auto;
}
/* Catalogue */
#catalogue .left-panel{
......@@ -525,21 +533,10 @@
font-size: 14px;
line-height: 16px;
}
.top-header span:first-child{
padding-left: 23px;
position: relative;
}
.top-header span:first-child:before{
content: '';
background: url(img/filtre_bleu.svg) no-repeat;
height: 16px;
width: 12px;
display: block;
z-index: 99999;
position: absolute;
background-size: 14px;
.commercial-details.active-com figure{
margin-left: 0;
}
.commercial-details,
.commercial-details.active-com,
.filter-bloc{
width: 82%;
margin: 0 auto 9px;
......@@ -673,7 +670,7 @@
margin-left: 15px;
}
.product-info {
width: 100%;
width: 100% !important;
padding-bottom: 43px;
margin-bottom: 11px;
}
......@@ -693,6 +690,7 @@
position: relative;
display: block;
right: initial !important;
width: 100% !important;
}
.product-details .list-wrapper{
width: 79%;
......@@ -756,6 +754,28 @@
max-width: 60px;
margin: 0 10px;
}
/* Page CMS */
.phototheque-content .nav-phototeque{
width: 100%;
position: relative;
max-width: 100%;
border-right: none;
}
.phototheque-content nav{
width: 100%;
padding-left: 0px;
}
.phototheque-content .header h2{
max-width: 60%;
}
.gallery-wrapper{
width: 100% !important;
margin-left: 0px !important;
}
.legacy{
padding-top: 10px;
max-width: 80%;
}
/* form */
.form-wrapper{
padding: 23px 20px 20px;
......@@ -878,6 +898,17 @@
.product-list .suggest-header {
margin: 0px 9px;
}
/* CMS */
.legacy{
max-width: 100%;
}
.legacy h2 {
font-size: 20px;
line-height: 22px;
}
.phototheque-content .header h2{
max-width: 100%;
}
}
/* ------------------------*/ /* ---------->>> 420 <<<-----------*/ /* ------------------------*/
@media screen and (max-width: 420px) {
......@@ -910,15 +941,56 @@
.slides-wrapper .gallery-content {
max-width: 90%;
}
/* Stories */
.section .bloc{
left: 0;
right: 0;
margin : 0 auto;
bottom: 30%;
}
.bloc h2 {
width: calc(90% - 45px);
vertical-align: top;
}
/* ACCES PRO */
.popup,
.popup-first .inner {
width: 90%;
}
/* CMS */
.gallery-wrapper {
padding: 0px 10px 40px;
}
.legacy p {
padding-bottom: 10px;
}
.legacy h2{
font-size: 16px;
line-height: 18px;
padding-top: 15px;
}
}
/* (landscape) ----------- */
@media screen and (max-height : 500px) {
.news-btn {
top: 85px;
}
/*stories*/
.section .bloc {
top: 10px;
bottom: initial;
}
.bloc .desc-content {
max-height: 40vh;
padding: 20px;
}
#fullpage .chevron{
bottom: 15px;
}
}
@media screen and (max-height : 420px) {
.contact-form .footer.fixed,
.contact-form .footer{
position: relative !important;
}
}
\ No newline at end of file
wp-content/themes/nap/assets/js/product.js
View file @ 2549582a
function loadProductContent() {
sizeProductDetails = $('.product-details .list').length;
if (sizeProductDetails < 2) {
if (sizeProductDetails == 0) {
$('.product-images').outerWidth('65%');
$('.product-details').outerWidth('34%');
$('.product-info').outerWidth('100%');
}else if (sizeProductDetails < 2) {
$('.product-info').outerWidth('78.3%');
}
$('.pa_couleur li').getListColors();
......@@ -20,8 +24,9 @@ function loadProductContent() {
$('.pa_couleur li').selectColor();
$('.pa_format li').selectFormat();
$('.color-list.selected').selectSlide($('#slides'));
$.fn.getDownloadCurrentSlideLink();
//$('.btn-wrapper.close-panel').addClass('int-link');
},100)
},300)
$('.download-btn:not(.download_file)').click(function(e){
e.stopPropagation();
});
......@@ -96,6 +101,17 @@ $(function(){
}
})
}
$.fn.getDownloadCurrentSlideLink = function(){
var img_link = $(document).find('.slick-current a').attr('href');
if(img_link){
$('#download').find('a').attr("href", img_link);
$('#download').removeClass('disabled');
}else{
$('#download').addClass('disabled');
}
console.log('dwnld');
}
$.fn.slider_product = function(){
$('#slides').not('.slick-initialized').slick({
autoplay: false,
......@@ -103,9 +119,13 @@ $(function(){
dots: true,
slidesToShow: 1,
adaptiveHeight: true,
//centerMode: true,
centerPadding: '0px',
});
//centerMode: true,
centerPadding: '0px',
});
// Get HD source image when change slide
$('#slides').on('afterChange', function(event, slick, currentSlide){
$.fn.getDownloadCurrentSlideLink();
});
}
$.fn.selectSlide = function(slide){
var data = $(this).data("color"),
......@@ -177,17 +197,16 @@ $(function(){
}
$('.product-list article img, .product-list article ul li').on('click', function() {
//localStorage['from-site'] = true;
$('head').append($('.header-shop'));
var toLink = $(this).data('link');
history.pushState(null, null, toLink);
$('head').append($('.header-shop'));
var toLink = $(this).data('link');
history.pushState(null, null, toLink);
// $.post(toLink, { fromSite: true});
//$.cookie("formSite", 1);
sessionStorage.setItem("formSite","yes");
$('.load-page').parent().addClass('active');
$('.load-page').load(toLink,function(){
loadProductContent();
$('html').css('overflow','hidden');
});
})
$('.load-page').parent().addClass('active');
$('.load-page').load(toLink,function(){
loadProductContent();
$('html').css('overflow','hidden');
});
})
loadProductContent();
});
\ No newline at end of file
wp-content/themes/nap/woocommerce/single-product/add-to-cart/simple.php
View file @ 2549582a
......@@ -39,7 +39,11 @@ do_action('woocommerce_before_add_to_cart_form');
<li id = "mozaique"><span class="icon mozaique row"></span><span class="desc">Mozaïque</span></li>
<li id = "zoom" data-active="false" ><span class="icon zoom"></span><span class="desc">Zoom</span></li>
<?php if ( is_user_logged_in() ) { ?>
<li><span class="icon download"></span><span class="desc">Télécharger</span></li>
<li id="download">
<a class="abs-full" download></a>
<span class="icon download"></span>
<span class="desc">Télécharger</span>
</li>
<?php } ?>
</ul>
</div>
......
wp-content/themes/nap/woocommerce/single-product/add-to-cart/variable.php
View file @ 2549582a
......@@ -94,7 +94,11 @@ do_action('woocommerce_before_add_to_cart_form');
<li id = "mozaique"><span class="icon mozaique row"></span><span class="desc">Mozaïque</span></li>
<li id = "zoom" data-active="false" ><span class="icon zoom"></span><span class="desc">Zoom</span></li>
<?php if ( is_user_logged_in() ) { ?>
<li><span class="icon download"></span><span class="desc">Télécharger</span></li>
<li id="download">
<a class="abs-full" download></a>
<span class="icon download"></span>
<span class="desc">Télécharger</span>
</li>
<?php } ?>
</ul>
</div>
......
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