From acea47dcb96924d73fc491e6419dc7d1a1bc550e Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Fri, 13 Sep 2013 18:20:43 +0200 Subject: [PATCH] fix typo in less --- templates/default/assets/js/script.js | 246 +++++++++--------- .../assets/themes/default/less/theme.less | 2 +- 2 files changed, 127 insertions(+), 121 deletions(-) diff --git a/templates/default/assets/js/script.js b/templates/default/assets/js/script.js index adbd2c30a..18581ed1e 100644 --- a/templates/default/assets/js/script.js +++ b/templates/default/assets/js/script.js @@ -2,150 +2,156 @@ (function($) { -/* ------------------------------------------------------------------ - onLoad Function -------------------------------------------------- */ - $(document).ready(function(){ + /* ------------------------------------------------------------------ + onLoad Function -------------------------------------------------- */ + $(document).ready(function(){ - // Main Navigation Hover - $('.nav-main') - .on('click.subnav', '[data-toggle=dropdown]', function(event){ - if($(this).parent().hasClass('open') && $(this).is(event.target)) - return false; - }) - .on('mouseenter.subnav', '.dropdown', function(event){ - if($(this).hasClass('open')) - return; + // Main Navigation Hover + $('.nav-main') + .on('click.subnav', '[data-toggle=dropdown]', function(event){ + if($(this).parent().hasClass('open') && $(this).is(event.target)) + return false; + }) + .on('mouseenter.subnav', '.dropdown', function(event){ + if($(this).hasClass('open')) + return; - $(this).addClass('open'); - }) - .on('mouseleave.subnav', '.dropdown', function(){ - if(!$(this).hasClass('open')) - return; - $(this).removeClass('open'); - }); + $(this).addClass('open'); + }) + .on('mouseleave.subnav', '.dropdown', function(){ + if(!$(this).hasClass('open')) + return; + $(this).removeClass('open'); + }); - // Tooltip - $('body').tooltip({ - selector: '[data-toggle=tooltip]' - }); + // Tooltip + $('body').tooltip({ + selector: '[data-toggle=tooltip]' + }); - // Toolbar - var $category_products = $('#category-products'); - if($category_products.size() > 0){ - var $parent = $category_products.parent(); + // Toolbar + var $category_products = $('#category-products'); + if($category_products.size() > 0){ + var $parent = $category_products.parent(); - $parent.on('click.view-mode', '[data-toggle=view]', function(){ - if( ($(this).hasClass('btn-grid') && $parent.hasClass('grid')) || ($(this).hasClass('btn-list') && $parent.hasClass('list'))) - return; + $parent.on('click.view-mode', '[data-toggle=view]', function(){ + if( ($(this).hasClass('btn-grid') && $parent.hasClass('grid')) || ($(this).hasClass('btn-list') && $parent.hasClass('list'))) + return; - $parent.toggleClass('grid').toggleClass('list'); + $parent.toggleClass('grid').toggleClass('list'); - return false; - }); - } + return false; + }); + } - // Login -/* var $form_login = $('#form-login'); - if($form_login.size() > 0) { - $form_login.on('change.account', ':radio', function(){ - if($(this).val() === '0') - $('#password', $form_login).val('').prop('disabled', true); // Disabled (new customer) - else - $('#password', $form_login).prop('disabled', false); // Enabled - }).find(':radio:checked').trigger('change.account'); - }*/ + // Login + var $form_login = $('#form-login'); + if($form_login.size() > 0) { + $form_login.on('change.account', ':radio', function(){ + if($(this).val() === '0') + $('#password', $form_login).val('').prop('disabled', true); // Disabled (new customer) + else + $('#password', $form_login).prop('disabled', false); // Enabled + }).find(':radio:checked').trigger('change.account'); + } - // Forgot Password -/* - var $forgot_password = $('.forgot-password', $form_login); - if($forgot_password.size() > 0) { - $forgot_password.popover({ - html : true, - title: 'Forgot Password', - content: function() { - return $('#form-forgotpassword').html(); - } - }).on('click.btn-forgot', function(){ + // Forgot Password + /* + var $forgot_password = $('.forgot-password', $form_login); + if($forgot_password.size() > 0) { + $forgot_password.popover({ + html : true, + title: 'Forgot Password', + content: function() { + return $('#form-forgotpassword').html(); + } + }).on('click.btn-forgot', function(){ - $('.btn-forgot').click(function(){ - alert('click form'); - return false; - }); + $('.btn-forgot').click(function(){ + alert('click form'); + return false; + }); - $('.btn-close').click(function(){ - $forgot_password.popover('hide'); - }); + $('.btn-close').click(function(){ + $forgot_password.popover('hide'); + }); - return false; - }); - } -*/ + return false; + }); + } + */ - //.Form Filters - $('#form-filters').each(function(){ - var $form = $(this); + //.Form Filters + $('#form-filters').each(function(){ + var $form = $(this); - $form - .on('change.filter', ':checkbox', function(){ - $form.submit(); - }) - .find('.group-btn > .btn').addClass('sr-only'); - }); + $form + .on('change.filter', ':checkbox', function(){ + $form.submit(); + }) + .find('.group-btn > .btn').addClass('sr-only'); + }); - // Product details Thumbnails - $('#product-gallery').each(function(){ - var $thumbnails = $('.thumbnail', this), - $image = $('.product-image > img', this); + // Product details Thumbnails + $('#product-gallery').each(function(){ + var $item = $('.item', this), + $thumbnails = $('.thumbnail', this), + $image = $('.product-image > img', this); - $(this).on('click.thumbnails', '.thumbnail', function(){ - if($(this).hasClass('active')) - return false; + // Show Carousel control if needed + if($item.size() > 1){ + $('#product-thumbnails', this).carousel({interval: false}).find('.carousel-control').show(); + } - $image.attr('src',$(this).attr('href')); - $thumbnails.removeClass('active'); - $(this).addClass('active'); + $(this).on('click.thumbnails', '.thumbnail', function(){ + if($(this).hasClass('active')) + return false; - return false; - }); - }); + $image.attr('src',$(this).attr('href')); + $thumbnails.removeClass('active'); + $(this).addClass('active'); - // Payment Method - $('#payment-method').each(function(){ - var $label = $('label', this); - $label.on('change', ':radio', function(){ - $label.removeClass('active'); - $label.filter('[for="' + $(this).attr('id') + '"]').addClass('active'); - }).filter(':has(:checked)').addClass('active'); - }); + return false; + }); + }); + + // Payment Method + $('#payment-method').each(function(){ + var $label = $('label', this); + $label.on('change', ':radio', function(){ + $label.removeClass('active'); + $label.filter('[for="' + $(this).attr('id') + '"]').addClass('active'); + }).filter(':has(:checked)').addClass('active'); + }); - // Styliser le message Confirm par Bootstrap sur un formulaire -/* - $('body').on('click', '[data-confirm]', function(){ - var $this = $(this); - bootbox.confirm($(this).attr('data-confirm'), - function(result){ - if(result) { - // Si lien - if($this.attr('href')){ - window.location.href = $this.attr('href'); - }else{ - // Si on doit soumettre un formulaire - var $form = $this.closest("form"); - if($form.size() > 0){ - $form.submit(); - } - } - } - } - ); + // Styliser le message Confirm par Bootstrap sur un formulaire + /* + $('body').on('click', '[data-confirm]', function(){ + var $this = $(this); + bootbox.confirm($(this).attr('data-confirm'), + function(result){ + if(result) { + // Si lien + if($this.attr('href')){ + window.location.href = $this.attr('href'); + }else{ + // Si on doit soumettre un formulaire + var $form = $this.closest("form"); + if($form.size() > 0){ + $form.submit(); + } + } + } + } + ); - return false; - }); -*/ - }); + return false; + }); + */ + }); })(jQuery); diff --git a/templates/default/assets/themes/default/less/theme.less b/templates/default/assets/themes/default/less/theme.less index 62ee4afa0..af005b9b9 100755 --- a/templates/default/assets/themes/default/less/theme.less +++ b/templates/default/assets/themes/default/less/theme.less @@ -853,7 +853,7 @@ td.product, > a, > span { .box-shadow(2px 1px 1px rgba(0, 0, 0, 0.1)); .transition(all 200ms ease-in-out); - #gradient > .vertical(@start-color: lighten(@pagination-bg, 5%); @end-color: @pagination-bg ); + #gradient > .vertical(@start-color: lighten(@pagination-bg, 5%)); @end-color: @pagination-bg ); color: @text-color; font-weight: bold; &:hover,