summaryrefslogtreecommitdiff
path: root/addons/web_editor/static
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-08-20 17:18:31 +0200
committerChristophe Simonis <chs@odoo.com>2016-08-20 17:18:31 +0200
commit9ad5f26b3fb98cd14527de80d19bf6554a6981e2 (patch)
tree771dc0267ad045abb1f2c4c77e814fbf7f3923d9 /addons/web_editor/static
parentc3665fb5c9c9c50e9a8fd2d52e83c50f52d603aa (diff)
parent3a2147d95c8005ab7c1dbe4d94315e404ea5e5f9 (diff)
[MERGE] forward port branch saas-11 up to 3a2147d
Diffstat (limited to 'addons/web_editor/static')
-rw-r--r--addons/web_editor/static/src/less/web_editor.ui.less13
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 0a12dd78a47..f453d0ca384 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%;
@@ -703,6 +706,7 @@ html[lang] > body.editor_enable{
.popover-content {
height: @odoo-navbar-height;
+ white-space: nowrap;
.btn {
height: @odoo-navbar-height;
@@ -717,6 +721,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;
@@ -746,6 +755,10 @@ html[lang] > body.editor_enable{
}
}
}
+ .note-para .dropdown-menu {
+ min-width: 228px;
+ }
+
#colors_preview {
padding: 4px;
border-radius: 2px;