2 files changed, 30 insertions, 2 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 5b9afb52df4..52c5a73ecd1 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -41,6 +41,10 @@
   margin-right: 0px !important;
 }
 
+.apps-client {
+  border: 0;
+}
+
 .oe_notification {
   z-index: 1600;
 }
@@ -2846,6 +2850,7 @@ div.ui-widget-overlay {
 }
 .ui-menu .ui-menu-item a {
   padding: 1px 16px;
+  color: #404040;
 }
 .ui-menu .ui-menu-item a.ui-corner-all {
   -moz-border-radius: 0;
@@ -3033,11 +3038,23 @@ body.oe_single_form .oe_single_form_container {
 }
 
 @media print {
+  body {
+    height: auto !important;
+  }
+
+  .openerp#announcement_bar_table {
+    display: none;
+  }
+
   .openerp {
     text-shadow: none;
   }
+  .openerp .oe_application, .openerp .oe_view_manager_wrapper {
+    height: auto !important;
+  }
   .openerp .oe_application > div > .oe_view_manager > .oe_view_manager_wrapper > div > .oe_view_manager_body {
     overflow: visible;
+    position: relative !important;
   }
   .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;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index d19d0e0a177..740c0b6c01e 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -161,6 +161,9 @@ $sheet-padding: 16px
 .oe_systray
     margin-right: 0px !important
 
+.apps-client
+    border: 0
+
 // Notifications {{{
 .oe_notification
     z-index: 1600
@@ -198,7 +201,7 @@ $sheet-padding: 16px
     font-size: 13px
     background: white
     &.openerp_webclient_container
-        height: 95%
+        height: 95% // fallback for browsers without support for calc()
         height: -webkit-calc(100% - 34px)
         height: calc(100% - 34px)
         display: -ms-flexbox
@@ -206,7 +209,7 @@ $sheet-padding: 16px
         display: flex
     @media (max-width: 768px)
         &.openerp_webclient_container
-            height: 95%
+            height: 95% // fallback for browsers without support for calc()
             height: -webkit-calc(100% - 52px)
             height: calc(100% - 52px)
     // }}}
@@ -2339,6 +2342,7 @@ div.ui-widget-overlay
         padding: 0
         a
             padding: 1px 16px
+            color: #404040
         a.ui-corner-all
             @include radius(0)
         a.ui-state-active
@@ -2504,9 +2508,16 @@ body.oe_single_form
 
 // @media print {{{
 @media print
+    body
+        height: auto !important
+    .openerp#announcement_bar_table
+        display: none
     .openerp
+        .oe_application, .oe_view_manager_wrapper
+            height: auto !important
         .oe_application > div > .oe_view_manager > .oe_view_manager_wrapper > div > .oe_view_manager_body
             overflow: visible
+            position: relative !important
         .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