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

Revert "// update some css&tpl bugs"

Browse Source 
This reverts commit 01d5087067.
This commit is contained in:
rGaillard
2013-12-02 19:25:21 +01:00
parent 2931ebeeae
commit 08ef0667ca
10 changed files with 4133 additions and 3963 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default-bootstrap/sass/modules/blockcart/blockcart.scss
+1 -1
View File
@@ -45,7 +45,7 @@
a {
font-size:13px;
line-height:21px;
line-height:18px;
display:inline-block;
}
}
themes/default-bootstrap/sass/product.scss
+12 -3
View File
@@ -46,7 +46,6 @@ img{
/* pb-right-column ***************************************************************************** */
#pb-right-column {
margin-bottom:15px;
#image-block {
position:relative;
@@ -95,6 +94,17 @@ img{
&:hover:after{color:$base-text-color}
}
}
a.jqzoom {
div div {
img {
width:auto;
max-width:10000px;
}
.zoomWrapper {
border:none;
}
}
}
}
}
.ie8 #pb-right-column {
@@ -152,7 +162,7 @@ img{
width:90px;
cursor:pointer;
border:1px solid $product-image-border;
margin-right:9px;
margin-right:8px;
line-height:0;
@include box-sizing(border-box);
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { //min 768px max 991px
@@ -713,7 +723,6 @@ table.table-produst-discounts{
/* quantity_wanted */
#quantity_wanted_p{
width:100%;
input {
width:78px;
themes/default-bootstrap/sass/product_list.scss
+7 -7
View File
@@ -98,10 +98,10 @@ ul.product_list.grid {
margin-bottom:20px;
text-align:center;
@media (min-width: $screen-xs) and (max-width: $screen-xs-max) { // min 480px max 767px
width:50%;
float:left;
}
@media (min-width: $screen-xs) and (max-width: $screen-xs-max) { // min 480px max 767px
width:50%;
float:left;
}
.product-container {
background:$light-background;
@@ -139,7 +139,7 @@ ul.product_list.grid {
h5 {
padding:0 15px 7px 15px;
min-height:35px;
min-height:53px;
}
.comments_note {
@media (min-width: $screen-lg) { // min 1200px
@@ -169,7 +169,7 @@ ul.product_list.grid {
display:none;
}
.ajax_add_to_cart_button, span.button { margin-right:6px;margin-bottom:5px}
.ajax_add_to_cart_button, span.button { margin-right:6px;}
}
.functional-buttons {
@@ -179,7 +179,7 @@ ul.product_list.grid {
display:none;
}
div {
width:100%;
width:50%;
float:left;
padding:3px 0 4px 0;