diff --git a/themes/default-bootstrap/category.tpl b/themes/default-bootstrap/category.tpl index 3b5585e0d..76bf60936 100644 --- a/themes/default-bootstrap/category.tpl +++ b/themes/default-bootstrap/category.tpl @@ -72,7 +72,7 @@ {/if} {/if} -

+

{strip} {$category->name|escape:'html':'UTF-8'} {if isset($categoryNameComplement)} diff --git a/themes/default-bootstrap/css/addresses.css b/themes/default-bootstrap/css/addresses.css index 5a475d875..2a23b3be1 100644 --- a/themes/default-bootstrap/css/addresses.css +++ b/themes/default-bootstrap/css/addresses.css @@ -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 ********************************************************/ diff --git a/themes/default-bootstrap/css/authentication.css b/themes/default-bootstrap/css/authentication.css index bba38d7fa..aebc35000 100644 --- a/themes/default-bootstrap/css/authentication.css +++ b/themes/default-bootstrap/css/authentication.css @@ -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 **********************************************************/ diff --git a/themes/default-bootstrap/css/category.css b/themes/default-bootstrap/css/category.css index de1985f10..8e3d4b7a1 100644 --- a/themes/default-bootstrap/css/category.css +++ b/themes/default-bootstrap/css/category.css @@ -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 ************************************************************************************************ */ diff --git a/themes/default-bootstrap/css/cms.css b/themes/default-bootstrap/css/cms.css index 5f39f39b5..474f4a9a1 100644 --- a/themes/default-bootstrap/css/cms.css +++ b/themes/default-bootstrap/css/cms.css @@ -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 ***************************************************************/ diff --git a/themes/default-bootstrap/css/comparator.css b/themes/default-bootstrap/css/comparator.css index f87343699..8c5666779 100644 --- a/themes/default-bootstrap/css/comparator.css +++ b/themes/default-bootstrap/css/comparator.css @@ -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; } diff --git a/themes/default-bootstrap/css/contact-form.css b/themes/default-bootstrap/css/contact-form.css index 70dc69983..27b823ea6 100644 --- a/themes/default-bootstrap/css/contact-form.css +++ b/themes/default-bootstrap/css/contact-form.css @@ -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 **************************************************************************/ diff --git a/themes/default-bootstrap/css/global.css b/themes/default-bootstrap/css/global.css index ef7453301..6030df04c 100644 --- a/themes/default-bootstrap/css/global.css +++ b/themes/default-bootstrap/css/global.css @@ -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; +} diff --git a/themes/default-bootstrap/css/history.css b/themes/default-bootstrap/css/history.css index ba1745ea4..6d23cf9e2 100644 --- a/themes/default-bootstrap/css/history.css +++ b/themes/default-bootstrap/css/history.css @@ -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 ************************************************************/ diff --git a/themes/default-bootstrap/css/jquery/footable.core.css b/themes/default-bootstrap/css/jquery/footable.core.css index 13d0471d2..c6494cb59 100644 --- a/themes/default-bootstrap/css/jquery/footable.core.css +++ b/themes/default-bootstrap/css/jquery/footable.core.css @@ -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%; } diff --git a/themes/default-bootstrap/css/jquery/jquery.bxslider.css b/themes/default-bootstrap/css/jquery/jquery.bxslider.css index 830fa4a05..6dea981a0 100644 --- a/themes/default-bootstrap/css/jquery/jquery.bxslider.css +++ b/themes/default-bootstrap/css/jquery/jquery.bxslider.css @@ -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 diff --git a/themes/default-bootstrap/css/maintenance.css b/themes/default-bootstrap/css/maintenance.css index dbfac44f6..2f0118c79 100644 --- a/themes/default-bootstrap/css/maintenance.css +++ b/themes/default-bootstrap/css/maintenance.css @@ -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 **********************************************************************/ diff --git a/themes/default-bootstrap/css/modules/blockcart/blockcart.css b/themes/default-bootstrap/css/modules/blockcart/blockcart.css index af6fd2692..4c5da1383 100644 --- a/themes/default-bootstrap/css/modules/blockcart/blockcart.css +++ b/themes/default-bootstrap/css/modules/blockcart/blockcart.css @@ -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; diff --git a/themes/default-bootstrap/css/modules/blockcontact/blockcontact.css b/themes/default-bootstrap/css/modules/blockcontact/blockcontact.css index e71eb208d..7ad7482d4 100644 --- a/themes/default-bootstrap/css/modules/blockcontact/blockcontact.css +++ b/themes/default-bootstrap/css/modules/blockcontact/blockcontact.css @@ -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 { diff --git a/themes/default-bootstrap/css/modules/blocklayered/blocklayered-15.css b/themes/default-bootstrap/css/modules/blocklayered/blocklayered-15.css index c898ef199..0dc8f482f 100644 --- a/themes/default-bootstrap/css/modules/blocklayered/blocklayered-15.css +++ b/themes/default-bootstrap/css/modules/blocklayered/blocklayered-15.css @@ -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; + } +} diff --git a/themes/default-bootstrap/css/modules/blocklayered/blocklayered.css b/themes/default-bootstrap/css/modules/blocklayered/blocklayered.css index f6d8e5155..b5e49dc4d 100644 --- a/themes/default-bootstrap/css/modules/blocklayered/blocklayered.css +++ b/themes/default-bootstrap/css/modules/blocklayered/blocklayered.css @@ -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; } diff --git a/themes/default-bootstrap/css/modules/blocknewsletter/blocknewsletter.css b/themes/default-bootstrap/css/modules/blocknewsletter/blocknewsletter.css index 0844edea4..04eda0079 100644 --- a/themes/default-bootstrap/css/modules/blocknewsletter/blocknewsletter.css +++ b/themes/default-bootstrap/css/modules/blocknewsletter/blocknewsletter.css @@ -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; diff --git a/themes/default-bootstrap/css/modules/blocksearch/blocksearch.css b/themes/default-bootstrap/css/modules/blocksearch/blocksearch.css index fd048bf56..6483bd13a 100644 --- a/themes/default-bootstrap/css/modules/blocksearch/blocksearch.css +++ b/themes/default-bootstrap/css/modules/blocksearch/blocksearch.css @@ -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; diff --git a/themes/default-bootstrap/css/modules/blocktags/blocktags.css b/themes/default-bootstrap/css/modules/blocktags/blocktags.css index ecfa79e24..e9a1bd886 100644 --- a/themes/default-bootstrap/css/modules/blocktags/blocktags.css +++ b/themes/default-bootstrap/css/modules/blocktags/blocktags.css @@ -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; } diff --git a/themes/default-bootstrap/css/modules/blocktopmenu/css/superfish-modified.css b/themes/default-bootstrap/css/modules/blocktopmenu/css/superfish-modified.css index da2ff11b8..19153c100 100644 --- a/themes/default-bootstrap/css/modules/blocktopmenu/css/superfish-modified.css +++ b/themes/default-bootstrap/css/modules/blocktopmenu/css/superfish-modified.css @@ -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; diff --git a/themes/default-bootstrap/css/modules/blockuserinfo/blockuserinfo.css b/themes/default-bootstrap/css/modules/blockuserinfo/blockuserinfo.css index 2aef77d5a..af97ffdfd 100644 --- a/themes/default-bootstrap/css/modules/blockuserinfo/blockuserinfo.css +++ b/themes/default-bootstrap/css/modules/blockuserinfo/blockuserinfo.css @@ -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) { diff --git a/themes/default-bootstrap/css/modules/blockwishlist/blockwishlist.css b/themes/default-bootstrap/css/modules/blockwishlist/blockwishlist.css index 26ec29c50..7dafc35d6 100644 --- a/themes/default-bootstrap/css/modules/blockwishlist/blockwishlist.css +++ b/themes/default-bootstrap/css/modules/blockwishlist/blockwishlist.css @@ -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 { diff --git a/themes/default-bootstrap/css/modules/carriercompare/style.css b/themes/default-bootstrap/css/modules/carriercompare/style.css index bbd6e53c8..5d5f7f832 100644 --- a/themes/default-bootstrap/css/modules/carriercompare/style.css +++ b/themes/default-bootstrap/css/modules/carriercompare/style.css @@ -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; diff --git a/themes/default-bootstrap/css/modules/crossselling/crossselling.css b/themes/default-bootstrap/css/modules/crossselling/crossselling.css index de6746ee6..e69de29bb 100644 --- a/themes/default-bootstrap/css/modules/crossselling/crossselling.css +++ b/themes/default-bootstrap/css/modules/crossselling/crossselling.css @@ -1 +0,0 @@ -@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic); diff --git a/themes/default-bootstrap/css/modules/favoriteproducts/favoriteproducts.css b/themes/default-bootstrap/css/modules/favoriteproducts/favoriteproducts.css index c30582e09..52f1bd3e9 100644 --- a/themes/default-bootstrap/css/modules/favoriteproducts/favoriteproducts.css +++ b/themes/default-bootstrap/css/modules/favoriteproducts/favoriteproducts.css @@ -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; diff --git a/themes/default-bootstrap/css/modules/homeslider/bx_styles.css b/themes/default-bootstrap/css/modules/homeslider/bx_styles.css index cc8d96652..65e0089d2 100644 --- a/themes/default-bootstrap/css/modules/homeslider/bx_styles.css +++ b/themes/default-bootstrap/css/modules/homeslider/bx_styles.css @@ -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; +} diff --git a/themes/default-bootstrap/css/modules/productcomments/productcomments.css b/themes/default-bootstrap/css/modules/productcomments/productcomments.css index 722424fb0..bd7922fb3 100644 --- a/themes/default-bootstrap/css/modules/productcomments/productcomments.css +++ b/themes/default-bootstrap/css/modules/productcomments/productcomments.css @@ -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; diff --git a/themes/default-bootstrap/css/modules/stripejs/stripe-prestashop.css b/themes/default-bootstrap/css/modules/stripejs/stripe-prestashop.css index fa8a0cb60..91da7cc99 100644 --- a/themes/default-bootstrap/css/modules/stripejs/stripe-prestashop.css +++ b/themes/default-bootstrap/css/modules/stripejs/stripe-prestashop.css @@ -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; diff --git a/themes/default-bootstrap/css/modules/themeconfigurator/views/css/hooks.css b/themes/default-bootstrap/css/modules/themeconfigurator/views/css/hooks.css index 164fdf309..eef234ead 100644 --- a/themes/default-bootstrap/css/modules/themeconfigurator/views/css/hooks.css +++ b/themes/default-bootstrap/css/modules/themeconfigurator/views/css/hooks.css @@ -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; diff --git a/themes/default-bootstrap/css/my-account.css b/themes/default-bootstrap/css/my-account.css index b4cc6573d..c52681160 100644 --- a/themes/default-bootstrap/css/my-account.css +++ b/themes/default-bootstrap/css/my-account.css @@ -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; } diff --git a/themes/default-bootstrap/css/order-opc.css b/themes/default-bootstrap/css/order-opc.css index d3a8512f7..75dc1301d 100644 --- a/themes/default-bootstrap/css/order-opc.css +++ b/themes/default-bootstrap/css/order-opc.css @@ -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 ********************************************************/ diff --git a/themes/default-bootstrap/css/product.css b/themes/default-bootstrap/css/product.css index 699e0bd87..ca2fb2372 100644 --- a/themes/default-bootstrap/css/product.css +++ b/themes/default-bootstrap/css/product.css @@ -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; diff --git a/themes/default-bootstrap/css/product_list.css b/themes/default-bootstrap/css/product_list.css index d22fb2c79..79ca7f720 100644 --- a/themes/default-bootstrap/css/product_list.css +++ b/themes/default-bootstrap/css/product_list.css @@ -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 ********************************************************/ diff --git a/themes/default-bootstrap/css/scenes.css b/themes/default-bootstrap/css/scenes.css index 0c0e86671..84ef84c77 100644 --- a/themes/default-bootstrap/css/scenes.css +++ b/themes/default-bootstrap/css/scenes.css @@ -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; diff --git a/themes/default-bootstrap/css/sitemap.css b/themes/default-bootstrap/css/sitemap.css index 51c146ba7..5621cfd78 100644 --- a/themes/default-bootstrap/css/sitemap.css +++ b/themes/default-bootstrap/css/sitemap.css @@ -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 *******************************************************************/ diff --git a/themes/default-bootstrap/css/stores.css b/themes/default-bootstrap/css/stores.css index 4432d1a3b..4ac385f54 100644 --- a/themes/default-bootstrap/css/stores.css +++ b/themes/default-bootstrap/css/stores.css @@ -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 ************************************************************/ diff --git a/themes/default-bootstrap/header.tpl b/themes/default-bootstrap/header.tpl index 03c56e2c9..bbc681892 100644 --- a/themes/default-bootstrap/header.tpl +++ b/themes/default-bootstrap/header.tpl @@ -67,7 +67,8 @@ - + + {if isset($css_files)} {foreach from=$css_files key=css_uri item=media} @@ -79,7 +80,7 @@ {/foreach} {/if} - diff --git a/themes/default-bootstrap/js/modules/blockcart/ajax-cart.js b/themes/default-bootstrap/js/modules/blockcart/ajax-cart.js index 230f1731d..dfbceb697 100644 --- a/themes/default-bootstrap/js/modules/blockcart/ajax-cart.js +++ b/themes/default-bootstrap/js/modules/blockcart/ajax-cart.js @@ -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(); }, diff --git a/themes/default-bootstrap/js/stores.js b/themes/default-bootstrap/js/stores.js index dd1ff1467..4686c19b5 100644 --- a/themes/default-bootstrap/js/stores.js +++ b/themes/default-bootstrap/js/stores.js @@ -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(''+parseInt(i + 1)+''+(has_store_picture == 1 ? '' : '')+''+name+''+address+(phone !== '' ? ''+translation_4+' '+phone : '')+''+distance+' '+distance_unit+''); + $('table#stores-table').find('tbody').append(''+parseInt(i + 1)+''+(has_store_picture == 1 ? '' : '')+''+name+''+address+(phone !== '' ? ''+translation_4+' '+phone : '')+''+distance+' '+distance_unit+''); $('#stores-table').show(); } @@ -137,7 +137,7 @@ function searchLocationsNear(center) function createMarker(latlng, name, address, other, id_store, has_store_picture) { - var html = ''+name+'
'+address+(has_store_picture === 1 ? '

' : '')+other+'
'+translation_5+'<\/a>'; + var html = ''+name+'
'+address+(has_store_picture === 1 ? '

' : '')+other+'
'+translation_5+'<\/a>'; var image = new google.maps.MarkerImage(img_ps_dir+logo_store); var marker = ''; diff --git a/themes/default-bootstrap/lang/en.php b/themes/default-bootstrap/lang/en.php index 10279038d..11136241c 100644 --- a/themes/default-bootstrap/lang/en.php +++ b/themes/default-bootstrap/lang/en.php @@ -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'; diff --git a/themes/default-bootstrap/modules/blocklayered/blocklayered.tpl b/themes/default-bootstrap/modules/blocklayered/blocklayered.tpl index 3f3bf826d..4097c239a 100644 --- a/themes/default-bootstrap/modules/blocklayered/blocklayered.tpl +++ b/themes/default-bootstrap/modules/blocklayered/blocklayered.tpl @@ -187,11 +187,11 @@ param_product_url = ''; {else} {if $filter.filter_type == 1} -
  • - {l s='From' mod='blocklayered'} - {$filter.unit} - {l s='to' mod='blocklayered'} - {$filter.unit} +
  • +
    {l s='From' mod='blocklayered'} + {$filter.unit}
    +
    {l s='to' mod='blocklayered'} + {$filter.unit}