From 4d5516774deb22ecf2eac0a7b40c50d1d0d41b1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandre=20K=C3=BChn?= Date: Mon, 17 Apr 2023 10:31:31 +0000 Subject: [PATCH] [FIX] mail: im status online color in community MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Before this commit, im status in community was blue instead of green. This commit makes im status green in all version, as it should. closes odoo/odoo#118744 Signed-off-by: Sébastien Theys (seb) --- addons/hr_holidays/static/src/im_status_patch.xml | 2 +- addons/mail/static/src/discuss/im_status.xml | 4 ++-- addons/mail/static/src/discuss/thread_icon.scss | 3 --- addons/mail/static/src/discuss/thread_icon.xml | 4 ++-- addons/mail/static/tests/composer/typing_tests.js | 4 ++-- addons/mail/static/tests/discuss/discuss_tests.js | 2 +- 6 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 addons/mail/static/src/discuss/thread_icon.scss diff --git a/addons/hr_holidays/static/src/im_status_patch.xml b/addons/hr_holidays/static/src/im_status_patch.xml index 91e9da76733..31fa8f87373 100644 --- a/addons/hr_holidays/static/src/im_status_patch.xml +++ b/addons/hr_holidays/static/src/im_status_patch.xml @@ -2,7 +2,7 @@ - + diff --git a/addons/mail/static/src/discuss/im_status.xml b/addons/mail/static/src/discuss/im_status.xml index 0bd50106ffc..384da407b1f 100644 --- a/addons/mail/static/src/discuss/im_status.xml +++ b/addons/mail/static/src/discuss/im_status.xml @@ -4,10 +4,10 @@
- + - +
diff --git a/addons/mail/static/src/discuss/thread_icon.scss b/addons/mail/static/src/discuss/thread_icon.scss deleted file mode 100644 index 32eee0887e9..00000000000 --- a/addons/mail/static/src/discuss/thread_icon.scss +++ /dev/null @@ -1,3 +0,0 @@ -.o-mail-ThreadIcon-online { - color: $o-enterprise-primary-color; -} diff --git a/addons/mail/static/src/discuss/thread_icon.xml b/addons/mail/static/src/discuss/thread_icon.xml index 22ddd10b7c3..b9a3b42a494 100644 --- a/addons/mail/static/src/discuss/thread_icon.xml +++ b/addons/mail/static/src/discuss/thread_icon.xml @@ -11,10 +11,10 @@ -
+
-
+
diff --git a/addons/mail/static/tests/composer/typing_tests.js b/addons/mail/static/tests/composer/typing_tests.js index 2c8c02f868e..e619a52d335 100644 --- a/addons/mail/static/tests/composer/typing_tests.js +++ b/addons/mail/static/tests/composer/typing_tests.js @@ -335,7 +335,7 @@ QUnit.test("chat: correspondent is typing", async (assert) => { const { env, openDiscuss } = await start(); await openDiscuss(); assert.containsOnce($(".o-mail-DiscussCategoryItem"), ".o-mail-DiscussCategoryItem-threadIcon"); - assert.containsOnce($, ".o-mail-ThreadIcon-online"); + assert.containsOnce($, ".fa-circle.text-success"); // simulate receive typing notification from demo "is typing" await afterNextRender(() => @@ -356,5 +356,5 @@ QUnit.test("chat: correspondent is typing", async (assert) => { is_typing: false, }) ); - assert.containsOnce($, ".o-mail-ThreadIcon-online"); + assert.containsOnce($, ".fa-circle.text-success"); }); diff --git a/addons/mail/static/tests/discuss/discuss_tests.js b/addons/mail/static/tests/discuss/discuss_tests.js index 1aaffe08d15..ce432ad63a8 100644 --- a/addons/mail/static/tests/discuss/discuss_tests.js +++ b/addons/mail/static/tests/discuss/discuss_tests.js @@ -397,7 +397,7 @@ QUnit.test("sidebar: chat im_status rendering", async (assert) => { assert.strictEqual(chat2.textContent, "Partner2"); assert.strictEqual(chat3.textContent, "Partner3"); assert.containsOnce(chat1, ".o-mail-ThreadIcon div[title='Offline']"); - assert.containsOnce(chat2, ".o-mail-ThreadIcon-online"); + assert.containsOnce(chat2, ".fa-circle.text-success"); assert.containsOnce(chat3, ".o-mail-ThreadIcon div[title='Away']"); });