From 1a0976a764081425175f3027d2661060686c21fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Wed, 31 Jul 2013 10:13:04 +0200 Subject: [PATCH 1/2] quick fix for the shopping cart display bzr revid: fva@openerp.com-20130731081304-1j2p1o13e061ka1q --- addons/website_sale/static/src/css/ecommerce.css | 9 +++++++-- addons/website_sale/static/src/css/ecommerce.sass | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/addons/website_sale/static/src/css/ecommerce.css b/addons/website_sale/static/src/css/ecommerce.css index 42d72a434b1..baad5b43f4e 100644 --- a/addons/website_sale/static/src/css/ecommerce.css +++ b/addons/website_sale/static/src/css/ecommerce.css @@ -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; diff --git a/addons/website_sale/static/src/css/ecommerce.sass b/addons/website_sale/static/src/css/ecommerce.sass index 25735c49f58..69862c80298 100644 --- a/addons/website_sale/static/src/css/ecommerce.sass +++ b/addons/website_sale/static/src/css/ecommerce.sass @@ -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 From cd1fe5b5662fcf8d9743973f20e4f5cc3208ccdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Wed, 31 Jul 2013 10:21:17 +0200 Subject: [PATCH 2/2] remove custom input background bzr revid: fva@openerp.com-20130731082117-r1qzq4b3mkcet2nl --- addons/website_sale/static/src/css/ecommerce.css | 3 --- addons/website_sale/static/src/css/ecommerce.sass | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/addons/website_sale/static/src/css/ecommerce.css b/addons/website_sale/static/src/css/ecommerce.css index baad5b43f4e..5cef9feb198 100644 --- a/addons/website_sale/static/src/css/ecommerce.css +++ b/addons/website_sale/static/src/css/ecommerce.css @@ -159,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; diff --git a/addons/website_sale/static/src/css/ecommerce.sass b/addons/website_sale/static/src/css/ecommerce.sass index 69862c80298..7c5af70944e 100644 --- a/addons/website_sale/static/src/css/ecommerce.sass +++ b/addons/website_sale/static/src/css/ecommerce.sass @@ -122,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