summaryrefslogtreecommitdiff
path: root/addons/website/static/src
diff options
context:
space:
mode:
authorFabien Pinckaers <fp@tinyerp.com>2013-08-27 15:04:56 +0200
committerFabien Pinckaers <fp@tinyerp.com>2013-08-27 15:04:56 +0200
commit59819fac142e0a53e8c8ca06a8cb38d6b7dd8b59 (patch)
tree1c6e13cf3d5cbfa805c61bcfb36b1a479c0efc13 /addons/website/static/src
parentbe165dbb7a32a1990dcd151c4bb2e66ab3be91f1 (diff)
[IMP] cleaned CKEditor, minimal CSS change
bzr revid: fp@tinyerp.com-20130827130456-c3u40tesfalapj7z
Diffstat (limited to 'addons/website/static/src')
-rw-r--r--addons/website/static/src/css/editor.css21
-rw-r--r--addons/website/static/src/css/editor.sass19
2 files changed, 39 insertions, 1 deletions
diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 00d3127e286..207173c360c 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -1,4 +1,25 @@
@charset "utf-8";
+
+
+/* ---- CKEditor Minimal Reset ---- */
+
+.navbar.navbar-inverse .cke_chrome {
+ border: none;
+}
+.navbar.navbar-inverse .cke_inner {
+ background: transparent;
+}
+.navbar.navbar-inverse .cke_top {
+ background: transparent;
+ border: none;
+ box-shadow: none;
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+}
+
+
+/* ---- OpenERP ---- */
+
.oe_hidden {
display: none !important;
}
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index c75946d7c6b..031b27a10db 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -1,5 +1,22 @@
@charset "utf-8"
+/* ---- CKEditor Minimal Reset ---- */
+
+.navbar.navbar-inverse .cke_chrome
+ border: none
+
+.navbar.navbar-inverse .cke_inner
+ background: transparent
+
+.navbar.navbar-inverse .cke_top
+ background: transparent
+ border: none
+ box-shadow: none
+ -webkit-box-shadow: none
+ -moz-box-shadow: none
+
+/* ---- OpenERP Style ---- */
+
.oe_hidden
display: none !important
@@ -250,4 +267,4 @@ $icon_close: #E00101
width: 39em
li
float: left
- width: 12em \ No newline at end of file
+ width: 12em