[MERGE] forward port of branch 8.0 up to ed1c173

2 files changed, 12 insertions, 1 deletions

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index e7da638b256..841f1ac0153 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -86,6 +86,9 @@
 .openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_body pre {
     white-space: pre-wrap;
 }
+.openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_body blockquote {
+    font-size: 1em;
+}
 .openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_body * {
     text-overflow:ellipsis;
     word-wrap: break-word;
diff --git a/addons/mail/static/src/js/announcement.js b/addons/mail/static/src/js/announcement.js
index 95d4dc6e1ff..7afb25a7da0 100644
--- a/addons/mail/static/src/js/announcement.js
+++ b/addons/mail/static/src/js/announcement.js
@@ -31,13 +31,21 @@ openerp_announcement = function(instance) {
                     var close = function() {
                         var ttl = 7*24*60*60;
                         self.session.set_cookie('ab', 'c', ttl);
-                        $bar.slideUp('slow');
+                        $bar.slideUp();
+                        setTimeout(function () {
+                            $('.openerp_webclient_container').css('height', 'calc(100% - 34px)');                            
+                        }, 400);
                     };
+                    var height = $('#announcement_bar_table').outerHeight() 
+                                + $('#oe_main_menu_navbar').outerHeight();
+                    $('.openerp_webclient_container').css('height', 'calc(100% - ' + height + 'px)');
                     $bar.find('.close').on('click', close);
                     self.trigger('ab_loaded', $bar);
                 });
 
                 $('head').append($css);
+            }).fail(function(result, ev){
+                ev.preventDefault();
             });
         }
     });