From 41bb68a87b22831d73c21e5af4695a3f0c2d2de5 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 9 Oct 2013 15:40:16 +0200 Subject: [PATCH] [FIX] website_view: css responsible < 600 bzr revid: chm@openerp.com-20131009134016-chus09j1h0zogbo2 --- .../static/src/css/website_sale.css | 23 +++++++++++-------- .../static/src/css/website_sale.sass | 21 ++++++++++------- addons/website_sale/views/website_sale.xml | 6 ----- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/addons/website_sale/static/src/css/website_sale.css b/addons/website_sale/static/src/css/website_sale.css index 096f101c482..aba10f64266 100644 --- a/addons/website_sale/static/src/css/website_sale.css +++ b/addons/website_sale/static/src/css/website_sale.css @@ -51,6 +51,8 @@ left: 15px; right: 15px; border-top: 1px solid #dddddd; + max-height: 140px; + overflow: hidden; } .oe_mycart .input-group-addon { @@ -123,21 +125,22 @@ height: 560px; } -@media (max-width: 728px) { - .oe_product { - float: left; - width: 100%; - height: 200px; - display: inline-block; - } - +@media (max-width: 600px) { #products_grid table, #products_grid tbody, #products_grid tr, #products_grid td { float: left; width: 100%; display: inline-block; } - #products_grid table td.oe-height-2 { - display: none; + #products_grid .oe_product { + float: left; + width: 100%; + height: 300px; + display: inline-block; + } +} +@media (max-width: 400px) { + #products_grid .oe_product { + height: 200px; } } @media (min-width: 992px) { diff --git a/addons/website_sale/static/src/css/website_sale.sass b/addons/website_sale/static/src/css/website_sale.sass index 90ed57c4870..0704afbf09f 100644 --- a/addons/website_sale/static/src/css/website_sale.sass +++ b/addons/website_sale/static/src/css/website_sale.sass @@ -49,6 +49,8 @@ left: 15px right: 15px border-top: 1px solid #dddddd + max-height: 140px + overflow: hidden .oe_mycart .input-group-addon @@ -113,19 +115,22 @@ .oe-height-8 height: 560px -@media (max-width: 728px) - .oe_product - float: left - width: 100% - height: 200px - display: inline-block +@media (max-width: 600px) #products_grid table, tbody,tr, td float: left width: 100% display: inline-block - table td.oe-height-2 - display: none + .oe_product + float: left + width: 100% + height: 300px + display: inline-block + +@media (max-width: 400px) + #products_grid + .oe_product + height: 200px @media (min-width: 992px) .col-md-12 diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml index 3b567b6094d..8d3eef97705 100644 --- a/addons/website_sale/views/website_sale.xml +++ b/addons/website_sale/views/website_sale.xml @@ -160,12 +160,6 @@
- - - - - -