[MERGE] forward port of branch saas-8 up to 2611a81

5 files changed, 37 insertions, 27 deletions

diff --git a/addons/mail/static/src/less/chat_window.less b/addons/mail/static/src/less/chat_window.less
index a4024c93dc1..48efa703417 100644
--- a/addons/mail/static/src/less/chat_window.less
+++ b/addons/mail/static/src/less/chat_window.less
@@ -23,6 +23,10 @@
         }
     }
 
+    @media print {
+        display: none;
+    }
+
     .o_chat_header {
         .o-flex-display();
         .o-flex(0, 0, auto);
@@ -125,6 +129,10 @@
     }
 }
 
+.o_ui_blocked .o_chat_window {
+    z-index: 1101; // blockUI's z-index is 1100
+}
+
 // FIXME: move this to its own file in master
 .o_chat_window.o_thread_less {
     .o_chat_search_input {
diff --git a/addons/mail/static/src/less/chatter.less b/addons/mail/static/src/less/chatter.less
index 839e419e88e..8ea43b8373e 100644
--- a/addons/mail/static/src/less/chatter.less
+++ b/addons/mail/static/src/less/chatter.less
@@ -131,9 +131,3 @@
         list-style: none;
     }
 }
-
-@media print {
-    .oe_chatter {
-        display: none;
-    }
-}
diff --git a/addons/mail/static/src/less/client_action.less b/addons/mail/static/src/less/client_action.less
index aa469649f2a..51c427b4923 100644
--- a/addons/mail/static/src/less/client_action.less
+++ b/addons/mail/static/src/less/client_action.less
@@ -70,10 +70,18 @@
             }
         }
         .o_mail_chat_channel_item {
+            .o-flex-display();
             width: 100%;
             padding: 2px 8px 2px 1.5*@odoo-horizontal-padding; // larger padding-left than titles
-            > .badge {
-                margin: 0;
+            .o_channel_name {
+                .o-flex(1, 1, auto);
+                .o-text-overflow();
+            }
+            .o_mail_sidebar_needaction, .o_mail_partner_unpin {
+                .o-flex(0, 0, auto);
+            }
+            .o_mail_sidebar_needaction {
+                margin: 0 0 0 5px;
             }
             .o_mail_partner_unpin {
                 padding: 2px 6px;
@@ -85,10 +93,11 @@
         }
         .o_mail_add_channel {
             width: 100%;
-            padding: 5px 8px 5px 1.5*@odoo-horizontal-padding; // larger padding-left than titles
+            padding: 5px 1.5*@odoo-horizontal-padding; // larger padding-left than titles
             position: relative;
 
             > input {
+                width: 100%;
                 padding: 2px 5px;
                 padding-left: 12px;
             }
@@ -175,8 +184,6 @@
         opacity: 0.9;
 
         .o_mail_chat_channel_item {
-            overflow: hidden;
-            text-overflow: ellipsis;
             cursor: pointer;
 
             &:hover {
@@ -282,6 +289,9 @@
             display: none;
         }
     }
+    &.o_unread_chat > a > i {
+        color: @odoo-brand-optional;
+    }
 
     &.open .o_mail_navbar_dropdown {
         .o-flex-display();
@@ -307,19 +317,16 @@
             height: 50px;
         }
 
-        .o_filter_button,
-        .o_new_message,
-        .o_redirect_to_discuss {
-            .btn-link;
-            padding: 5px;
-        }
-
         .o_mail_navbar_dropdown_top {
             .o-flex-display();
             .o-flex(0, 0, auto);
             justify-content: space-between;
             border-bottom: 1px solid lightgray;
 
+            .o_filter_button, .o_new_message {
+                .btn-link;
+                padding: 5px;
+            }
             .o_filter_button {
                 color: @odoo-main-color-muted;
                 &:hover, &.o_selected {
@@ -331,15 +338,6 @@
                 }
             }
         }
-        .o_mail_navbar_dropdown_bottom {
-            .o-flex(0, 0, auto);
-            border-top: 1px solid lightgray;
-            height: 35px;
-            .o_redirect_to_discuss {
-                height: 100%;
-                width: 100%;
-            }
-        }
 
         .o_mail_navbar_dropdown_channels {
             .o-flex(0, 1, auto);
diff --git a/addons/mail/static/src/less/composer.less b/addons/mail/static/src/less/composer.less
index 88b44fec311..31ae4725ef0 100644
--- a/addons/mail/static/src/less/composer.less
+++ b/addons/mail/static/src/less/composer.less
@@ -11,6 +11,7 @@
 
 .o_composer {
     .o_composer_input > textarea {
+        width: 100%;
         resize: none;
     }
 }
diff --git a/addons/mail/static/src/less/thread.less b/addons/mail/static/src/less/thread.less
index be86e577b08..7f0f144ffd8 100644
--- a/addons/mail/static/src/less/thread.less
+++ b/addons/mail/static/src/less/thread.less
@@ -145,6 +145,15 @@
                 padding: 4px;
             }
         }
+
+        &.o_message_expanded .o_thread_message_core {
+            .o_mail_body_short {
+                display: none;
+            }
+            .o_mail_body_long {
+                display: block;
+            }
+        }
     }
     .o_thread_title {
         margin-top: 20px;