[MERGE] forward port of branch 8.0 up to e883193

2 files changed, 21 insertions, 8 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index b6859e7592e..1fdae301b99 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "utf-8";
+@charset "UTF-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -8,7 +8,6 @@
   font-weight: normal;
   font-style: normal;
 }
-
 @font-face {
   font-family: "EntypoRegular";
   src: url("/web/static/src/font/entypo-webfont.eot") format("eot");
@@ -19,7 +18,6 @@
   font-weight: normal;
   font-style: normal;
 }
-
 #oe_main_menu_navbar {
   min-height: 34px;
   z-index: 1001;
@@ -85,6 +83,7 @@
 }
 .openerp.openerp_webclient_container {
   height: calc(100% - 34px);
+  overflow: auto;
 }
 @media (max-width: 768px) {
   .openerp.openerp_webclient_container {
@@ -3026,7 +3025,6 @@
     top: 0px;
   }
 }
-
 .kitten-mode-activated {
   background-size: cover;
   background-attachment: fixed;
@@ -3260,6 +3258,9 @@ body.oe_single_form .oe_single_form_container {
   .openerp {
     text-shadow: none;
   }
+  .openerp .oe_application > div > .oe_view_manager > .oe_view_manager_wrapper > div > .oe_view_manager_body {
+    overflow: visible;
+  }
   .openerp .oe_header_row, .openerp ul.oe_header, .openerp div.oe_mail_thread_action, .openerp .oe_mail_recthread_actions, .openerp .oe_button_box, .openerp .oe_form button, .openerp button.oe_invite, .openerp .oe_form header, .openerp .openerp .oe_notebook > li.ui-state-default, .openerp .oe_topbar, .openerp .oe_leftbar, .openerp .oe_loading {
     display: none !important;
   }
@@ -3295,6 +3296,10 @@ body.oe_single_form .oe_single_form_container {
   .openerp .openerp div.oe_mail_wall {
     overflow: hidden !important;
   }
+
+  .openerp.openerp_webclient_container {
+    overflow: visible;
+  }
 }
 .tooltip {
   padding: 0;
@@ -3355,6 +3360,9 @@ body.oe_single_form .oe_single_form_container {
   height: 18px;
   font-size: 20px;
 }
+.modal .modal-body {
+  overflow-x: auto;
+}
 .modal .modal-footer {
   text-align: left;
 }
@@ -3363,7 +3371,6 @@ body.oe_single_form .oe_single_form_container {
 }
 .modal .oe_act_window.modal-body {
   padding: 0;
-  overflow-x: auto;
 }
 
 .ui-datepicker {
@@ -3414,7 +3421,7 @@ div.tour-backdrop {
 }
 
 body {
-  overflow: auto;
+  overflow: hidden;
 }
 
 @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
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)