[MERGE] making the editor top bar the same height as the openerp topbar

bzr revid: fva@openerp.com-20130731075820-8mp2a2rec44bv29u
This commit is contained in:
Frédéric van der Essen
2013-07-31 09:58:20 +02:00
3 changed files with 3 additions and 4 deletions
+1 -2
View File
@@ -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;
+1 -1
View File
@@ -7,7 +7,7 @@
z-index: 10
display: block
width: 100%
padding: 10px
padding: 2px
margin: 0px
z-index: 10000
background-color: #414141
@@ -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());
});
});