[MERGE] with trunk-website-al

bzr revid: chm@openerp.com-20130731090746-r4uviyui176ngwbm
This commit is contained in:
Christophe Matthieu
2013-07-31 11:07:46 +02:00
2 changed files with 15 additions and 8 deletions
@@ -67,7 +67,12 @@
display: none;
}
.oe_ecommerce .oe_mycart .oe_product {
padding: 3px 5px 6px 10px;
display: inline-block;
width: 250px;
margin-left: 0px;
float: none;
margin-right: 16px;
padding: 8px 5px 6px 10px;
}
.oe_ecommerce .oe_mycart .oe_product > .pull-left {
width: 84px;
@@ -79,9 +84,9 @@
margin: auto;
}
.oe_ecommerce .oe_mycart .oe_product .oe_button_cart {
position: static;
right: 6px;
top: 6px;
text-align: right;
}
.oe_ecommerce .oe_mycart form input {
margin-bottom: 0;
@@ -154,9 +159,6 @@
max-width: 64px;
max-height: 64px;
}
.oe_ecommerce .oe_checkout .css_required input, .oe_ecommerce .oe_checkout .css_required select {
background-color: #d2d2ff !important;
}
.oe_ecommerce .oe_checkout h4 {
border-bottom: 1px solid #dddddd;
margin-right: 30px;
@@ -56,7 +56,12 @@
display: none
.oe_mycart
.oe_product
padding: 3px 5px 6px 10px
display: inline-block
width: 250px
margin-left: 0px
float: none
margin-right: 16px
padding: 8px 5px 6px 10px
> .pull-left
width: 84px
height: 64px
@@ -65,9 +70,9 @@
max-height: 64px
margin: auto
.oe_button_cart
position: static
right: 6px
top: 6px
text-align: right
form
input
margin-bottom: 0
@@ -117,7 +122,7 @@
.oe_checkout
.css_required
input, select
background-color: #d2d2ff !important
//background-color: #d2d2ff !important
h4
border-bottom: 1px solid #ddd
margin-right: 30px