summaryrefslogtreecommitdiff
path: root/addons/website/static/src/css
diff options
context:
space:
mode:
authorbth-openerp <bth@tinyerp.com>2013-10-24 10:45:43 +0530
committerbth-openerp <bth@tinyerp.com>2013-10-24 10:45:43 +0530
commit12ca31cb2d95749332ddee07b3c2b19e5b746e6b (patch)
treec5a3021f38e0caf39abcd117cd190891a0171cb8 /addons/website/static/src/css
parent17a37e775d4dcf7312ec6792c0f16adcc4cba5e0 (diff)
parentd5379f3b7cfba31dac8b7cfa9251243e26c7f018 (diff)
[MERGE]Merge trunk-website-al.
bzr revid: bth@tinyerp.com-20131024051543-zow19or2yqh5kczn
Diffstat (limited to 'addons/website/static/src/css')
-rw-r--r--addons/website/static/src/css/editor.css6
-rw-r--r--addons/website/static/src/css/editor.sass4
2 files changed, 9 insertions, 1 deletions
diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 26032aaf7ce..8fa0ad80f5f 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -1,4 +1,3 @@
-@charset "utf-8";
/* ---- CKEditor Minimal Reset ---- */
.navbar.navbar-inverse .cke_chrome {
border: none;
@@ -174,6 +173,11 @@ table.editorbar-panel td.selected {
white-space: pre-wrap;
}
+.oe_carlos_danger {
+ outline: 1px solid red !important;
+ background-color: #ffd9dd !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 e4ef24dad70..5dbe7a8eee9 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -154,6 +154,10 @@ table.editorbar-panel
content: " "
white-space: pre-wrap
+.oe_carlos_danger
+ outline: 1px solid red !important
+ background-color: #ffd9dd !important
+
/* ---- SNIPPET EDITOR ---- */
#oe_snippets