summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-08-03 16:16:30 +0200
committerChristophe Simonis <chs@odoo.com>2016-08-03 16:16:30 +0200
commit53015e11a939cf147d35b15cbef7e463eca741d3 (patch)
tree5c6a96b91df63f4869e7dc7c37cf36ac3a53fa1e /addons/web/static/src
parente7e7b9beb0e46734e5df3d6a98527782ef837ddd (diff)
parenteb83ab236fa7d867b9e68b137d48be916b712e01 (diff)
[MERGE] forward port branch saas-11 up to eb83ab2
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/less/webclient_layout.less3
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/web/static/src/less/webclient_layout.less b/addons/web/static/src/less/webclient_layout.less
index 8f3252f34a7..3355f4f791f 100644
--- a/addons/web/static/src/less/webclient_layout.less
+++ b/addons/web/static/src/less/webclient_layout.less
@@ -33,7 +33,8 @@
> .o_main {
.o-flex(1, 1, auto);
.o-flex-display();
-
+ min-height: 0; // Allow flex to shrink this element as much as it wants
+
.o_sub_menu {
.o-flex(0, 0, @odoo-submenu-width);
.o-flex-display();