diff options
| author | Richard Mathot (OpenERP) <rim@openerp.com> | 2013-12-18 13:48:33 +0100 |
|---|---|---|
| committer | Richard Mathot (OpenERP) <rim@openerp.com> | 2013-12-18 13:48:33 +0100 |
| commit | 3bfbcfee360e39b83d07bc38d2a331ae2cfe70a0 (patch) | |
| tree | 7fe90117fb495a6fc54cebf859270cc417fdb177 /addons/website/static/src/css | |
| parent | b5de38f2875759230e7f46997761ea442ccbbd97 (diff) | |
| parent | 90a9e522f3190a314fca289066943f312cd637f3 (diff) | |
[MERGE] Merge parents
bzr revid: rim@openerp.com-20131218072037-7g2t677f1fryj9tt
bzr revid: rim@openerp.com-20131218124833-07mgsnr35oibusn1
Diffstat (limited to 'addons/website/static/src/css')
| -rw-r--r-- | addons/website/static/src/css/editor.css | 8 | ||||
| -rw-r--r-- | addons/website/static/src/css/editor.sass | 15 |
2 files changed, 19 insertions, 4 deletions
diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index e40d6996850..e21bfc1fbe8 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -211,9 +211,15 @@ ul.oe_menu_editor .disclose { } .cke_widget_editable:empty:after { - content: " "; + opacity: 0.3; white-space: pre-wrap; } +.cke_widget_editable:not([placeholder]):empty::after { + content: " "; +} +.cke_widget_editable[placeholder]:not(:focus):empty::after { + content: attr(placeholder); +} .oe_carlos_danger { outline: 1px solid red !important; diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 38b1d9f3436..ff62f416d8d 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -171,11 +171,20 @@ ul.oe_menu_editor // Breaks completely horribly crazy products listing page, so take it out. .cke_widget_wrapper position: static !important + // prevent inline widgets from entirely disappearing when their (textual) // content is removed -.cke_widget_editable:empty:after - content: " " - white-space: pre-wrap +.cke_widget_editable + // basic config + &:empty:after + opacity: 0.3 + white-space: pre-wrap + // no @placeholder -> just add some padding + &:not([placeholder]):empty::after + content: " " + // with placeholder and when not (yet) focused -> display placeholder + &[placeholder]:not(:focus):empty::after + content: attr(placeholder) .oe_carlos_danger outline: 1px solid red !important |