dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updating styles

Browse Source
This commit is contained in:
alexey-svistunov
2013-11-13 10:01:04 +02:00
parent e7abdee44a
commit a7aea1d018
23 changed files with 354 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default-bootstrap/category.tpl
+1 -1
View File
@@ -72,7 +72,7 @@
{/if}
</div>
{/if}
<h1 class="page-heading product-listing">
<h1 class="page-heading{if (isset($subcategories) && !$products) || (isset($subcategories) && $products)} product-listing{/if}">
{strip}
{$category->name|escape:'htmlall':'UTF-8'}
{if isset($categoryNameComplement)}
themes/default-bootstrap/css/global.css
+25 -13
View File
@@ -165,6 +165,12 @@ p.info-account {
float: left;
}
.label {
white-space: normal;
display: inline-block;
padding: 6px 10px;
}
.required sup {
color: #f13340;
font-size: 13px;
@@ -697,7 +703,7 @@ table.table_block td {
.price-percent-reduction {
background: #f13340;
border: 1px solid #d02a2c;
font: 600 21px/26px "Open Sans", sans-serif;
font: 600 21px/24px "Open Sans", sans-serif;
color: white;
padding: 0 5px 0 3px;
display: inline-block;
@@ -889,6 +895,7 @@ table.table_block td {
***************************************************************************************************/
#home-page-tabs {
border: none;
background: white;
}
@media (min-width: 768px) {
#home-page-tabs {
@@ -1006,6 +1013,9 @@ table.table_block td {
padding-top: 20px;
border-top: 1px solid #d6d4d4;
}
.block .list-block .form-group select {
max-width: 270px;
}
.block .list-block .btn {
margin-top: 12px;
}
@@ -1759,6 +1769,7 @@ div.star_hover a, div.star a:hover {
#header {
padding-bottom: 21px;
position: relative;
background: white;
/* languages/currencies */
}
#header .header-row {
@@ -1894,7 +1905,7 @@ div.star_hover a, div.star a:hover {
position: absolute;
top: 37px;
left: 0;
width: 166px;
width: 157px;
background: #333333;
z-index: 2;
}
@@ -1952,7 +1963,7 @@ div.star_hover a, div.star a:hover {
font-weight: bold;
font-size: 12px;
line-height: 24px;
height: 26px;
min-height: 26px;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
-ms-border-radius: 3px;
@@ -1964,20 +1975,15 @@ div.star_hover a, div.star a:hover {
z-index: 1;
}
.breadcrumb .navigation-pipe {
float: left;
width: 18px;
display: inline-block;
text-indent: -5000px;
}
.breadcrumb .navigation_page {
float: left;
}
.breadcrumb a {
display: inline-block;
float: left;
background: white;
padding: 0 8px 0 22px;
margin-left: -20px;
margin-left: -26px;
position: relative;
z-index: 2;
color: #333333;
@@ -1996,15 +2002,21 @@ div.star_hover a, div.star a:hover {
-webkit-border-bottom-left-radius: 3px;
border-bottom-left-radius: 3px;
z-index: 99;
line-height: 22px;
display: inline-block;
height: 24px;
}
.breadcrumb a.home i {
vertical-align: -1px;
}
.breadcrumb a:after {
display: inline-block;
content: ".";
position: absolute;
right: -6px;
top: 0;
width: 24px;
height: 24px;
right: -10px;
top: 3px;
width: 18px;
height: 18px;
background: white;
border-right: 1px solid #d6d4d4;
border-top: 1px solid #d6d4d4;
themes/default-bootstrap/css/modules/blockcart/blockcart.css
+9
View File
@@ -90,6 +90,15 @@
}
#cart_block #cart-buttons a#button_order_cart {
margin-right: 0;
background: #43b155;
border-color: #399b49 #369946 #208931 #369946;
}
#cart_block #cart-buttons a#button_order_cart span {
border-color: #73ca77;
}
#cart_block #cart-buttons a#button_order_cart:hover {
background: #359144;
color: white;
}
/*******************************************************************
themes/default-bootstrap/css/modules/blocknewsletter/blocknewsletter.css
+15 -2
View File
@@ -63,6 +63,7 @@
color: white;
padding: 5px 43px 5px 12px;
display: inline-block;
float: left;
}
#footer #newsletter_block_left .form-group .form-control:focus {
-webkit-box-shadow: black 0px 0px 0px;
@@ -70,11 +71,12 @@
box-shadow: black 0px 0px 0px;
}
#footer #newsletter_block_left .form-group .button-small {
margin-left: -41px;
margin-left: -42px;
border: none;
background: none;
text-align: center;
color: #908f8f;
padding: 8px;
}
#footer #newsletter_block_left .form-group .button-small:before {
content: "";
@@ -89,8 +91,19 @@
display: none;
}
#footer #newsletter_block_left .warning_inline {
display: inline-block;
display: block;
color: #f13340;
font-size: 13px;
line-height: 26px;
clear: both;
}
@media (min-width: 1200px) {
#footer #newsletter_block_left .warning_inline {
display: inline-block;
position: relative;
top: -35px;
margin-bottom: -35px;
left: 15px;
clear: none;
}
}
themes/default-bootstrap/css/order-opc.css
+1
View File
@@ -14,6 +14,7 @@
#order-opc .page-heading.step-num {
position: relative;
padding-left: 45px;
overflow: visible;
}
#order-opc .page-heading.step-num span {
font-weight: bold;
themes/default-bootstrap/css/product_list.css
+42 -6
View File
@@ -106,6 +106,9 @@ ul.product_list.grid > li .product-container .product-image-container .content_p
ul.product_list.grid > li .product-container .product-image-container .content_price span {
color: white;
}
ul.product_list.grid > li .product-container .product-image-container .content_price span.old-price {
color: #b1b0b0;
}
ul.product_list.grid > li .product-container h5 {
padding: 0 15px 7px 15px;
min-height: 53px;
@@ -197,23 +200,27 @@ ul.product_list.grid > li .product-container .functional-buttons div.compare lab
content: "";
}
@media (min-width: 1200px) {
ul.product_list.grid > li .product-container:hover {
ul.product_list.grid > li.hovered {
margin-bottom: -300px;
padding-bottom: 250px;
}
ul.product_list.grid > li.hovered .product-container {
-webkit-box-shadow: rgba(0, 0, 0, 0.17) 0 0 13px;
-moz-box-shadow: rgba(0, 0, 0, 0.17) 0 0 13px;
box-shadow: rgba(0, 0, 0, 0.17) 0 0 13px;
position: relative;
z-index: 2;
z-index: 10;
}
ul.product_list.grid > li .product-container:hover .content_price {
ul.product_list.grid > li.hovered .product-container .content_price {
display: none;
}
ul.product_list.grid > li .product-container:hover .product-image-container .content_price {
ul.product_list.grid > li.hovered .product-container .product-image-container .content_price {
display: block;
}
ul.product_list.grid > li .product-container:hover .product-image-container .quick-view {
ul.product_list.grid > li.hovered .product-container .product-image-container .quick-view {
display: block;
}
ul.product_list.grid > li .product-container:hover .button-container, ul.product_list.grid > li .product-container:hover .functional-buttons {
ul.product_list.grid > li.hovered .product-container .functional-buttons, ul.product_list.grid > li.hovered .product-container .button-container {
display: block;
}
}
@@ -228,6 +235,26 @@ ul.product_list.grid > li .product-container .functional-buttons div.compare lab
}
}
@media (min-width: 1200px) {
#blockpack ul > li.last-line {
border: none;
padding-bottom: 0;
margin-bottom: 0;
}
#blockpack ul > li.last-line.hovered {
margin-bottom: -289px;
padding-bottom: 250px;
}
}
@media (min-width: 480px) and (max-width: 767px) {
#blockpack ul > li.first-item-of-tablet-line {
clear: none;
}
#blockpack ul > li.first-item-of-mobile-line {
clear: left;
}
}
/*******************************************************
Product list(List) Styles
********************************************************/
@@ -439,6 +466,11 @@ ul.product_list.list > li .right-block .right-block-content .functional-buttons
margin-bottom: 50px;
}
}
@media (min-width: 1200px) {
#index ul.product_list.tab-pane > li.hovered {
margin-bottom: -290px;
}
}
#index ul.product_list.tab-pane > li .availability {
display: none;
}
@@ -448,6 +480,10 @@ ul.product_list.list > li .right-block .right-block-content .functional-buttons
padding-bottom: 0;
margin-bottom: 0;
}
#index ul.product_list.tab-pane > li.last-line.hovered {
margin-bottom: -290px;
padding-bottom: 250px;
}
}
@media (min-width: 480px) and (max-width: 767px) {
#index ul.product_list.tab-pane > li.first-item-of-tablet-line {
themes/default-bootstrap/js/jquery/highdpi.js
Vendored
+7 -29
View File
@@ -3,39 +3,17 @@ function highdpi_init() {
var els = $("img.replace-2x").get();
for(var i = 0; i < els.length; i++) {
var src = els[i].src;
src = src.replace(".png", "2x.png");
src = src.replace(".jpg", "2x.jpg");
src = src.replace(".gif", "2x.gif");
els[i].src = src;
src = els[i].src;
extension = src.substr( (src.lastIndexOf('.') +1) );
src = src.replace("."+extension, "2x."+extension);
var img = new Image();
img.src = src;
img.height != 0 ? els[i].src = src : els[i].src = els[i].src;
}
}
}
$(document).ready(function() {
highdpi_init();
$(".replace-2x").each( function ()
{
$.ajax({
url:$(this).attr('src'),
type:'HEAD',
error:function(){
if($('.replace-2x').css('font-size') == "1px") {
var els = $("img.replace-2x").get();
for(var i = 0; i < els.length; i++) {
var src = els[i].src;
src = src.replace("2x.png", ".png");
src = src.replace("2x.jpg", ".jpg");
src = src.replace("2x.gif", ".gif");
els[i].src = src;
}
}
},
success:function(){}
});
});
});
themes/default-bootstrap/js/jquery/resonsive_utilites.js
Vendored
+3 -2
View File
@@ -36,10 +36,11 @@ function tmDropDown (elementType, elementClick, elementSlide, activeClass){
var elementHide = $(elementClick).next(elementSlide);
else
var elementHide = $(elementClick).parents('#header').find(elementSlide);
$(elementHide).slideUp();
$(elementHide).slideUp(),
$(elementClick).removeClass('active')
})
};
$(document).ready(function(){
tmDropDown ('', '#header .current', 'ul.toogle_content', 'active'); // all of this should be defined or left empty brackets
//tmDropDown ('cart', 'li#shopping_cart > a', '#cart_block', 'active'); // all of this should be defined or left empty brackets
});
});
themes/default-bootstrap/js/modules/blockcart/ajax-cart.js
+42 -63
View File
@@ -163,16 +163,29 @@ var ajaxCart = {
},
// Update the cart information
updateCartInformation : function (jsonData, addedFromProductPage)
updateCartInformation : function (jsonData, addedFromProductPage, contentOnly)
{
ajaxCart.updateCart(jsonData);
// if added from Quick View
var contentOnly = contentOnly;
if (addedFromProductPage && typeof(contentOnly) != 'undefined' && (!jsonData.hasError || jsonData.hasError==false))
$.fancybox.close(),
ajaxCart.updateCart(jsonData),
$('.crossseling').html(jsonData.crossSelling);
ajaxCart.updateCart(jsonData);
//reactive the button when adding has finished
if (addedFromProductPage)
$('#add_to_cart button').removeAttr('disabled').removeClass('disabled');
else
$('.ajax_add_to_cart_button').removeAttr('disabled');
},
// close fancybox
updateFancyBox : function ()
{
},
// add a product in the cart via ajax
add : function(idProduct, idCombination, addedFromProductPage, callerElement, quantity, whishlist){
@@ -207,69 +220,34 @@ var ajaxCart = {
// add appliance to whishlist module
if (whishlist && !jsonData.errors)
WishlistAddProductCart(whishlist[0], idProduct, idCombination, whishlist[1]);
// add the picture to the cart
var $element = $(callerElement).parents('.ajax_block_product').find('a.product_image img,a.product_img_link img');
if (!$element.length)
$element = $('#bigpic');
var $picture = $element.clone();
var pictureOffsetOriginal = $element.offset();
pictureOffsetOriginal.right = $(window).innerWidth() - pictureOffsetOriginal.left - $element.width();
if ($picture.length)
{
$picture.css({
position: 'absolute',
top: pictureOffsetOriginal.top,
right: pictureOffsetOriginal.right
});
}
if (typeof(contentOnly) != 'undefined') {
var $contentOnly = contentOnly;
}
var pictureOffset = $picture.offset();
if (($contentOnly && $contentOnly !=true) || !$contentOnly) {
var cartBlock = $('#cart_block');
if (!$('#cart_block')[0] || !$('#cart_block').offset().top || !$('#cart_block').offset().left)
cartBlock = $('#shopping_cart');
var cartBlockOffset = cartBlock.offset();
cartBlockOffset.right = $(window).innerWidth() - cartBlockOffset.left - cartBlock.width();
}
// Check if the block cart is activated for the animation
if (cartBlockOffset != undefined && $picture.length && (($contentOnly && $contentOnly !=true) || !$contentOnly))
{
$picture.appendTo('body');
$picture
.css({
position: 'absolute',
top: pictureOffsetOriginal.top,
right: pictureOffsetOriginal.right,
zIndex: 4242
})
.animate({
width: $element.attr('width')*0.66,
height: $element.attr('height')*0.66,
opacity: 0.2,
top: cartBlockOffset.top + 30,
right: cartBlockOffset.right + 15
}, 1000)
.fadeOut(100, function() {
ajaxCart.updateCartInformation(jsonData, addedFromProductPage);
$(this).remove();
if (!jsonData.hasError)
{
$('.crossseling').html(jsonData.crossSelling)
$(jsonData.products).each(function(){
if (this.id != undefined && this.id == parseInt(idProduct))
ajaxCart.updateLayer(this);
});
}
});
if (typeof(contentOnly) != 'undefined') {
var $contentOnly = contentOnly;
}
else if ($contentOnly && $contentOnly !=false) {
window.parent.ajaxCart.updateCartInformation(jsonData, addedFromProductPage);
//adding product to cart and update Layer Cart
if (($contentOnly && $contentOnly !=true) || !$contentOnly)
{
ajaxCart.updateCartInformation(jsonData, addedFromProductPage);
if (!jsonData.hasError)
{
$('.crossseling').html(jsonData.crossSelling)
$(jsonData.products).each(function(){
if (this.id != undefined && this.id == parseInt(idProduct))
ajaxCart.updateLayer(this);
});
}
}
//adding product to cart and update Layer Cart (Quick View)
else if ($contentOnly && $contentOnly !=false) {
contentOnly = true;
window.parent.ajaxCart.updateCartInformation(jsonData, addedFromProductPage, contentOnly);
if (!jsonData.hasError)
$(jsonData.products).each(function(){
if (this.id != undefined && this.id == parseInt(idProduct))
window.parent.ajaxCart.updateLayer(this);
});
else
$('#add_to_cart button').removeAttr('disabled').removeClass('disabled');
}
else {
ajaxCart.updateCartInformation(jsonData, addedFromProductPage);
@@ -619,6 +597,7 @@ var ajaxCart = {
$('.layer_cart_overlay').css('height','100%');
$('.layer_cart_overlay').show();
$('#layer_cart').css({'top': n}).fadeIn('fast');
$.scrollTo('#layer_cart', 400);
crossselling_serialScroll();
},
themes/default-bootstrap/js/modules/blocklayered/blocklayered.js
+51 -44
View File
@@ -36,10 +36,10 @@ $(document).ready(function()
// Click on color
$('#layered_form input[type=button], #layered_form label.layered_color').live('click', function()
{
if (!$('input[name='+$(this).prop('name')+'][type=hidden]').length)
$('<input />').prop('type', 'hidden').prop('name', $(this).prop('name')).val($(this).prop('rel')).appendTo('#layered_form');
if (!$('input[name='+$(this).attr('name')+'][type=hidden]').length)
$('<input />').attr('type', 'hidden').attr('name', $(this).attr('name')).val($(this).attr('rel')).appendTo('#layered_form');
else
$('input[name='+$(this).prop('name')+'][type=hidden]').remove();
$('input[name='+$(this).attr('name')+'][type=hidden]').remove();
reloadContent();
});
@@ -52,17 +52,17 @@ $(document).ready(function()
// Changing content of an input text
$('#layered_form input.layered_input_range').live('keyup', function()
{
if ($(this).prop('timeout_id'))
window.clearTimeout($(this).prop('timeout_id'));
if ($(this).attr('timeout_id'))
window.clearTimeout($(this).attr('timeout_id'));
// IE Hack, setTimeout do not acept the third parameter
var reference = this;
$(this).prop('timeout_id', window.setTimeout(function(it) {
if (!$(it).prop('id'))
$(this).attr('timeout_id', window.setTimeout(function(it) {
if (!$(it).attr('id'))
it = reference;
var filter = $(it).prop('id').replace(/^layered_(.+)_range_.*$/, '$1');
var filter = $(it).attr('id').replace(/^layered_(.+)_range_.*$/, '$1');
var value_min = parseInt($('#layered_'+filter+'_range_min').val());
if (isNaN(value_min))
@@ -83,9 +83,9 @@ $(document).ready(function()
});
$('#layered_block_left .radio').live('click', function() {
var name = $(this).prop('name');
var name = $(this).attr('name');
$.each($(this).parent().parent().find('input[type=button]'), function (it, item) {
if ($(item).hasClass('on') && $(item).prop('name') != name) {
if ($(item).hasClass('on') && $(item).attr('name') != name) {
$(item).click();
}
});
@@ -95,7 +95,7 @@ $(document).ready(function()
// Click on label
$('#layered_block_left label a').live({
click: function() {
var disable = $(this).parent().parent().find('input').prop('disabled');
var disable = $(this).parent().parent().find('input').attr('disabled');
if (disable == ''
|| typeof(disable) == 'undefined'
|| disable == false)
@@ -109,13 +109,13 @@ $(document).ready(function()
layered_hidden_list = {};
$('.hide-action').live('click', function() {
if (typeof(layered_hidden_list[$(this).parent().find('ul').prop('id')]) == 'undefined' || layered_hidden_list[$(this).parent().find('ul').prop('id')] == false)
if (typeof(layered_hidden_list[$(this).parent().find('ul').attr('id')]) == 'undefined' || layered_hidden_list[$(this).parent().find('ul').attr('id')] == false)
{
layered_hidden_list[$(this).parent().find('ul').prop('id')] = true;
layered_hidden_list[$(this).parent().find('ul').attr('id')] = true;
}
else
{
layered_hidden_list[$(this).parent().find('ul').prop('id')] = false;
layered_hidden_list[$(this).parent().find('ul').attr('id')] = false;
}
hideFilterValueAction(this);
});
@@ -128,10 +128,10 @@ $(document).ready(function()
while ($('#selectPrductSort').length) { // Because ids are duplicated
// Unbind event change on #selectPrductSort
$('#selectPrductSort').unbind('change');
$('#selectPrductSort').prop('onchange', '');
$('#selectPrductSort').attr('onchange', '');
$('#selectPrductSort').addClass('selectProductSort');
$('#selectPrductSort').prop('id', 'selectPrductSort'+id);
$('label[for=selectPrductSort]').prop('for', 'selectPrductSort'+id);
$('#selectPrductSort').attr('id', 'selectPrductSort'+id);
$('label[for=selectPrductSort]').attr('for', 'selectPrductSort'+id);
id++;
}
@@ -145,20 +145,20 @@ $(document).ready(function()
reloadContent();
});
$('.js-nb_item').unbind('change').prop('onchange', '');
$('.js-nb_item').unbind('change').attr('onchange', '');
$('.js-nb_item').live('change', function(event) {
$('.js-nb_item').val($(this).val());
reloadContent();
});
paginationButton();
paginationButton(false);
initLayered();
});
function hideFilterValueAction(it)
{
if (typeof(layered_hidden_list[$(it).parent().find('ul').prop('id')]) == 'undefined' || layered_hidden_list[$(it).parent().find('ul').prop('id')] == false)
if (typeof(layered_hidden_list[$(it).parent().find('ul').attr('id')]) == 'undefined' || layered_hidden_list[$(it).parent().find('ul').attr('id')] == false)
{
$(it).parent().find('.hiddable').hide();
$(it).parent().find('.hide-action.less').hide();
@@ -221,14 +221,14 @@ function initLayered()
function paginationButton(nbProductsIn) {
$('div.pagination a').not(':hidden').each(function () {
if ($(this).prop('href').search('&p=') == -1) {
if ($(this).attr('href').search('&p=') == -1) {
var page = 1;
}
else {
var page = $(this).prop('href').replace(/^.*&p=(\d+).*$/, '$1');
var page = $(this).attr('href').replace(/^.*&p=(\d+).*$/, '$1');
}
var location = window.location.href.replace(/#.*$/, '');
$(this).prop('href', location+current_friendly_url.replace(/\/page-(\d+)/, '')+'/page-'+page);
$(this).attr('href', location+current_friendly_url.replace(/\/page-(\d+)/, '')+'/page-'+page);
});
$('div.pagination li').not('.current, .disabled').each(function () {
var nbPage = 0;
@@ -251,7 +251,8 @@ function paginationButton(nbProductsIn) {
//product count refresh
if(nbProductsIn!=false){
if(isNaN(nbProductsIn) == 0) {
// add variables
var productCountRow = $('.product-count').html();
var nbPage = parseInt($('div.pagination li.current').children().children().html());
@@ -271,37 +272,43 @@ function paginationButton(nbProductsIn) {
productCountRow[5] = nb_products;
productCountRow = productCountRow.join(' ');
$('.product-count').html(productCountRow);
$('.product-count').show();
}
else {
$('.product-count').hide();
}
}
}
function cancelFilter()
{
$('#enabled_filters a').live('click', function(e)
{
if ($(this).prop('rel').search(/_slider$/) > 0)
if ($(this).attr('rel').search(/_slider$/) > 0)
{
if ($('#'+$(this).prop('rel')).length)
if ($('#'+$(this).attr('rel')).length)
{
$('#'+$(this).prop('rel')).slider('values' , 0, $('#'+$(this).prop('rel')).slider('option' , 'min' ));
$('#'+$(this).prop('rel')).slider('values' , 1, $('#'+$(this).prop('rel')).slider('option' , 'max' ));
$('#'+$(this).prop('rel')).slider('option', 'slide')(0,{values:[$('#'+$(this).prop('rel')).slider( 'option' , 'min' ), $('#'+$(this).prop('rel')).slider( 'option' , 'max' )]});
$('#'+$(this).attr('rel')).slider('values' , 0, $('#'+$(this).attr('rel')).slider('option' , 'min' ));
$('#'+$(this).attr('rel')).slider('values' , 1, $('#'+$(this).attr('rel')).slider('option' , 'max' ));
$('#'+$(this).attr('rel')).slider('option', 'slide')(0,{values:[$('#'+$(this).attr('rel')).slider( 'option' , 'min' ), $('#'+$(this).attr('rel')).slider( 'option' , 'max' )]});
}
else if($('#'+$(this).prop('rel').replace(/_slider$/, '_range_min')).length)
else if($('#'+$(this).attr('rel').replace(/_slider$/, '_range_min')).length)
{
$('#'+$(this).prop('rel').replace(/_slider$/, '_range_min')).val($('#'+$(this).prop('rel').replace(/_slider$/, '_range_min')).prop('limitValue'));
$('#'+$(this).prop('rel').replace(/_slider$/, '_range_max')).val($('#'+$(this).prop('rel').replace(/_slider$/, '_range_max')).prop('limitValue'));
$('#'+$(this).attr('rel').replace(/_slider$/, '_range_min')).val($('#'+$(this).attr('rel').replace(/_slider$/, '_range_min')).attr('limitValue'));
$('#'+$(this).attr('rel').replace(/_slider$/, '_range_max')).val($('#'+$(this).attr('rel').replace(/_slider$/, '_range_max')).attr('limitValue'));
}
}
else
{
if ($('option#'+$(this).prop('rel')).length)
if ($('option#'+$(this).attr('rel')).length)
{
$('#'+$(this).prop('rel')).parent().val('');
$('#'+$(this).attr('rel')).parent().val('');
}
else
{
$('#'+$(this).prop('rel')).prop('checked', false);
$('.'+$(this).prop('rel')).prop('checked', false);
$('#layered_form input[type=hidden][name='+$(this).prop('rel')+']').remove();
$('#'+$(this).attr('rel')).attr('checked', false);
$('.'+$(this).attr('rel')).attr('checked', false);
$('#layered_form input[type=hidden][name='+$(this).attr('rel')+']').remove();
}
}
reloadContent();
@@ -315,13 +322,13 @@ function openCloseFilter()
{
if ($(this).html() == '&lt;')
{
$('#'+$(this).prop('rel')).show();
$('#'+$(this).attr('rel')).show();
$(this).html('v');
$(this).parent().removeClass('closed');
}
else
{
$('#'+$(this).prop('rel')).hide();
$('#'+$(this).attr('rel')).hide();
$(this).html('&lt;');
$(this).parent().addClass('closed');
}
@@ -354,7 +361,7 @@ function reloadContent(params_plus)
var sliderStart = $(this).slider('values', 0);
var sliderStop = $(this).slider('values', 1);
if (typeof(sliderStart) == 'number' && typeof(sliderStop) == 'number')
data += '&'+$(this).prop('id')+'='+sliderStart+'_'+sliderStop;
data += '&'+$(this).attr('id')+'='+sliderStart+'_'+sliderStop;
});
$(['price', 'weight']).each(function(it, sliderType)
@@ -366,9 +373,9 @@ function reloadContent(params_plus)
});
$('#layered_form .select option').each( function () {
if($(this).prop('id') && $(this).parent().val() == $(this).val())
if($(this).attr('id') && $(this).parent().val() == $(this).val())
{
data += '&'+$(this).prop('id') + '=' + $(this).val();
data += '&'+$(this).attr('id') + '=' + $(this).val();
}
});
@@ -465,7 +472,7 @@ function reloadContent(params_plus)
val = $('div.pagination .js-nb_item').val();
$('div.pagination .js-nb_item').children().each(function(it, option) {
if (option.value == val)
$(option).prop('selected', true);
$(option).attr('selected', true);
else
$(option).removeAttr('selected');
});
@@ -557,7 +564,7 @@ function updateProductUrl()
'ul.product_list li.ajax_block_product h5 a,'+
'ul.product_list li.ajax_block_product .product_desc a,'+
'ul.product_list li.ajax_block_product .lnk_view'), function() {
$(this).prop('href', $(this).prop('href') + param_product_url);
$(this).attr('href', $(this).attr('href') + param_product_url);
});
}
}
themes/default-bootstrap/js/stores.js
+3 -2
View File
@@ -80,8 +80,9 @@ function clearLocations(n)
option.innerHTML = '1'+' '+translation_2;
else
option.innerHTML = n+' '+translation_3;
}
}
locationSelect.appendChild(option);
$("select#locationSelect").uniform();
$('#stores-table tr.node').remove();
}
@@ -95,6 +96,7 @@ function searchLocationsNear(center)
var bounds = new google.maps.LatLngBounds();
clearLocations(markerNodes.length);
$('table#stores-table').find('tbody tr').remove();
for (var i = 0; i < markerNodes.length; i++)
{
var name = markerNodes[i].getAttribute('name');
@@ -112,7 +114,6 @@ function searchLocationsNear(center)
createOption(name, distance, i);
createMarker(latlng, name, address, other, id_store, has_store_picture);
bounds.extend(latlng);
$('table#stores-table').find('tbody').append('<tr ><td class="num">'+parseInt(i + 1)+'</td><td class="name">'+(has_store_picture == 1 ? '<img src="'+img_store_dir+parseInt(id_store)+'-stores_default.jpg" alt="" />' : '')+'<span>'+name+'</span></td><td class="address">'+address+(phone !== '' ? ''+translation_4+' '+phone : '')+'</td><td class="distance">'+distance+' '+distance_unit+'</td></tr>');
$('#stores-table').show();
}
themes/default-bootstrap/lang/en.php
+1 -1
View File
@@ -95,7 +95,7 @@ $_LANG['history_bd0e34e5be6447844e6f262d51f1a9dc'] = 'Price Rules';
$_LANG['history_ec53a8c4f07baed5d8825072c89799be'] = 'Status';
$_LANG['history_466eadd40b3c10580e3ab4e8061161ce'] = 'Invoice';
$_LANG['history_bcd1b68617759b1dfcff0403a6b5a8d1'] = 'PDF';
$_LANG['history_0b3db27bc15f682e92ff250ebb167d4b'] = 'Back to your account.';
$_LANG['history_0b3db27bc15f682e92ff250ebb167d4b'] = 'Back to your account';
$_LANG['history_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
$_LANG['history_01abfc750a0c942167651c40d088531d'] = '#';
$_LANG['identity_19f823c6453c2b1ffd09cb715214813d'] = 'Required field';
themes/default-bootstrap/modules/blockcart/blockcart.tpl
-1
View File
@@ -182,7 +182,6 @@ var generated_date = {$smarty.now|intval};
{/if}
{/if}
<p id="cart-buttons">
{if $order_process == 'order'}<a href="{$link->getPageLink("$order_process", true)|escape:'html'}" class="btn btn-default button button-small" title="{l s='View my shopping cart' mod='blockcart'}" rel="nofollow"><span>{l s='Cart' mod='blockcart'}<i class="icon-chevron-right right"></i></span></a>{/if}
<a href="{$link->getPageLink("$order_process", true)|escape:'html'}" id="button_order_cart" class="btn btn-default button button-small" title="{l s='Check out' mod='blockcart'}" rel="nofollow"><span>{l s='Check out' mod='blockcart'}<i class="icon-chevron-right right"></i></span></a>
</p>
</div>
themes/default-bootstrap/modules/blocklayered/blocklayered-no-products.tpl
+27
View File
@@ -0,0 +1,27 @@
{*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registred Trademark & Property of PrestaShop SA
*}
<div class="product_list">
<p class="alert alert-warning">{l s='There are no products.' mod='blocklayered'}</p>
</div>
themes/default-bootstrap/modules/crossselling/crossselling.tpl
+1 -1
View File
@@ -24,7 +24,7 @@
*}
{if isset($orderProducts) && count($orderProducts)}
<section id="crossselling" class="page-product-box">
<h3 class="productscategory_h2 page-product-heading">{l s='Customers who bought this product also bought:' mod='crossselling'}</h3>
<h3 class="productscategory_h2 page-product-heading">{if $page_name == 'product'}{l s='Customers who bought this product also bought:' mod='crossselling'}{else}{l s='We recommend' mod='crossselling'}{/if}</h3>
<div id="crossselling_list">
<ul id="crossselling_list_car" class="clearfix">
{foreach from=$orderProducts item='orderProduct' name=orderProduct}
themes/default-bootstrap/order-opc.tpl
+1 -1
View File
@@ -102,7 +102,7 @@
<!-- END Payment -->
{else}
{capture name=path}{l s='Your shopping cart'}{/capture}
<h2>{l s='Your shopping cart'}</h2>
<h2 class="page-heading">{l s='Your shopping cart'}</h2>
<p class="alert alert-warning">{l s='Your shopping cart is empty.'}</p>
{/if}
{/if}
themes/default-bootstrap/product-list.tpl
+18 -2
View File
@@ -31,8 +31,9 @@
{else}
<script type="text/javascript">
$('document').ready(function(){
blockHover();
if (typeof reloadProductComparison != 'undefined')
reloadProductComparison()
reloadProductComparison();
});
</script>
{assign var='nbItemsPerLine' value=4}
@@ -132,7 +133,21 @@
</ul>
<!-- Script for transformation Grid/List layouts -->
<script type="text/javascript">
function blockHover(status) {
$('.product_list.grid li.ajax_block_product').each(function() {
$(this).find('.product-container').hover(
function(){
if ($('body').find('.container').width() == 1170)
$(this).parent().addClass('hovered');
},
function(){
if ($('body').find('.container').width() == 1170)
$(this).parent().removeClass('hovered');
}
)});
}
</script>
{if $page_name !='index' && $page_name !='product'} <!--// excluding page for Grid/List-->
<script type="text/javascript"><!--
function display(view) {
@@ -208,6 +223,7 @@
ajaxCart.overrideButtonsInThePage();
if (typeof quick_view != 'undefined') // qick view button reload
quick_view();
blockHover();
}
}
view = $.totalStorage('display');
themes/default-bootstrap/product.tpl
+1 -1
View File
@@ -405,7 +405,7 @@ var contentOnly = {if $content_only}true{else}false{/if}
<div class="clear"></div>
</div>
<div class="product_attributes">
<div class="product_attributes clearfix">
<!-- quantity wanted -->
<p id="quantity_wanted_p"{if (!$allow_oosp && $product->quantity <= 0) OR $virtual OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}>
themes/default-bootstrap/sass/global.scss
+26 -12
View File
@@ -118,6 +118,7 @@ p.info-account {
}
}
}
.label {white-space:normal; display:inline-block; padding:6px 10px;}
.required {
sup {
@@ -620,7 +621,7 @@ table.table_block td {
.price-percent-reduction {
background:#f13340;
border:1px solid #d02a2c;
font:600 21px/26px $font-custom;
font:600 21px/24px $font-custom;
color:$light-text-color;
padding:0 5px 0 3px;
display:inline-block;
@@ -774,6 +775,7 @@ table.table_block td {
***************************************************************************************************/
#home-page-tabs {
border:none;
background:$light-background;
@media (min-width: $screen-sm) { // min 768px
padding:10px 0;
margin:0 0 0 -18px;
@@ -883,7 +885,14 @@ table.table_block td {
&:first-child {border-top:none;}
}
.form-group { padding-top:20px; border-top:1px solid $base-border-color;}
.form-group {
padding-top:20px;
border-top:1px solid $base-border-color;
select {
max-width:270px;
}
}
.btn {margin-top:12px;}
}
@@ -1596,6 +1605,7 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
#header {
padding-bottom:21px;
position:relative;
background:$light-background;
.header-row {
background:$dark-background;
@@ -1713,7 +1723,7 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
position:absolute;
top:37px;
left:0;
width:166px;
width:157px;
background:$dark-background;
z-index:2;
@@ -1772,7 +1782,7 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
font-weight:bold;
font-size:12px;
line-height:24px;
height:26px;
min-height:26px;
@include border-radius(3px);
overflow:hidden;
margin-bottom:16px;
@@ -1780,19 +1790,16 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
z-index:1;
.navigation-pipe {
float:left;
width:18px;
display:inline-block;
text-indent:-5000px;
}
.navigation_page { float:left;}
a {
display:inline-block;
float:left;
background:$light-background;
padding:0 8px 0 22px;
margin-left:-20px;
margin-left:-26px;
position:relative;
z-index:2;
color:$base-text-color;
@@ -1807,16 +1814,23 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
@include border-top-left-radius(3px);
@include border-bottom-left-radius(3px);
z-index:99;
line-height:22px;
display:inline-block;
height:24px;
i {
vertical-align:-1px;
}
}
&:after {
display:inline-block;
content:".";
position:absolute;
right:-6px;
top:0;
width:24px;
height:24px;
right:-10px;
top:3px;
width:18px;
height:18px;
background:$light-background;
border-right:1px solid $base-border-color;
border-top:1px solid $base-border-color;
themes/default-bootstrap/sass/modules/blockcart/blockcart.scss
+9 -1
View File
@@ -108,7 +108,15 @@
margin-right:10px;
&#button_order_cart {
margin-right:0;
margin-right:0;
background:#43b155;
border-color:#399b49 #369946 #208931 #369946;
span {
border-color:#73ca77;
}
&:hover {background:#359144; color:$light-text-color;}
}
}
}
themes/default-bootstrap/sass/modules/blocknewsletter/blocknewsletter.scss
+17 -4
View File
@@ -54,7 +54,9 @@
border:none;
}
.block_content {overflow:hidden;}
.block_content {
overflow:hidden;
}
.form-group {
margin-bottom:0;
@@ -67,6 +69,7 @@
color:$light-text-color;
padding:5px 43px 5px 12px;
display:inline-block;
float:left;
&:focus {
@include box-shadow(black 0px 0px 0px);
@@ -74,11 +77,12 @@
}
.button-small {
margin-left:-41px;
margin-left:-42px;
border:none;
background:none;
text-align:center;
color:#908f8f;
padding:8px;
&:before {
content:"";
@@ -96,10 +100,19 @@
}
.warning_inline {
display:inline-block;
display:block;
color:#f13340;
font-size:13px;
line-height:26px;
line-height:26px;
clear:both;
@media (min-width: $screen-lg) { // min 1200px
display:inline-block;
position:relative;
top:-35px;
margin-bottom:-35px;
left:15px;
clear:none;
}
}
}
}
themes/default-bootstrap/sass/order-opc.scss
+1
View File
@@ -15,6 +15,7 @@
.page-heading.step-num {
position:relative;
padding-left:45px;
overflow:visible;
span {
font-weight:bold;
themes/default-bootstrap/sass/product_list.scss
+53 -18
View File
@@ -117,6 +117,8 @@ ul.product_list.grid {
span {
color:$light-text-color;
&.old-price {color:#b1b0b0;}
}
}
}
@@ -204,27 +206,29 @@ ul.product_list.grid {
}
}
}
}
@media (min-width: $screen-lg) { // min 1200px
&.hovered {
margin-bottom:-300px;
padding-bottom:250px;
@media (min-width: $screen-lg) { // min 1200px
&:hover {
@include box-shadow(rgba(black, 0.17) 0 0 13px);
position:relative;
z-index:2;
.content_price { display:none;}
.product-image-container {
.content_price {
display:block;
}
.quick-view {display:block;}
.product-container {
@include box-shadow(rgba(black, 0.17) 0 0 13px);
position:relative;
z-index:10;
.content_price { display:none;}
.product-image-container {
.content_price {
display:block;
}
.button-container, .functional-buttons {display:block;}
.quick-view {display:block;}
}
.functional-buttons, .button-container {display:block}
}
}
}
@media (min-width: $screen-md) { // min 991px
&.first-in-line {clear:left;}
}
@@ -234,7 +238,28 @@ ul.product_list.grid {
}
}
}
#blockpack {
ul {
>li {
@media (min-width: $screen-lg) { // min 1200px
&.last-line {
border:none;
padding-bottom:0;
margin-bottom:0;
&.hovered {
margin-bottom:-289px;
padding-bottom:250px;
}
}
}
@media (min-width: $screen-xs) and (max-width: $screen-xs-max) { // min 480px max 767px
&.first-item-of-tablet-line {clear:none;}
&.first-item-of-mobile-line {clear:left;}
}
}
}
}
/*******************************************************
Product list(List) Styles
********************************************************/
@@ -456,13 +481,23 @@ ul.product_list.list {
margin-bottom:50px;
}
@media (min-width: $screen-lg) { // min 1200px
&.hovered {
margin-bottom:-290px;
}
}
.availability {display:none;}
@media (min-width: $screen-lg) { // min 1200px
&.last-line {
border:none;
padding-bottom:0;
margin-bottom:0;
margin-bottom:0;
&.hovered {
margin-bottom:-290px;
padding-bottom:250px;
}
}
}