summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2012-01-04 14:09:52 +0100
committerniv-openerp <nicolas.vanhoren@openerp.com>2012-01-04 14:09:52 +0100
commitf2cf2066a2c52b08fc97bfc486c58023377e2d8a (patch)
tree77b502fd9fd69c5acca929c0d8d8b906527d8f7c /addons
parente9e419089e879141525ad0c7d5ea11abba4e3e6d (diff)
[imp] changed declaration of body
bzr revid: nicolas.vanhoren@openerp.com-20120104130952-61ti896e6pxgorps
Diffstat (limited to 'addons')
-rw-r--r--addons/web/controllers/main.py2
-rw-r--r--addons/web/static/src/css/base.css5
2 files changed, 1 insertions, 6 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index c83d016dd88..ba5f56f613f 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -89,7 +89,7 @@ html_template = """<!DOCTYPE html>
});
</script>
</head>
- <body></body>
+ <body style="margin: 0;height: 100%%;"></body>
</html>
"""
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 40d02e51254..2fc3aafd87b 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,9 +1,4 @@
-body {
- margin: 0;
- height: 100%;
-}
-
.openerp {
padding: 0;
margin: 0;