summaryrefslogtreecommitdiff
path: root/addons/website/static/src/css
diff options
context:
space:
mode:
authorchm@openerp.com <>2014-03-27 11:51:03 +0100
committerchm@openerp.com <>2014-03-27 11:51:03 +0100
commitc15e5b5163de3310b4ffe9f486df79ecbe80e445 (patch)
treec0c109f1477ca3d6f8149c5e5d093ba758a9e240 /addons/website/static/src/css
parent740e35e56dca79cd0347ef4a238c33577fe82311 (diff)
[WIP] website media editor
bzr revid: chm@openerp.com-20140327105103-r4laze34bf0z62o2
Diffstat (limited to 'addons/website/static/src/css')
-rw-r--r--addons/website/static/src/css/editor.css11
-rw-r--r--addons/website/static/src/css/editor.sass6
2 files changed, 16 insertions, 1 deletions
diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 8192a6e1111..1256af59369 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -301,7 +301,16 @@ ul.oe_menu_editor .disclose {
position: absolute;
top: 0;
left: 0;
- z-index: 1001;
+ z-index: 1000;
+}
+
+.preview-container {
+ height: 100px;
+}
+.preview-container > * {
+ max-height: 100px;
+ margin: 0 auto;
+ display: block;
}
.cke_editable .fa {
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index c0f946e0f6f..4543fce4500 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -266,6 +266,12 @@ $attachment-border-color: #848490
left: 0
// This z-index is due to .navbar of bootstrap
z-index: 1000
+.preview-container
+ height: 100px
+ > *
+ max-height: 100px
+ margin: 0 auto
+ display: block
// fontawesome
.cke_editable .fa