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

Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6

Browse Source
This commit is contained in:
sLorenzini
2013-12-04 15:18:13 +01:00
parent c127f9765a 90f5560cb3
commit 32237777e3
4 changed files with 92 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/CompareController.php
+2 -1
View File
@@ -138,9 +138,10 @@ class CompareControllerCore extends FrontController
'product_features' => $listFeatures,
'products' => $listProducts,
'width' => $width,
'HOOK_COMPARE_EXTRA_INFORMATION' => Hook::exec('displayCompareExtraInformation', array('list_ids_product' => $ids)),
'HOOK_EXTRA_PRODUCT_COMPARISON' => Hook::exec('displayProductComparison', array('list_ids_product' => $ids)),
'homeSize' => Image::getSize(ImageType::getFormatedName('home'))
));
$this->context->smarty->assign('HOOK_EXTRA_PRODUCT_COMPARISON', Hook::exec('displayProductComparison', array('list_ids_product' => $ids)));
}
elseif (isset($this->context->cookie->id_compare))
{
themes/default-bootstrap/css/comparator.css
+46 -1
View File
@@ -20,7 +20,7 @@ table#product_comparison tbody tr td.comparison_infos div.center {
table#product_comparison tbody tr td.td_empty {
vertical-align: bottom;
}
table#product_comparison tbody tr td.td_empty span {
table#product_comparison tbody tr td.td_empty > span {
font: 600 18px/22px "Open Sans", sans-serif;
text-transform: uppercase;
color: #555454;
@@ -95,6 +95,51 @@ table#product_comparison .product-rating {
margin-bottom: 20px;
}
#stOCClose {
width: 29px !important;
height: 29px !important;
}
.stButton .stFb, .stButton .stTwbutton, .stButton .stMainServices {
height: 22px !important;
}
.stButton .stButton_gradient {
height: 22px !important;
}
@media (min-width: 1200px) {
.share {
margin-bottom: 315px;
}
}
@media (min-width: 992px) and (max-width: 1199px) {
.share {
margin-bottom: 315px;
}
}
@media (min-width: 768px) and (max-width: 991px) {
.share {
margin-bottom: 315px;
}
}
.share strong {
display: block;
margin-bottom: 10px;
}
.share > div {
margin-bottom: 8px;
}
.stArrow {
display: none !important;
}
.stButton {
margin-left: 0 !important;
}
#product_comparison .comparison_feature .product_name {
display: none;
}
themes/default-bootstrap/products-comparison.tpl
+2 -1
View File
@@ -37,7 +37,8 @@
<div class="products_block table-responsive">
<table id="product_comparison" class="table table-bordered">
<tr>
<td width="20%" class="td_empty">
<td width="20%" class="td_empty compare_extra_information">
{$HOOK_COMPARE_EXTRA_INFORMATION}
<span>{l s='Features:'}</span>
</td>
{assign var='taxes_behavior' value=false}
themes/default-bootstrap/sass/comparator.scss
+42 -4
View File
@@ -30,11 +30,11 @@ table#product_comparison {
td.td_empty {
vertical-align:bottom;
span {
> span {
font:600 18px/22px $font-custom;
text-transform:uppercase;
color:#555454;
}
}
}
}
}
@@ -110,8 +110,46 @@ table#product_comparison {
width:auto;
}
.footer_link { margin-bottom:20px;}
#stOCClose {
width:29px !important;
height:29px !important;
}
.stButton .stFb, .stButton .stTwbutton, .stButton .stMainServices {
height:22px !important;
}
.stButton .stButton_gradient {
height:22px !important;
}
@media (min-width: $screen-lg) { // min 1200px
.share {
margin-bottom:315px;
}
}
@media (min-width: $screen-md) and (max-width: $screen-md-max) { // min 992px max 1199px
.share {
margin-bottom:315px;
}
}
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { // min 768px max 991px
.share {
margin-bottom:315px;
}
}
.share {
strong {
display:block;
margin-bottom:10px;
}
}
.share > div {
margin-bottom:8px;
}
.stArrow {
display:none !important;
}
.stButton {
margin-left:0 !important;
}
#product_comparison{
.comparison_feature{
.product_name{display: none;}