From bc749910f24e6d0e901efcbd0cd46ee2a860c229 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 13 Dec 2013 22:37:59 +0100 Subject: [PATCH] [IMP] Revert bad change in CSS, for height of footer bzr revid: fp@tinyerp.com-20131213213759-fz3yjc79o09jmjw2 --- addons/website/static/src/css/website.css | 3 ++- addons/website/static/src/css/website.sass | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index 8f5b72fd31a..3c57d1bf69f 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -199,11 +199,12 @@ html, body, #wrapwrap { } #wrapwrap { + display: table; width: 100%; } header, #wrap, footer { - margin: 0 auto; + display: table-row; } footer { diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 9b1d1957066..eeac3ce2eb5 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -124,10 +124,11 @@ html,body, #wrapwrap height: 100% #wrapwrap + display: table width: 100% header, #wrap, footer - margin: 0 auto + display: table-row footer height: 100%