antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rebase and fix

Browse Source
This commit is contained in:
Michael RICOIS 2018-01-19 11:22:07 +01:00
parent a367324847
commit 3f98533689
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
themes/site_mobile/css/style.css
View File

@ -1670,6 +1670,7 @@ body#category .sale_title, body#product .sale_title {
padding: 10px 0px; padding: 10px 0px;
border-top: 1px solid #e4e4e4; border-top: 1px solid #e4e4e4;
border-bottom: 1px solid #e4e4e4; border-bottom: 1px solid #e4e4e4;
padding: 10px 0px;
text-align: left; text-align: left;
clear:both; clear:both;
} }
@ -1679,7 +1680,7 @@ body#category .sale_title, body#product .sale_title {
display: inline-block; display: inline-block;
height: 40px; height: 40px;
width: 15%; width: 15%;
vertical-align: top; vertical-align: middle;
border: 0; border: 0;
} }
body#category .sale_title .gradient a.back, body#category .sale_title .gradient a.back,
@ -1808,9 +1809,6 @@ body#order table#cart_summary tbody tr.cart_item .cart_description h5 a{
body#category ul#product_list li div.list-product-price{ body#category ul#product_list li div.list-product-price{
font-size:12px; font-size:12px;
padding:0px 2% 0px 4%; padding:0px 2% 0px 4%;
position: absolute;
bottom: 10px;
width: 100%;
} }
body#category ul#product_list li div.list-product-price span.old_price{ body#category ul#product_list li div.list-product-price span.old_price{
display:block; display:block;
@ -5350,22 +5348,12 @@ body#order-detail table#order-product tbody tr.item tr.title span.quantity{
height: 30px; height: 30px;
width: 100%; width: 100%;
} }
<<<<<<< Upstream, based on origin/master
#product_list li div.expresscart_container { #product_list li div.expresscart_container {
float: right; float: right;
} }
#product_list li div.expresscart_container a.button.expresscart { #product_list li div.expresscart_container a.button.expresscart {
padding-left: 36px;
background: url("../img/add_to_cart.png") no-repeat left center #fb66a9;
height: 32px;
width: 38px;
display: block;
position: absolute;
bottom: 12px;
border-radius: 20px;
right: 0;
=======
#product_list li div.right_block a.button.expresscart{
padding-left: 36px; padding-left: 36px;
background: url("../img/add_to_cart.png") no-repeat left center #fb66a9; background: url("../img/add_to_cart.png") no-repeat left center #fb66a9;
background-size: 38px 32px; background-size: 38px 32px;
@ -5373,8 +5361,8 @@ body#order-detail table#order-product tbody tr.item tr.title span.quantity{
width: 38px; width: 38px;
display: block; display: block;
position: absolute; position: absolute;
bottom: 4px; bottom: 12px;
border-radius: 20px; border-radius: 20px;
>>>>>>> ab90b92 Change image - better quality right: 0;
z-index: 10000; z-index: 10000;
} }