diff options
| author | Xavier Morel <xmo@openerp.com> | 2014-01-16 10:47:47 +0100 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2014-01-16 10:47:47 +0100 |
| commit | e2fede3fe78c0f1c036f4f1695ebf7348655590f (patch) | |
| tree | 36c9301549263918366bc4f3e435ad8f95b867fc /addons/website/static/src/css | |
| parent | 726ef6e967ef3d6bcb7253c0ad0a29131d42a4ab (diff) | |
[ADD] dialog for fontawesome glyph manipulation
bzr revid: xmo@openerp.com-20140116094747-w1uey27l39fy66zc
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 | 9 |
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 5d1793e4aa5..36af8e24992 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -211,6 +211,10 @@ ul.oe_menu_editor .disclose { position: static !important; } +.cke_widget_inline { + display: inline !important; +} + .cke_widget_editable:empty:after { opacity: 0.3; white-space: pre-wrap; @@ -234,6 +238,10 @@ ul.oe_menu_editor .disclose { z-index: 1000; } +.cke_editable .fa { + cursor: pointer; +} + /* ---- MOBILE PREVIEW ---- {{{ */ .oe_mobile_preview.modal .modal-content { height: 660px; diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index a16f5f39383..2e0e5250fb7 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -25,7 +25,7 @@ +box-shadow(none) // }}} - + /* ---- OpenERP Style ---- {{{ */ .oe_website_editorbar @@ -177,6 +177,9 @@ ul.oe_menu_editor .cke_widget_wrapper position: static !important +.cke_widget_inline + display: inline !important + // prevent inline widgets from entirely disappearing when their (textual) // content is removed .cke_widget_editable @@ -202,6 +205,10 @@ ul.oe_menu_editor // This z-index is due to .navbar of bootstrap z-index: 1000 +// fontawesome +.cke_editable .fa + cursor: pointer + // }}} /* ---- MOBILE PREVIEW ---- {{{ */ |