diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-08-20 16:57:36 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-08-20 16:57:36 +0200 |
| commit | 3a2147d95c8005ab7c1dbe4d94315e404ea5e5f9 (patch) | |
| tree | 98b5b79e5f866a64849f349119e0855f6da5d7ff /addons/web_editor/static/src/less/web_editor.ui.less | |
| parent | 99215a02c61ca8c470931955225e5db1cd402d43 (diff) | |
| parent | bc1a0a32ca80aaadd52e66115fe9c9ad4b26c2e0 (diff) | |
[MERGE] forward port branch saas-10 up to bc1a0a3
Diffstat (limited to 'addons/web_editor/static/src/less/web_editor.ui.less')
| -rw-r--r-- | addons/web_editor/static/src/less/web_editor.ui.less | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/addons/web_editor/static/src/less/web_editor.ui.less b/addons/web_editor/static/src/less/web_editor.ui.less index a9a809875ce..38bd5b7cd87 100644 --- a/addons/web_editor/static/src/less/web_editor.ui.less +++ b/addons/web_editor/static/src/less/web_editor.ui.less @@ -12,10 +12,13 @@ form.navbar-form { height: 100%; + z-index: 1060; margin: 0; padding: 0; .o-position-absolute(@right: -@o-we-sidebar-width); .o-transition(right, 0.4s, @o-we-md-ease); + border-left: 1px solid @o-we-color-divider; + background-color: inherit; .btn-group { height: 100%; @@ -660,6 +663,7 @@ html[lang] > body.editor_enable{ .popover-content { height: @odoo-navbar-height; + white-space: nowrap; .btn { height: @odoo-navbar-height; @@ -674,6 +678,11 @@ html[lang] > body.editor_enable{ border-top: 2px solid @o-we-color-text-normal; color: @o-we-color-text-normal; } + + .o_image_alt { + .o-text-overflow(inline-block); + max-width: 100px; + } } .btn.active { border-top: 2px solid white; @@ -703,6 +712,10 @@ html[lang] > body.editor_enable{ } } } + .note-para .dropdown-menu { + min-width: 228px; + } + #colors_preview { padding: 4px; border-radius: 2px; |
