[MERGE] ckeditor-based RTE

bzr revid: xmo@openerp.com-20130729145626-mytt2mkshcirz63b

2 files changed, 36 insertions, 2 deletions

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index fb0c2d081b8..e11bd754a05 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -129,6 +129,26 @@
   color: white;
 }
 
+.oe_website_editorbar .oe_rte_toolbar div.dropdown {
+  display: inline-block;
+}
+.oe_website_editorbar .oe_rte_toolbar div.dropdown li {
+  display: list-item;
+}
+.oe_website_editorbar .oe_rte_toolbar button {
+  font-family: FontAwesome;
+  font-weight: normal;
+  font-style: normal;
+  text-decoration: inherit;
+}
+.oe_website_editorbar .oe_rte_toolbar button.oe_button_list {
+  padding-right: 3px;
+}
+.oe_website_editorbar .oe_rte_toolbar button.oe_button_list:after {
+  content: "\F0D7";
+  padding-left: 6px;
+}
+
 /* }}} */
 .oe_editable:focus {
   outline: #80b5f2 solid 5px !important;
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 8e17378851b..9863264d692 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -218,8 +218,22 @@
             text-shadow: black 0px 0px 3px
             color: white
 
-
-
+.oe_website_editorbar .oe_rte_toolbar
+    div.dropdown
+        display: inline-block
+        li
+            display: list-item
+
+    button
+        font-family: FontAwesome
+        font-weight: normal
+        font-style: normal
+        text-decoration: inherit
+        &.oe_button_list
+            padding-right: 3px
+            &:after
+                content: "\F0D7"
+                padding-left: 6px
 
 /* }}} */