Merge pull request #1017 from TMMeilleur/bootstrap

// fixes for cross-browser compability
This commit is contained in:
Rémi Gaillard
2013-11-22 05:50:37 -08:00
54 changed files with 345 additions and 155 deletions
+1 -1
View File
@@ -72,7 +72,7 @@
{/if}
</div>
{/if}
<h1 class="page-heading{if (isset($subcategories) && !$products) || (isset($subcategories) && $products)} product-listing{/if}">
<h1 class="page-heading{if (isset($subcategories) && !$products) || (isset($subcategories) && $products) || !isset($subcategories) && $products} product-listing{/if}">
{strip}
{$category->name|escape:'html':'UTF-8'}
{if isset($categoryNameComplement)}
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/*******************************************************
Addresses Styles
********************************************************/
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/**********************************************************
Authentication Styles
**********************************************************/
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/* ************************************************************************************************
Categories Page Styles
************************************************************************************************ */
-1
View File
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/**************************************************************
CMS Pages Styles
***************************************************************/
+4 -1
View File
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/********************************************************************
Compare Page Styles
********************************************************************/
@@ -83,6 +82,10 @@ table#product_comparison .comparison_unit_price {
font-style: italic;
}
.ie8 table#product_comparison .product-image-block .product_image img {
width: auto;
}
.footer_link {
margin-bottom: 20px;
}
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/**************************************************************************
Contact Page Styles
**************************************************************************/
+63 -12
View File
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/* ##################################################################################################
PRESTASHOP SCSS
################################################################################################## */
@@ -797,6 +796,39 @@ table.table_block td {
transform: rotate(136deg);
}
.ie8 .new {
left: 0px;
top: 0px;
width: auto;
padding: 5px 15px;
}
.ie8 .new:after {
display: none;
}
.ie8 .new:before {
display: none;
}
.ie8 .sale {
right: 0px;
top: 0px;
width: auto;
padding: 5px 15px;
}
.ie8 .sale:after {
display: none;
}
.ie8 .sale:before {
display: none;
}
.ie8 .new-box {
top: -1px;
left: -1px;
}
.ie8 .sale-box {
right: -1px;
top: -1px;
}
/************************************* BOXES *****************************************************/
.box {
background: #fbfbfb;
@@ -1127,7 +1159,6 @@ table.table_block td {
right: 0;
top: 0;
cursor: pointer;
text-align: center;
font-family: "FontAwesome";
font-size: 14px;
}
@@ -1139,6 +1170,7 @@ table.table_block td {
height: 30px;
color: #333333;
line-height: 30px;
text-align: center;
}
#categories_block_left li span.grower.CLOSE:before {
content: "";
@@ -1245,7 +1277,6 @@ ul.footer_links li + li {
.content_sortPagiBar .sortPagiBar #productsSortForm select {
max-width: 192px;
float: left;
/* max 991px */
}
@media (max-width: 991px) {
.content_sortPagiBar .sortPagiBar #productsSortForm select {
@@ -1592,9 +1623,7 @@ ul.step li.step_current span {
ul.step li.step_current_end {
font-weight: bold;
}
ul.step li.step_todo span {
display: block;
color: #333333;
ul.step li.step_todo {
background: #f7f7f7;
background: -moz-linear-gradient(top, #f7f7f7 0%, #ededed 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f7f7f7), color-stop(100%, #ededed));
@@ -1603,8 +1632,12 @@ ul.step li.step_todo span {
background: -ms-linear-gradient(top, #f7f7f7 0%, #ededed 100%);
background: linear-gradient(to bottom, #f7f7f7 0%, #ededed 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f7f7f7', endColorstr='#ededed',GradientType=0 );
}
ul.step li.step_todo span {
display: block;
border: 1px solid;
border-color: white;
color: #333333;
position: relative;
}
@media (min-width: 992px) {
@@ -1617,12 +1650,6 @@ ul.step li.step_todo span {
}
ul.step li.step_done {
border-color: #666666 #5f5f5f #292929 #5f5f5f;
}
ul.step li.step_done a {
color: white;
text-shadow: 1px 1px rgba(0, 0, 0, 0.3);
border: 1px solid;
border-color: #8b8a8a;
background: #727171;
background: -moz-linear-gradient(top, #727171 0%, #666666 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #727171), color-stop(100%, #666666));
@@ -1632,6 +1659,12 @@ ul.step li.step_done a {
background: linear-gradient(to bottom, #727171 0%, #666666 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#727171', endColorstr='#666666',GradientType=0 );
}
ul.step li.step_done a {
color: white;
text-shadow: 1px 1px rgba(0, 0, 0, 0.3);
border: 1px solid;
border-color: #8b8a8a;
}
@media (min-width: 992px) {
ul.step li.step_done a {
padding-left: 38px;
@@ -1942,6 +1975,10 @@ div.star_hover a, div.star a:hover {
background: #2b2b2b;
}
.ie8 #header #header_logo {
width: 350px;
}
/* ************************************************************************************************
BREADCRUMB
************************************************************************************************ */
@@ -2022,6 +2059,16 @@ div.star_hover a, div.star a:hover {
color: #777;
}
.ie8 .breadcrumb {
min-height: 1px;
}
.ie8 .breadcrumb a:after {
display: none;
}
.ie8 .breadcrumb .navigation-pipe {
width: 20px;
}
/* ************************************************************************************************
FOOTER
************************************************************************************************ */
@@ -3395,3 +3442,7 @@ div.star.star_hover:after {
padding-bottom: 0;
}
}
.ie8 #facebook_block, .ie8 #cmsinfo_block {
height: 344px;
}
-1
View File
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/************************************************************
History Page Styles
************************************************************/
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
.footable {
width: 100%;
}
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/**
* BxSlider v4.0 - Fully loaded, responsive content slider
* http://bxslider.com
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/*********************************************************************
Maintenance Page Styles
**********************************************************************/
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/* Special style for block cart*/
/*******************************************************************
Cart Block Styles
@@ -170,6 +169,9 @@
#header #cart_block #cart-buttons {
background: url(../../../img/cart-shadow.png) repeat-x #333333;
}
#header .block_content {
margin-bottom: 0;
}
#cart_block #cart_block_summary, #cart_block .title_block span, #header #cart_block h4, #header #cart_block .title_block, #header #cart_block h4 {
display: none;
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/* block CONTACT ******************************************************************************* */
@media (max-width: 767px) {
#contact_block {
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
#enabled_filters {
background: #484848;
padding: 16px 20px;
@@ -245,3 +244,14 @@
.hide-action:hover {
font-weight: bold;
}
#ul_layered_price_0 .col-xs-6, #ul_layered_weight_0 .col-xs-6 {
padding-top: 10px;
}
@media (min-width: 1200px) {
#ul_layered_price_0 .col-xs-6, #ul_layered_weight_0 .col-xs-6 {
padding-top: 0;
padding-left: 0;
padding-right: 0;
}
}
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
#layered_block_left ul.layered_filter_ul {
border-top: 1px solid #d6d4d4;
}
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/* Block newsletter */
#columns #newsletter_block_left .form-group {
margin-bottom: 0;
@@ -60,6 +59,7 @@
}
#footer #newsletter_block_left .form-group .form-control {
height: 45px;
line-height: 30px;
max-width: 267px;
background: #3c3c3c;
border-color: #515151;
@@ -74,7 +74,7 @@
box-shadow: black 0px 0px 0px;
}
#footer #newsletter_block_left .form-group .button-small {
margin-left: -42px;
margin-left: -43px;
border: none;
background: none;
text-align: center;
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/* block top search */
#search_block_top {
position: absolute;
@@ -46,6 +45,8 @@
display: block;
font-family: "FontAwesome";
font-size: 17px;
width: 100%;
text-align: center;
}
#search_block_top .btn.button-search:hover {
color: #6f6f6f;
@@ -53,6 +54,7 @@
#search_block_top #search_query_top {
padding: 0 13px;
height: 45px;
line-height: 45px;
width: 271px;
background: #fbfbfb;
float: left;
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
.tags_block .block_content {
overflow: hidden;
}
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/*** ESSENTIAL STYLES ***/
.sf-contener {
clear: both;
@@ -198,36 +197,38 @@ ul.sf-menu li li li.sfHover ul {
color: #515151;
}
.sf-menu > li > ul > li:not(#category-thumbnail) {
.sf-menu > li > ul > li {
float: left;
width: 20%;
padding-right: 15px;
}
@media (max-width: 767px) {
.sf-menu > li > ul > li:not(#category-thumbnail) {
.sf-menu > li > ul > li {
width: 50%;
}
}
@media (max-width: 479px) {
.sf-menu > li > ul > li:not(#category-thumbnail) {
.sf-menu > li > ul > li {
width: 100%;
}
}
@media (min-width: 768px) {
.sf-menu > li > ul > li:not(#category-thumbnail).first-in-line-lg {
.sf-menu > li > ul > li.first-in-line-lg {
clear: left;
}
}
@media (min-width: 480px) and (max-width: 767px) {
.sf-menu > li > ul > li:not(#category-thumbnail).first-in-line-xs {
.sf-menu > li > ul > li.first-in-line-xs {
clear: left;
}
}
.sf-menu > li > ul > li#category-thumbnail {
width: 100%;
width: 100% !important;
float: none;
clear: both;
overflow: hidden;
padding-right: 0;
}
.sf-menu > li > ul > li#category-thumbnail > div {
float: left;
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/* block top user information */
#header_right #header_user {
clear: both;
@@ -22,7 +21,7 @@
#header_right #header_user #shopping_cart a {
padding: 7px 10px 14px 16px;
background: #333333;
min-width: 270px;
width: 270px;
display: block;
font-weight: bold;
color: #777777;
@@ -31,7 +30,7 @@
}
@media (min-width: 768px) and (max-width: 991px) {
#header_right #header_user #shopping_cart a {
min-width: 190px;
width: 190px;
}
}
@media (min-width: 768px) and (max-width: 991px) {
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/* module blockwishlist */
/* lnk on detail product page */
#primary_block #wishlist_button {
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
#compare_shipping .form-group {
line-height: normal;
margin-bottom: 10px;
@@ -1 +0,0 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
#favoriteproducts_block_account .favoriteproduct {
position: relative;
margin-bottom: 14px;
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/**
* BxSlider v4.0 - Fully loaded, responsive content slider
* http://bxslider.com
@@ -221,3 +220,7 @@
font-size: .85em;
padding: 10px;
}
.ie8 #homepage-slider .bx-wrapper .bx-controls-direction a:before {
background: #333333;
}
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
#product_comments_block_extra {
padding: 8px 10px 10px;
font-weight: bold;
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
#stripe-payment-form {
line-height: 20px;
padding-bottom: 7px;
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/* Home hook CSS */
#htmlcontent_home ul {
margin: 0 -5px;
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
#my-account .addresses-lists {
margin-bottom: 30px;
}
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/********************************************************
One-Page Checkout Styles
********************************************************/
+29 -8
View File
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/* product desc */
/* primary_block ***************************************************************************** */
#primary_block {
@@ -98,6 +97,11 @@ img {
color: #333333;
}
.ie8 #pb-right-column #image-block #view_full_size .span_link {
background: #fff;
border: 1px solid #d6d4d4;
}
/* miniatures */
#pb-right-column #views_block {
margin-top: 10px;
@@ -237,6 +241,9 @@ span.view_scroll_spacer {
content: "";
}
#view_scroll_left {
margin-top: 0;
}
#view_scroll_left:before {
content: "";
padding-right: 2px;
@@ -249,6 +256,15 @@ span.view_scroll_spacer {
margin-right: 6px;
}
.view_scroll_spacer {
margin-top: 38px;
}
@media (min-width: 768px) and (max-width: 991px) {
.view_scroll_spacer {
margin-top: 28px;
}
}
/* link list */
#usefull_link_block {
list-style-type: none;
@@ -520,6 +536,12 @@ span.view_scroll_spacer {
border-radius: 5px;
position: relative;
display: block;
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #009ad0), color-stop(100%, #007ab7));
background-image: -webkit-linear-gradient(#009ad0, #007ab7);
background-image: -moz-linear-gradient(#009ad0, #007ab7);
background-image: -o-linear-gradient(#009ad0, #007ab7);
background-image: linear-gradient(#009ad0, #007ab7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#009ad0', endColorstr='#007ab7',GradientType=0 );
}
.box-info-product .exclusive:before {
font-family: "FontAwesome";
@@ -564,12 +586,6 @@ span.view_scroll_spacer {
}
.box-info-product .exclusive span {
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #009ad0), color-stop(100%, #007ab7));
background-image: -webkit-linear-gradient(#009ad0, #007ab7);
background-image: -moz-linear-gradient(#009ad0, #007ab7);
background-image: -o-linear-gradient(#009ad0, #007ab7);
background-image: linear-gradient(#009ad0, #007ab7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#009ad0', endColorstr='#007ab7',GradientType=0 );
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
-ms-border-radius: 5px;
@@ -604,7 +620,7 @@ span.view_scroll_spacer {
}
}
.box-info-product .exclusive:hover span {
.box-info-product .exclusive:hover {
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #007ab7), color-stop(100%, #009ad0));
background-image: -webkit-linear-gradient(#007ab7, #009ad0);
background-image: -moz-linear-gradient(#007ab7, #009ad0);
@@ -704,6 +720,7 @@ table.table-produst-discounts tr th {
padding: 0 6px;
float: left;
border: 1px solid #d6d4d4;
line-height: 27px;
}
#quantity_wanted_p .btn {
float: left;
@@ -777,6 +794,10 @@ table.table-produst-discounts tr th {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff', endColorstr='#fbfbfb',GradientType=0 );
}
.ie8 .box-security {
filter: none;
}
/* prices */
.content_prices {
padding: 13px 19px;
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/*******************************************************
Product list Styles
********************************************************/
@@ -74,6 +73,11 @@ ul.product_list .comments_note .nb-comments {
font-style: italic;
}
.ie8 .quick-view {
background: #fff;
border: 1px solid #d6d4d4;
}
/*******************************************************
Product list(Grid) Styles
********************************************************/
-1
View File
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/*TMP*/
#scenes .cluetip span {
background: transparent url(../img/icon/cible.gif) no-repeat scroll center center;
-1
View File
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/******************************************************************
Sitemap Page Styles
*******************************************************************/
-1
View File
@@ -1,4 +1,3 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
/***********************************************************
Stores Page Styles
************************************************************/
+3 -2
View File
@@ -67,7 +67,8 @@
<link href="{$css_dir}/jquery/uniform.default.css" rel="stylesheet" type="text/css" media="all" />
<link href="{$css_dir}/highdpi.css" rel="stylesheet" media="only screen and (-webkit-min-device-pixel-ratio: 2)" />
<link href="{$css_dir}/jquery/footable.core.css" rel="stylesheet" type="text/css" media="all" />
<link href="{$css_dir}jquery/jquery.bxslider.css" rel="stylesheet" type="text/css" media="all" />
<link href="{$css_dir}jquery/jquery.bxslider.css" rel="stylesheet" type="text/css" media="all" />
<link href='//fonts.googleapis.com/css?family=Open+Sans:400,400italic,300italic,300,600,600italic,700,700italic,800,800italic' rel='stylesheet' type='text/css' />
{if isset($css_files)}
{foreach from=$css_files key=css_uri item=media}
<link href="{$css_uri}" rel="stylesheet" type="text/css" media="{$media}" />
@@ -79,7 +80,7 @@
{/foreach}
{/if}
<script src="{$js_dir}/tools/bootstrap.min.js"></script>
<!--[if IE 7]><html class="no-js lt-ie9 ie8" lang="{$lang_iso}">
<!--[if IE 8]><html class="no-js lt-ie9 ie8" lang="{$lang_iso}">
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
<![endif]-->
@@ -598,7 +598,7 @@ var ajaxCart = {
$('.layer_cart_overlay').css('height','100%');
$('.layer_cart_overlay').show();
$('#layer_cart').css({'top': n}).fadeIn('fast');
//$.scrollTo('#layer_cart', 400);
$.scrollTo('#layer_cart', 400);
crossselling_serialScroll();
},
+2 -2
View File
@@ -114,7 +114,7 @@ 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>');
$('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)+'.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();
}
@@ -137,7 +137,7 @@ function searchLocationsNear(center)
function createMarker(latlng, name, address, other, id_store, has_store_picture)
{
var html = '<b>'+name+'</b><br/>'+address+(has_store_picture === 1 ? '<br /><br /><img src="'+img_store_dir+parseInt(id_store)+'-medium_default.jpg" alt="" />' : '')+other+'<br /><a href="http://maps.google.com/maps?saddr=&daddr='+latlng+'" target="_blank">'+translation_5+'<\/a>';
var html = '<b>'+name+'</b><br/>'+address+(has_store_picture === 1 ? '<br /><br /><img src="'+img_store_dir+parseInt(id_store)+'.jpg" alt="" />' : '')+other+'<br /><a href="http://maps.google.com/maps?saddr=&daddr='+latlng+'" target="_blank">'+translation_5+'<\/a>';
var image = new google.maps.MarkerImage(img_ps_dir+logo_store);
var marker = '';
+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';
@@ -187,11 +187,11 @@ param_product_url = '';
</script>
{else}
{if $filter.filter_type == 1}
<li class="nomargin">
{l s='From' mod='blocklayered'} <input class="layered_{$filter.type}_range layered_input_range_min layered_input_range form-control grey" id="layered_{$filter.type}_range_min" type="text" value="{$filter.values[0]}"/>
<span class="layered_{$filter.type}_range_unit">{$filter.unit}</span>
{l s='to' mod='blocklayered'} <input class="layered_{$filter.type}_range layered_input_range_max layered_input_range form-control grey" id="layered_{$filter.type}_range_max" type="text" value="{$filter.values[1]}"/>
<span class="layered_{$filter.type}_range_unit">{$filter.unit}</span>
<li class="nomargin row">
<div class="col-xs-6 col-sm-12 col-lg-6 first-item">{l s='From' mod='blocklayered'} <input class="layered_{$filter.type}_range layered_input_range_min layered_input_range form-control grey" id="layered_{$filter.type}_range_min" type="text" value="{$filter.values[0]}"/>
<span class="layered_{$filter.type}_range_unit">{$filter.unit}</span></div>
<div class="col-xs-6 col-sm-12 col-lg-6">{l s='to' mod='blocklayered'} <input class="layered_{$filter.type}_range layered_input_range_max layered_input_range form-control grey" id="layered_{$filter.type}_range_max" type="text" value="{$filter.values[1]}"/>
<span class="layered_{$filter.type}_range_unit">{$filter.unit}</span></div>
<span class="layered_{$filter.type}_format" style="display:none;">{$filter.format}</span>
<script type="text/javascript">
{literal}
@@ -1,6 +1,5 @@
@import 'compass';
@import 'bootstrap_lib/_variables';
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
//------- FONTS
@@ -101,4 +101,7 @@ table#product_comparison {
font-style:italic;
}
}
.ie8 table#product_comparison .product-image-block .product_image img {
width:auto;
}
.footer_link { margin-bottom:20px;}
+78 -21
View File
@@ -617,6 +617,7 @@ table.table_block td {
left:-33px;
top:6px;
z-index:1;
&:before{
position:absolute;
bottom:-3px;
@@ -630,6 +631,7 @@ table.table_block td {
text-indent:-5000px;
@include rotate(225deg);
}
&:after{
position:absolute;
bottom:-3px;
@@ -686,6 +688,42 @@ table.table_block td {
@include rotate(136deg);
}
}
.ie8 {
.new {
left:0px;
top:0px;
width:auto;
padding:5px 15px;
&:after {
display:none;
}
&:before {
display:none;
}
}
.sale {
right:0px;
top:0px;
width:auto;
padding:5px 15px;
&:after {
display:none;
}
&:before {
display:none;
}
}
.new-box {
top:-1px;
left:-1px;
}
.sale-box {
right:-1px;
top:-1px;
}
}
/************************************* BOXES *****************************************************/
.box {
background:$base-box-bg;
@@ -1004,7 +1042,6 @@ table.table_block td {
right:0;
top:0;
cursor:pointer;
text-align:center;
font-family:$font-icon;
font-size:14px;
@@ -1018,6 +1055,7 @@ table.table_block td {
height:30px;
color:$base-text-color;
line-height:30px;
text-align:center;
}
}
@@ -1118,7 +1156,6 @@ ul.footer_links {
max-width:192px;
float:left;
/* max 991px */
@media (max-width: $screen-sm-max) {
max-width:160px;
}
@@ -1441,20 +1478,20 @@ ul.step {
font-weight:bold;
}
&.step_todo {
background: rgb(247,247,247);
background: -moz-linear-gradient(top, rgba(247,247,247,1) 0%, rgba(237,237,237,1) 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(247,247,247,1)), color-stop(100%,rgba(237,237,237,1)));
background: -webkit-linear-gradient(top, rgba(247,247,247,1) 0%,rgba(237,237,237,1) 100%);
background: -o-linear-gradient(top, rgba(247,247,247,1) 0%,rgba(237,237,237,1) 100%);
background: -ms-linear-gradient(top, rgba(247,247,247,1) 0%,rgba(237,237,237,1) 100%);
background: linear-gradient(to bottom, rgba(247,247,247,1) 0%,rgba(237,237,237,1) 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f7f7f7', endColorstr='#ededed',GradientType=0 );
span {
display:block;
color:$base-text-color;
background: rgb(247,247,247);
background: -moz-linear-gradient(top, rgba(247,247,247,1) 0%, rgba(237,237,237,1) 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(247,247,247,1)), color-stop(100%,rgba(237,237,237,1)));
background: -webkit-linear-gradient(top, rgba(247,247,247,1) 0%,rgba(237,237,237,1) 100%);
background: -o-linear-gradient(top, rgba(247,247,247,1) 0%,rgba(237,237,237,1) 100%);
background: -ms-linear-gradient(top, rgba(247,247,247,1) 0%,rgba(237,237,237,1) 100%);
background: linear-gradient(to bottom, rgba(247,247,247,1) 0%,rgba(237,237,237,1) 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f7f7f7', endColorstr='#ededed',GradientType=0 );
border:1px solid;
border-color:$light-border-color;
color:$base-text-color;
position:relative;
@media (min-width: $screen-md) { // min 991px
padding-left:38px;
@@ -1467,20 +1504,20 @@ ul.step {
}
&.step_done {
border-color:#666666 #5f5f5f #292929 #5f5f5f;
background: rgb(114,113,113);
background: -moz-linear-gradient(top, rgba(114,113,113,1) 0%, rgba(102,102,102,1) 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(114,113,113,1)), color-stop(100%,rgba(102,102,102,1)));
background: -webkit-linear-gradient(top, rgba(114,113,113,1) 0%,rgba(102,102,102,1) 100%);
background: -o-linear-gradient(top, rgba(114,113,113,1) 0%,rgba(102,102,102,1) 100%);
background: -ms-linear-gradient(top, rgba(114,113,113,1) 0%,rgba(102,102,102,1) 100%);
background: linear-gradient(to bottom, rgba(114,113,113,1) 0%,rgba(102,102,102,1) 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#727171', endColorstr='#666666',GradientType=0 );
a {
color:$light-text-color;
text-shadow:1px 1px rgba(0,0,0,0.3);
border:1px solid;
border-color:#8b8a8a;
background: rgb(114,113,113);
background: -moz-linear-gradient(top, rgba(114,113,113,1) 0%, rgba(102,102,102,1) 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(114,113,113,1)), color-stop(100%,rgba(102,102,102,1)));
background: -webkit-linear-gradient(top, rgba(114,113,113,1) 0%,rgba(102,102,102,1) 100%);
background: -o-linear-gradient(top, rgba(114,113,113,1) 0%,rgba(102,102,102,1) 100%);
background: -ms-linear-gradient(top, rgba(114,113,113,1) 0%,rgba(102,102,102,1) 100%);
background: linear-gradient(to bottom, rgba(114,113,113,1) 0%,rgba(102,102,102,1) 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#727171', endColorstr='#666666',GradientType=0 );
@media (min-width: $screen-md) { // min 991px */
padding-left:38px;
@@ -1763,6 +1800,9 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
}
}
}
.ie8 #header #header_logo {
width:350px;
}
/* ************************************************************************************************
BREADCRUMB
************************************************************************************************ */
@@ -1835,7 +1875,19 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
}
}
.ie8 {
.breadcrumb {
min-height:1px;
a:after {
display:none;
}
.navigation-pipe {
width:20px;
}
}
}
/* ************************************************************************************************
FOOTER
************************************************************************************************ */
@@ -3137,4 +3189,9 @@ div.star.star_hover {
}
}
}
}
.ie8 {
#facebook_block, #cmsinfo_block {
height:344px;
}
}
@@ -194,6 +194,9 @@
background:url(../../../img/cart-shadow.png) repeat-x $dark-background;
}
}
.block_content {
margin-bottom:0;
}
}
#cart_block #cart_block_summary, #cart_block .title_block span, #header #cart_block h4, #header #cart_block .title_block, #header #cart_block h4 {display:none}
#cart_block #cart_block_shipping_cost,
@@ -244,3 +244,13 @@
.hide-action:hover {
font-weight: bold;
}
#ul_layered_price_0, #ul_layered_weight_0 {
.col-xs-6 {
padding-top:10px;
@media (min-width: $screen-lg) { // min 1200px
padding-top:0;
padding-left:0;
padding-right:0;
}
}
}
@@ -64,6 +64,7 @@
.form-control {
height:45px;
line-height:30px;
max-width:267px;
background:#3c3c3c;
border-color:#515151;
@@ -78,7 +79,7 @@
}
.button-small {
margin-left:-42px;
margin-left:-43px;
border:none;
background:none;
text-align:center;
@@ -37,6 +37,8 @@
display:block;
font-family:$font-icon;
font-size:17px;
width:100%;
text-align:center;
}
&:hover {color:#6f6f6f}
@@ -45,6 +47,7 @@
#search_query_top {
padding:0 13px;
height:45px;
line-height:45px;
width:271px;
background:$base-box-bg;
float: left;
@@ -174,7 +174,7 @@ ul.sf-menu li li li.sfHover ul {
}
}
}
.sf-menu > li > ul > li:not(#category-thumbnail) {
.sf-menu > li > ul > li {
float:left;
width:20%;
padding-right:15px;
@@ -192,9 +192,11 @@ ul.sf-menu li li li.sfHover ul {
}
}
.sf-menu > li > ul > li#category-thumbnail {
width:100%;
width:100% !important;
float:none;
clear:both;
overflow:hidden;
padding-right:0;
> div {
float:left;
@@ -225,8 +227,8 @@ ul.sf-menu li li li.sfHover ul {
display: block;
padding: 17px 20px;
border-bottom: 3px solid #e9e9e9;
background: #f6f6f6;
position:relative;
background: #f6f6f6;
position: relative;
&:hover {
background: $dark-background;
@@ -23,14 +23,14 @@
a {
padding:7px 10px 14px 16px;
background:$dark-background;
min-width: 270px;
width: 270px;
display:block;
font-weight:bold;
color:#777777;
text-shadow:1px 1px rgba(0,0,0,0.2);
overflow:hidden;
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { // min 768px max 991px
min-width:190px;
width:190px;
}
span.ajax_cart_product_txt, span.ajax_cart_product_txt_s {
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { // min 768px max 991px
@@ -187,7 +187,6 @@
}
}
}
.bx-wrapper .bx-controls-direction a.disabled {
display: none;
}
@@ -258,4 +257,14 @@
font-size: .85em;
padding: 10px;
}
}
.ie8 {
#homepage-slider{
.bx-wrapper .bx-controls-direction a {
&:before {
background:$dark-background;
}
}
}
}
+74 -49
View File
@@ -64,30 +64,31 @@ img{
#view_full_size {
display:block;
cursor:pointer;
.span_link {
position:absolute;
bottom:20px;
left:50%;
margin-left:-68px;
display:block;
padding:10px 0;
text-align:center;
line-height:22px;
color:#777676;
width:136px;
text-align:center;
font-weight:bold;
background:rgba(255,255,255,0.5);
@include box-shadow(0 2px 8px rgba(0,0,0,0.16));
&:after{
font-family:$font-icon;
color:#c0c0c0;
font-size:20px;
.span_link {
position:absolute;
bottom:20px;
left:50%;
margin-left:-68px;
display:block;
padding:10px 0;
text-align:center;
line-height:22px;
content:"";
font-weight:normal;
margin:0 0 0 4px
color:#777676;
width:136px;
text-align:center;
font-weight:bold;
background:rgba(255,255,255,0.5);
@include box-shadow(0 2px 8px rgba(0,0,0,0.16));
&:after{
font-family:$font-icon;
color:#c0c0c0;
font-size:20px;
line-height:22px;
content:"";
font-weight:normal;
margin:0 0 0 4px
}
&:hover:after{color:$base-text-color}
@@ -95,7 +96,19 @@ img{
}
}
}
.ie8 #pb-right-column {
#image-block {
#view_full_size {
.span_link {
background:#fff;
border:1px solid $base-border-color;
}
}
}
}
/* miniatures */
#pb-right-column #views_block {
margin-top:10px
@@ -224,6 +237,7 @@ span.view_scroll_spacer {
}
#view_scroll_left {
margin-top:0;
&:before{
content:"";
padding-right:2px;
@@ -240,7 +254,12 @@ span.view_scroll_spacer {
}
.view_scroll_spacer {
margin-top:38px;
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { //min 768px max 991px
margin-top:28px;
}
}
/* link list */
#usefull_link_block {
list-style-type:none;
@@ -511,31 +530,33 @@ padding:18px 19px 12px;
border-bottom:1px solid #012740;
@include border-radius(5px);
position:relative;
display:block;
display:block;
@include background-image(linear-gradient(#009ad0, #007ab7));
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#009ad0', endColorstr='#007ab7',GradientType=0 );
&:before{
font-family:$font-icon;
position:absolute;
top:0;
left:0;
bottom:0;
color:$light-text-color;
font-size:25px;
line-height:47px;
text-shadow:0 1px #015883;
content:"";
z-index:2;
width:51px;
text-align:center;
border:1px solid #06b2e6;
@include border-radius(5px 0 0 5px);
&:before{
font-family:$font-icon;
position:absolute;
top:0;
left:0;
bottom:0;
color:$light-text-color;
font-size:25px;
line-height:47px;
text-shadow:0 1px #015883;
content:"";
z-index:2;
width:51px;
text-align:center;
border:1px solid #06b2e6;
@include border-radius(5px 0 0 5px);
@media (max-width: $screen-sm-max) { //max 991px
display:none
}
}
}
&:after{
&:after{
background:url(../img/border-1.gif) repeat-y 0 0;
position:absolute;
top:0;
@@ -544,16 +565,14 @@ padding:18px 19px 12px;
content:"";
width:1px;
z-index:2;
@media (max-width: $screen-sm-max) { // max 991px
display:none
}
}
}
}
.box-info-product .exclusive span{
@include background-image(linear-gradient(#009ad0, #007ab7));
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#009ad0', endColorstr='#007ab7',GradientType=0 );
.box-info-product .exclusive span{
@include border-radius(5px);
font-weight:bold;
font-size:20px;
@@ -578,7 +597,7 @@ padding:18px 19px 12px;
}
.box-info-product .exclusive:hover span{
.box-info-product .exclusive:hover{
@include background-image(linear-gradient(#007ab7, #009ad0));
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#007ab7', endColorstr='#009ad0',GradientType=0 );
background-position:0 0
@@ -686,6 +705,7 @@ table.table-produst-discounts{
padding:0 6px;
float:left;
border:$main_border;
line-height:27px;
}
.btn{
@@ -756,6 +776,11 @@ table.table-produst-discounts{
@include background-image(linear-gradient(#fff, #fbfbfb));
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fff', endColorstr='#fbfbfb',GradientType=0 );
}
.ie8 {
.box-security {
filter:none;
}
}
/* prices */
.content_prices {
padding:13px 19px;
@@ -83,7 +83,12 @@ ul.product_list {
.nb-comments {overflow:hidden; font-style:italic;}
}
}
.ie8 {
.quick-view {
background:#fff;
border:1px solid $base-border-color;
}
}
/*******************************************************
Product list(Grid) Styles
********************************************************/
+1 -1
View File
@@ -42,7 +42,7 @@
{foreach $stores as $store}
<tr class="store-small">
<td class="logo">{if $store.has_picture}<div class="store-image"><img src="{$img_store_dir}{$store.id_store}-stores_default.jpg" alt="" /></div>{/if}</td>
<td class="logo">{if $store.has_picture}<div class="store-image"><img src="{$img_store_dir}{$store.id_store}.jpg" alt="" /></div>{/if}</td>
<td class="name">{$store.name|escape:'html':'UTF-8'}</td>
<td class="address">
{$store.address1|escape:'html':'UTF-8'}