summaryrefslogtreecommitdiff
path: root/addons/website/static/src/css
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2013-09-12 13:29:05 +0200
committerXavier Morel <xmo@openerp.com>2013-09-12 13:29:05 +0200
commit75977b4e43026d21ce691f30c0df1043485d83fe (patch)
tree7ee558dc648685e13a69ed18447b7cb39120de6a /addons/website/static/src/css
parentd124389fa314e57cb27d27ed4fe242322c597c6f (diff)
[ADD] selection of image style in dialog
bzr revid: xmo@openerp.com-20130912112905-6skmq1umsyzcvthz
Diffstat (limited to 'addons/website/static/src/css')
-rw-r--r--addons/website/static/src/css/editor.css3
-rw-r--r--addons/website/static/src/css/editor.sass2
2 files changed, 2 insertions, 3 deletions
diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index d2c3f9da9c9..834baff3e35 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;
@@ -95,7 +94,7 @@ table.editorbar-panel td.selected {
background-color: #b1c9d9;
}
-.modal .image-preview {
+.modal .image-preview-container, .modal .image-preview {
margin-bottom: 0.5em;
}
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 7f9f646f054..3c1fe6a47f5 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -83,7 +83,7 @@ table.editorbar-panel
td.selected
background-color: #b1c9d9
-.modal .image-preview
+.modal .image-preview-container, .modal .image-preview
margin-bottom: 0.5em
/* ---- RTE ---- */