From 2c7d428aeea30b132132e38759274a8d99874f0f Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Thu, 19 Sep 2013 07:54:25 +0200 Subject: [PATCH 01/30] [IMP] shop bzr revid: fp@openerp.com-20130919055425-6puq8f4e7bawkyan --- addons/website/static/src/css/website.css | 56 +++++++++++++++++ addons/website/static/src/css/website.sass | 33 ++++++++++ addons/website_sale/views/website_sale.xml | 73 +++++++++++++--------- addons/website_sale/website_sale.py | 6 ++ 4 files changed, 137 insertions(+), 31 deletions(-) diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index bb6fbf19041..ea4571369e8 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -168,6 +168,62 @@ vertical-align: bottom; } +.oe_product { + border-bottom: 1px solid grey; + border-right: 1px solid grey; + padding: 0; + .oe_product_image-width: 100%; + .oe_product_image-height: auto; +} + +.oe-height-1 { + height: 60px; +} + +.oe-height-2 { + height: 120px; +} + +.oe-height-3 { + height: 180px; +} + +.oe-height-4 { + height: 240px; +} + +.oe-height-5 { + height: 300px; +} + +.oe-height-6 { + height: 360px; +} + +.oe-height-7 { + height: 420px; +} + +.oe-height-8 { + height: 480px; +} + +.oe-height-9 { + height: 540px; +} + +.oe-height-10 { + height: 600px; +} + +.oe-height-11 { + height: 620px; +} + +.oe-height-12 { + height: 680px; +} + /* Extra Styles */ img.shadow { -webkit-border-radius: 3px; diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 53154729981..25ea781adce 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -100,6 +100,39 @@ &.grid-align-bottom > [class*="col-md"] vertical-align: bottom +.oe_product + border-bottom: 1px solid grey + border-right: 1px solid grey + padding: 0 + .oe_product_image: + width: 100% + height: auto + +.oe-height-1 + height: 60px +.oe-height-2 + height: 120px +.oe-height-3 + height: 180px +.oe-height-4 + height: 240px +.oe-height-5 + height: 300px +.oe-height-6 + height: 360px +.oe-height-7 + height: 420px +.oe-height-8 + height: 480px +.oe-height-9 + height: 540px +.oe-height-10 + height: 600px +.oe-height-11 + height: 620px +.oe-height-12 + height: 680px + /* Extra Styles */ img.shadow diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml index e85922dcc7f..88a3a3ef972 100644 --- a/addons/website_sale/views/website_sale.xml +++ b/addons/website_sale/views/website_sale.xml @@ -86,7 +86,7 @@ -