From ac5138b19a4a54f2b7a3373cd7884f05480474cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Theys?= <seb@odoo.com>
Date: Tue, 16 Jun 2020 14:47:38 +0000
Subject: [PATCH] [FIX] mail: restore style of messaging menu icon
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- restore "solid" icon
- restore muted style when no notification
- opportunity is taken to fix off-pixel of activity menu

task-2278416

closes odoo/odoo#53094

X-original-commit: 1164b37c5fb33d124ede52356c613b7cd31ac8e1
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 .../src/components/messaging_menu/messaging_menu.scss      | 4 ++++
 .../src/components/messaging_menu/messaging_menu.xml       | 4 ++--
 .../src/components/messaging_menu/messaging_menu_tests.js  | 2 +-
 addons/mail/static/src/scss/systray.scss                   | 7 ++-----
 addons/mail/static/src/scss/variables.scss                 | 4 ++++
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/addons/mail/static/src/components/messaging_menu/messaging_menu.scss b/addons/mail/static/src/components/messaging_menu/messaging_menu.scss
index 7d5d4466684..54855c15c13 100644
--- a/addons/mail/static/src/components/messaging_menu/messaging_menu.scss
+++ b/addons/mail/static/src/components/messaging_menu/messaging_menu.scss
@@ -136,3 +136,7 @@
         }
     }
 }
+
+.o_MessagingMenu_toggler.o-no-notification {
+    @include o-mail-systray-no-notification-style();
+}
diff --git a/addons/mail/static/src/components/messaging_menu/messaging_menu.xml b/addons/mail/static/src/components/messaging_menu/messaging_menu.xml
index 77c33e5ce7e..db1c211f858 100644
--- a/addons/mail/static/src/components/messaging_menu/messaging_menu.xml
+++ b/addons/mail/static/src/components/messaging_menu/messaging_menu.xml
@@ -5,8 +5,8 @@
         <li class="o_MessagingMenu" t-att-class="{ show: messagingMenu.isOpen, 'o-mobile': env.messaging.device.isMobile }">
             <!-- TODO FIXME restore mobile stuff here (activeMobileThread) -->
             <t t-if="!env.messaging.device.isMobile or true">
-                <a class="o_MessagingMenu_toggler o-no-caret" t-att-class="{ show: messagingMenu.isOpen }" href="#" t-on-click="_onClickToggler" data-toggle="dropdown" data-display="static" title="Conversations" role="button" aria-expanded="false">
-                    <i class="o_MessagingMenu_icon fa fa-comments-o" role="img" aria-label="Messages"/>
+                <a class="o_MessagingMenu_toggler o-no-caret" t-att-class="{ show: messagingMenu.isOpen, 'o-no-notification': !messagingMenu.counter }" href="#" t-on-click="_onClickToggler" data-toggle="dropdown" data-display="static" title="Conversations" role="button" aria-expanded="false">
+                    <i class="o_MessagingMenu_icon fa fa-comments" role="img" aria-label="Messages"/>
                     <t t-if="!env.messaging.isInitialized">
                         <i class="o_MessagingMenu_loading fa fa-spinner fa-spin"/>
                     </t>
diff --git a/addons/mail/static/src/components/messaging_menu/messaging_menu_tests.js b/addons/mail/static/src/components/messaging_menu/messaging_menu_tests.js
index 60159360899..e2ccaab78ba 100644
--- a/addons/mail/static/src/components/messaging_menu/messaging_menu_tests.js
+++ b/addons/mail/static/src/components/messaging_menu/messaging_menu_tests.js
@@ -130,7 +130,7 @@ QUnit.test('basic rendering', async function (assert) {
         "should have icon on clickable element in messaging menu"
     );
     assert.ok(
-        document.querySelector(`.o_MessagingMenu_icon`).classList.contains('fa-comments-o'),
+        document.querySelector(`.o_MessagingMenu_icon`).classList.contains('fa-comments'),
         "should have 'comments' icon on clickable element in messaging menu"
     );
     assert.strictEqual(
diff --git a/addons/mail/static/src/scss/systray.scss b/addons/mail/static/src/scss/systray.scss
index 1468b8bb378..7bf1193a8e8 100644
--- a/addons/mail/static/src/scss/systray.scss
+++ b/addons/mail/static/src/scss/systray.scss
@@ -1,16 +1,13 @@
 // Systray icon and dropdown
 .o_mail_systray_item {
     > a {
-        opacity: 1;
         > i {
             font-size: larger;
         }
     }
     &.o_no_notification > a {
-        opacity: 0.5;
-        > i {
-            transform: translateY(0px);
-        }
+        @include o-mail-systray-no-notification-style();
+
         .o_notification_counter {
             display: none;
         }
diff --git a/addons/mail/static/src/scss/variables.scss b/addons/mail/static/src/scss/variables.scss
index 4630a98c816..670f61d26fc 100644
--- a/addons/mail/static/src/scss/variables.scss
+++ b/addons/mail/static/src/scss/variables.scss
@@ -10,3 +10,7 @@ $o-mail-attachment-image-size: 100px !default;
 $o-mail-sidebar-icon-opacity: 0.7 !default;
 $o-mail-chat-sidebar-width: 250px !default;
 $o-mail-partner-avatar-size: 24px !default;
+
+@mixin o-mail-systray-no-notification-style {
+    opacity: 0.5;
+}