summaryrefslogtreecommitdiff
path: root/addons/web/static/src/css/base.sass
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2014-10-01 19:18:14 +0200
committerChristophe Simonis <chs@odoo.com>2014-10-01 19:18:14 +0200
commit709c9868de7c4ac4985ed4e0055ae3e3e49742ad (patch)
treee90227a947bddf47b3043fcbe8b99529a22aa7dd /addons/web/static/src/css/base.sass
parent85f26244a71a0b9a7faa283d6d24fdde6bae899a (diff)
parente8831932464814ed5f9e3a0af33f98891a466417 (diff)
[MERGE] forward port of branch 8.0 up to e883193
Diffstat (limited to 'addons/web/static/src/css/base.sass')
-rw-r--r--addons/web/static/src/css/base.sass10
1 files changed, 8 insertions, 2 deletions
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 5ca3ee7ac1b..13be06043da 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -199,6 +199,7 @@ $sheet-padding: 16px
background: white
&.openerp_webclient_container
height: calc(100% - 34px)
+ overflow: auto
@media (max-width: 768px)
&.openerp_webclient_container
height: calc(100% - 52px)
@@ -2658,6 +2659,8 @@ body.oe_single_form
// @media print {{{
@media print
.openerp
+ .oe_application > div > .oe_view_manager > .oe_view_manager_wrapper > div > .oe_view_manager_body
+ overflow: visible
.oe_header_row, ul.oe_header, div.oe_mail_thread_action, .oe_mail_recthread_actions, .oe_button_box, .oe_form button, button.oe_invite, .oe_form header, .openerp .oe_notebook > li.ui-state-default, .oe_topbar, .oe_leftbar, .oe_loading
// We use !important here because jQuery adds @style = display: block on elements when using $.fn.show()
display: none !important
@@ -2688,6 +2691,8 @@ body.oe_single_form
background: none
.openerp div.oe_mail_wall
overflow: hidden !important
+ .openerp.openerp_webclient_container
+ overflow: visible
// }}}
// End of customize
@@ -2744,13 +2749,14 @@ body.oe_single_form
padding: 1px
height: 18px
font-size: 20px
+ .modal-body
+ overflow-x: auto
.modal-footer
text-align: left
.oe_button
margin: 0 4px 0 0
.oe_act_window.modal-body
padding: 0
- overflow-x: auto
.ui-datepicker
z-index: 1500 !important
@@ -2792,7 +2798,7 @@ div.tour-backdrop
// }}}
body
- overflow: auto
+ overflow: hidden
// hack to make IE11 work
@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none)