From cc23ddd0cec62342d538c17140840f7dda569d0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 5 Mar 2014 11:57:51 +0100
Subject: [PATCH] [IMP] [MONKEY] Re-apply changes introduced at version 3664
 that was a forward port of 7.0 commits. Commit 1 by fme. [FIX] html widget:
 fix cleditor width when the field was invisible before becoming editable
 Commit 2 by tde. [IMP] cleditor: stop using custom font-size, font-family.

bzr revid: tde@openerp.com-20140305105751-w1i47ytx73ac5gkr
---
 addons/web/static/lib/cleditor/jquery.cleditor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/lib/cleditor/jquery.cleditor.js b/addons/web/static/lib/cleditor/jquery.cleditor.js
index c9e5deff36c..e11d1b15986 100644
--- a/addons/web/static/lib/cleditor/jquery.cleditor.js
+++ b/addons/web/static/lib/cleditor/jquery.cleditor.js
@@ -47,7 +47,7 @@
       docCSSFile:   // CSS file used to style the document contained within the editor
                     "", 
       bodyStyle:    // style to assign to document body contained within the editor
-                    "margin:4px; font:10pt Arial,Verdana; cursor:text"
+                    "margin:4px; color:#4c4c4c; font-size:13px; font-family:\"Lucida Grande\",Helvetica,Verdana,Arial,sans-serif; cursor:text"
     },
 
     // Define all usable toolbar buttons - the init string property is 
@@ -933,7 +933,7 @@
 
       var $toolbar = editor.$toolbar,
           $group = $toolbar.children("div:last"),
-          wid = $main.width();
+          wid = /%/.test("" + options.width) ? options.width : $main.width();
 
       // Resize the toolbar
       var hgt = $group.offset().top + $group.outerHeight() - $toolbar.offset().top + 1;