Commit 6a367699 authored by imac's avatar imac

[Update]Redmine #649 : Structural change + fixed menu

parent f175ed46
...@@ -1883,6 +1883,9 @@ label.chevron.bottom::first-letter { ...@@ -1883,6 +1883,9 @@ label.chevron.bottom::first-letter {
color: #fff; color: #fff;
z-index: 9999999; z-index: 9999999;
} }
.filter-list>input{
display: block;
}
.filter-btn .btn-container{ .filter-btn .btn-container{
height: 100%; height: 100%;
position: relative; position: relative;
......
...@@ -649,6 +649,7 @@ ...@@ -649,6 +649,7 @@
.commercial-details.active-com figure{ .commercial-details.active-com figure{
margin-left: 0; margin-left: 0;
} }
.filter-list>input,
.commercial-details, .commercial-details,
.filter-bloc{ .filter-bloc{
width: 82%; width: 82%;
......
...@@ -667,7 +667,7 @@ var initFunction = function() { ...@@ -667,7 +667,7 @@ var initFunction = function() {
timer = setTimeout(function() { timer = setTimeout(function() {
onScrollCover(); onScrollCover();
}, 330); }, 600);
$(items).each(function() { $(items).each(function() {
var currLink = $(this); var currLink = $(this);
var refElement = $(currLink.attr("href")); var refElement = $(currLink.attr("href"));
...@@ -765,7 +765,7 @@ var initFunction = function() { ...@@ -765,7 +765,7 @@ var initFunction = function() {
$.fn.showSubmenu(); //Catalog subMenu $.fn.showSubmenu(); //Catalog subMenu
setTimeout(function() { setTimeout(function() {
onScrollCover(); onScrollCover();
}, 500); }, 600);
$('#fullpage').fullpageSlide(); //Stories $('#fullpage').fullpageSlide(); //Stories
$.fn.responsive(); $.fn.responsive();
$('.list-color-filter li').setBgColorList(); $('.list-color-filter li').setBgColorList();
......
...@@ -98,7 +98,7 @@ jQuery("#map-search").bind('submit',function(e) { ...@@ -98,7 +98,7 @@ jQuery("#map-search").bind('submit',function(e) {
}); });
}); });
//Highlight zone when select country //Highlight zone when select country
jQuery(document).find("#selectCountry").on('change',function(e) { jQuery(document).on('change','#selectCountry',function(e) {
var country = e.target.value, var country = e.target.value,
initialClassDep = 'st3', initialClassDep = 'st3',
initialClassNum = 'st5'; initialClassNum = 'st5';
......
...@@ -32,7 +32,6 @@ function loadProductContent() { ...@@ -32,7 +32,6 @@ function loadProductContent() {
$('.variations_form').on('reset_data', function() $('.variations_form').on('reset_data', function()
{ {
console.log("reset data");
$attributes = $('.variations .list'); $attributes = $('.variations .list');
var num_attr = $('.variations .list').length; var num_attr = $('.variations .list').length;
// alert(num_attr); // alert(num_attr);
...@@ -42,7 +41,7 @@ function loadProductContent() { ...@@ -42,7 +41,7 @@ function loadProductContent() {
//alert($attr.hasClass('first_attr')); //alert($attr.hasClass('first_attr'));
if (!$attr.hasClass("first_attr") || num_attr == 1) if (!$attr.hasClass("first_attr") || num_attr == 1)
{ {
console.log(i, $attr, $attr.find('input:not(:disabled):checked').length); // console.log(i, $attr, $attr.find('input:not(:disabled):checked').length);
if (!$attr.find('input:not(:disabled):checked').length) if (!$attr.find('input:not(:disabled):checked').length)
{ {
$firstInput = $attr.find('input:not(:disabled)').first(); $firstInput = $attr.find('input:not(:disabled)').first();
...@@ -60,11 +59,11 @@ function loadProductContent() { ...@@ -60,11 +59,11 @@ function loadProductContent() {
}); });
function onFoundVariation() function onFoundVariation()
{ {
console.log('found variation'); //console.log('found variation');
$('.list').first().find('input:disabled').prop('disabled',false); $('.list').first().find('input:disabled').prop('disabled',false);
//$('.variations_form .format_list input').prop('checked',false); //$('.variations_form .format_list input').prop('checked',false);
$('.variations_form .color-list input:disabled').prop('disabled',false); $('.variations_form .color-list input:disabled').prop('disabled',false);
console.log('found', $('.variations_form .format-list input:checked + * + .format-desc')); //console.log('found', $('.variations_form .format-list input:checked + * + .format-desc'));
//var format = $('.variations_form .format-list input:checked + * + .format-desc').text(); //var format = $('.variations_form .format-list input:checked + * + .format-desc').text();
var format=''; var format='';
$('.variations_form .format-list input:checked + * + .format-desc ').each(function() { $('.variations_form .format-list input:checked + * + .format-desc ').each(function() {
...@@ -256,7 +255,6 @@ $(function(){ ...@@ -256,7 +255,6 @@ $(function(){
}else{ }else{
$('#download').addClass('disabled'); $('#download').addClass('disabled');
} }
console.log('dwnld');
} }
$.fn.slider_product = function(){ $.fn.slider_product = 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