Commit bbd65944 authored by imac's avatar imac

[Bugfix]Redmine - #641 : Image transition

parent 0f9655fd
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
background: transparent; /* optional: just make scrollbar invisible */ background: transparent; /* optional: just make scrollbar invisible */
} }
.product-details .list {overflow: -moz-scrollbars-none;} .product-details .list {overflow: -moz-scrollbars-none;}
@keyframes fadein { @keyframes fadein {
from { from {
...@@ -711,20 +711,20 @@ nav ul ul{ ...@@ -711,20 +711,20 @@ nav ul ul{
/*nav ul ul li:before{ /*nav ul ul li:before{
content: "•"; content: "•";
padding-right: 5px; padding-right: 5px;
}*/ }*/
nav ul ul li { nav ul ul li {
font-size: 14px; font-size: 14px;
font-weight: 300; font-weight: 300;
line-height: 19px; line-height: 19px;
padding-bottom: 5px; padding-bottom: 5px;
} }
.header .nav-content li li a { .header .nav-content li li a {
opacity: 0.6; opacity: 0.6;
} }
.header .nav-content li a.active, .header .nav-content li a.active,
.nav-content ul ul li.active{ .nav-content ul ul li.active{
opacity: 1 !important; opacity: 1 !important;
} }
/* ========================================================================== /* ==========================================================================
VI/ FOOTER...............footer VI/ FOOTER...............footer
========================================================================== */ ========================================================================== */
...@@ -1155,7 +1155,7 @@ label.chevron.bottom { ...@@ -1155,7 +1155,7 @@ label.chevron.bottom {
} }
label.chevron.bottom::first-letter { label.chevron.bottom::first-letter {
text-transform: uppercase; text-transform: uppercase;
} }
.pa_format ul li img { .pa_format ul li img {
vertical-align: top; vertical-align: top;
...@@ -1247,12 +1247,13 @@ text-transform: uppercase; ...@@ -1247,12 +1247,13 @@ text-transform: uppercase;
.entry-summary .price { .entry-summary .price {
font-size: 0; font-size: 0;
display: none;
} }
.product-info .price{ .product-info .price{
font-size: 20px; font-size: 20px;
line-height: 24px; line-height: 24px;
letter-spacing: 2px; letter-spacing: 2px;
display: block;
} }
.product-info .notice{ .product-info .notice{
font-size: 9px; font-size: 9px;
......
...@@ -37,7 +37,7 @@ $(function(){ ...@@ -37,7 +37,7 @@ $(function(){
$('.gallery-wrapper').removeClass('hidden-elem').addClass('animated visible-elem fadeInUp'); $('.gallery-wrapper').removeClass('hidden-elem').addClass('animated visible-elem fadeInUp');
},0) },0)
}); });
}); });
//Get file name of uploaded file //Get file name of uploaded file
$('#file-p').on('change',function(e){ $('#file-p').on('change',function(e){
var fileName = e.target.files[0].name; var fileName = e.target.files[0].name;
...@@ -164,7 +164,6 @@ $(function(){ ...@@ -164,7 +164,6 @@ $(function(){
}else{ }else{
$this.removeClass('active'); $this.removeClass('active');
$this.find('.bloc-content').slideUp('slow'); $this.find('.bloc-content').slideUp('slow');
//$('.commercial').slideDown('slow');
} }
}).on('click','.filter-bloc li:not(.disabled,.reinit)',function(e){ }).on('click','.filter-bloc li:not(.disabled,.reinit)',function(e){
...@@ -260,10 +259,7 @@ $(function(){ ...@@ -260,10 +259,7 @@ $(function(){
$.fn.fullpage.moveSectionDown(); $.fn.fullpage.moveSectionDown();
}); });
} }
$.fn.getMenuBg = function(){ $.fn.getMenuBg = function(){
//debugger;
var imgSrc = $('header .nav-content > ul').find(' > li.current').data('img'); var imgSrc = $('header .nav-content > ul').find(' > li.current').data('img');
navwWidth = $('.nav-wrapper').width(); navwWidth = $('.nav-wrapper').width();
$('.container-bg').css({ $('.container-bg').css({
...@@ -349,7 +345,7 @@ $.fn.animation = function(){ ...@@ -349,7 +345,7 @@ $.fn.animation = function(){
setTimeout(function(){$('.form-wrapper').removeClass('hidden-elem').addClass('animated fadeInUp')},1000) setTimeout(function(){$('.form-wrapper').removeClass('hidden-elem').addClass('animated fadeInUp')},1000)
animateOnScroll(); animateOnScroll();
} }
function onScrollCover(direction){ function onScrollCover(){
cover = $('.subcat a.active').attr("href"); cover = $('.subcat a.active').attr("href");
$('.cover-wrapper').each(function () { $('.cover-wrapper').each(function () {
coverWrapper = $(this).data('cat'); coverWrapper = $(this).data('cat');
...@@ -365,32 +361,20 @@ function onScrollCover(direction){ ...@@ -365,32 +361,20 @@ function onScrollCover(direction){
}; };
var lastScrollTop = 0; var lastScrollTop = 0;
function onScroll(event){ function onScroll(event){
var st = $(this).scrollTop(); var scrollPos = $(this).scrollTop(),
if (st > lastScrollTop){
var direction = "down";
}
else if(st === lastScrollTop)
{
//In IE this is an important condition because there seems to be some instances where the last scrollTop is equal to the new one
}
else {
var direction = "up";
}
lastScrollTop = st;
var scrollPos = $(this).scrollTop(),
//items = event.data.items; //items = event.data.items;
items = "li .subcat a"; items = "li .subcat a";
if ( timer ) clearTimeout(timer); if ( timer ) clearTimeout(timer);
timer = setTimeout(function(){ timer = setTimeout(function(){
onScrollCover(direction); onScrollCover();
}, 330); }, 330);
$(items).each(function () { $(items).each(function () {
var currLink = $(this); var currLink = $(this);
var refElement = $(currLink.attr("href")); var refElement = $(currLink.attr("href"));
//console.log(currLink); //console.log(currLink);
if (refElement.length && refElement.position().top - 20 <= scrollPos && refElement.position().top + refElement.height() > scrollPos) { if (refElement.length && refElement.position().top - 100 <= scrollPos && refElement.position().top + refElement.height() > scrollPos) {
$('.subcat a').removeClass("active"); $('.subcat a').removeClass("active");
currLink.addClass("active"); currLink.addClass("active");
if ($('nav ul ul').find('li.active')){ if ($('nav ul ul').find('li.active')){
...@@ -407,8 +391,6 @@ $(items).each(function () { ...@@ -407,8 +391,6 @@ $(items).each(function () {
currLink.removeClass("active"); currLink.removeClass("active");
} }
}); });
} }
function scrollAnchor(elemId, skipZero){ function scrollAnchor(elemId, skipZero){
$('.subcat a[href^="#"]').on('click', function (e) { $('.subcat a[href^="#"]').on('click', function (e) {
...@@ -422,17 +404,10 @@ function scrollAnchor(elemId, skipZero){ ...@@ -422,17 +404,10 @@ function scrollAnchor(elemId, skipZero){
temp = 0; temp = 0;
$target = $(target); $target = $(target);
$parent = $('#load-page'); $parent = $('#load-page');
// console.log($parent.position().top);
//console.log($(this).position().top);
//console.log(target , $target.offset().top);
//console.log('parent' , $parent.offset().top);
//if (skipZero && $target.offset().top === $parent.offset().top) {return;}
$(elemId).stop().animate({ $(elemId).stop().animate({
'scrollTop': $target.position().top - temp //- $parent.offset().top 'scrollTop': $target.position().top - temp //- $parent.offset().top
}, 1000, 'swing', function () { }, 1000, 'swing', function () {
window.location.hash = target; window.location.hash = target;
// $(document).on("scroll", onS1croll);
}); });
}); });
} }
...@@ -442,10 +417,6 @@ $(window).load( function() { ...@@ -442,10 +417,6 @@ $(window).load( function() {
var timer; var timer;
$(window).scroll(function(e) { $(window).scroll(function(e) {
onScroll(e) onScroll(e)
/* clearTimeout(timer);
timer = setTimeout(function() {
$(window).trigger("scrollStop");
}, 330);*/
}); });
//$(window).bind("scrollStop",onScroll) //$(window).bind("scrollStop",onScroll)
$(document).ready(function(){ $(document).ready(function(){
...@@ -472,13 +443,9 @@ $(document).ready(function(){ ...@@ -472,13 +443,9 @@ $(document).ready(function(){
$.fn.responsive(); $.fn.responsive();
$('.list-color-filter li').setBgColorList(); $('.list-color-filter li').setBgColorList();
$.fn.animation(); //Global animation for entire site $.fn.animation(); //Global animation for entire site
//TODO //TODO
$('.cover-wrapper').last().addClass('last'); $('.cover-wrapper').last().addClass('last');
$('.cover-wrapper').first().addClass('first'); $('.cover-wrapper').first().addClass('first');
}); //end document ready }); //end document ready
$(window).resize(function() { $(window).resize(function() {
......
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