[IMP] [MONKEY] Re-apply changes introduced at version 3664 that was

[odoo/odoo.git] / addons / web / static / lib / cleditor / jquery.cleditor.js

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