[IMP] RTE

bzr revid: xmo@openerp.com-20130923120638-wydikh3e6y20zca5

4 files changed, 17 insertions, 12 deletions

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 127939f6caf..64f58c8db11 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -1,4 +1,4 @@
-@charset "utf-8";
+@charset "UTF-8";
 /* ---- CKEditor Minimal Reset ---- */
 .navbar.navbar-inverse .cke_chrome {
   border: none;
@@ -128,6 +128,10 @@ table.editorbar-panel td.selected {
   margin-bottom: 0.5em;
 }
 
+.cke_widget_drag_handler_container {
+  display: none !important;
+}
+
 /* ---- SNIPPET EDITOR ---- */
 #oe_snippets {
   position: fixed;
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 6eb47eab614..90b02d3b83a 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -114,6 +114,10 @@ table.editorbar-panel
 .modal .image-preview
     margin-bottom: 0.5em
 
+// "remove" drag & drop of CKE widgets
+.cke_widget_drag_handler_container
+    display: none !important
+
 /* ---- SNIPPET EDITOR ---- */
 
 #oe_snippets
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 261d89b40e8..c48d4fa9b2a 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -1,4 +1,3 @@
-@charset "utf-8";
 /*       THIS CSS FILE IS FOR WEBSITE THEMING CUSTOMIZATION ONLY
  *
  * css for editor buttons, openerp widget included in the website and other
@@ -191,12 +190,12 @@ h1.text-muted, h2.text-muted, h3.text-muted {
 }
 
 /* ----- BOOTSTRAP HACK FOR STICKY FOOTER ----- */
-html, body {
+html, body, #wrapwrap {
   box-sizing: border-box;
   height: 100%;
 }
 
-body {
+#wrapwrap {
   display: table;
   width: 100%;
 }
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index a289436d63a..9f7efa2c416 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -123,11 +123,11 @@ h1.text-muted, h2.text-muted, h3.text-muted
 
 /* ----- BOOTSTRAP HACK FOR STICKY FOOTER ----- */
 
-html,body
+html,body, #wrapwrap
     box-sizing: border-box
     height: 100%
 
-body
+#wrapwrap
     display: table
     width: 100%
 
@@ -232,9 +232,8 @@ footer
 .nav-hierarchy
     padding-left: 16px
 
-#themes-list
-    .well
-        padding: 0 0 20px 0
+#themes-list .well
+    padding: 0 0 20px 0
 
 /* -- Hack for removing double scrollbar from mobile preview -- */
 div#mobile-preview.modal
@@ -244,9 +243,8 @@ div#mobile-preview.modal
 ul.nav-stacked > li > a
     padding: 2px 15px
 
-#customize-menu
-    .dropdown-header
-        text-transform: uppercase
+#customize-menu .dropdown-header
+    text-transform: uppercase
 
 /* ---- PUBLISH ---- */
 a[data-publish]