From 3e373984a4547c144fea866b0ba132b84c31b965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Wed, 31 Jul 2013 09:56:11 +0200 Subject: [PATCH] making the editor bar the same height as the rest of openerp bzr revid: fva@openerp.com-20130731075611-lurg5zye995r9te7 --- addons/website/static/src/css/editor.css | 3 +-- addons/website/static/src/css/editor.sass | 2 +- addons/website/static/src/js/website_bootstrap.js | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index eca9a2edc22..7cd68099e2c 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -1,4 +1,3 @@ -@charset "utf-8"; .oe_website_editorbar { position: fixed; top: 0; @@ -6,7 +5,7 @@ z-index: 10; display: block; width: 100%; - padding: 10px; + padding: 2px; margin: 0px; z-index: 10000; background-color: #414141; diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 3f672f822d7..f1208ca2a80 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -7,7 +7,7 @@ z-index: 10 display: block width: 100% - padding: 10px + padding: 2px margin: 0px z-index: 10000 background-color: #414141 diff --git a/addons/website/static/src/js/website_bootstrap.js b/addons/website/static/src/js/website_bootstrap.js index 2ac4293221a..68d2388be68 100644 --- a/addons/website/static/src/js/website_bootstrap.js +++ b/addons/website/static/src/js/website_bootstrap.js @@ -14,6 +14,6 @@ $(function() { $(function() { var editor = new instance.website.EditorBar(instance.webclient); editor.prependTo($('body')); - $('body').css('padding-top', '48px'); // Not working properly: editor.$el.outerHeight()); + $('body').css('padding-top', '32px'); // Not working properly: editor.$el.outerHeight()); }); });