From ea7d0435b2ace5c0b4ddf207b77ef5be493ba6a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Theys?= Date: Tue, 8 Nov 2022 10:59:43 +0000 Subject: [PATCH] [IMP] mail, im_livechat: move variables only used in livechat MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit closes odoo/odoo#105658 Signed-off-by: Alexandre Kühn (aku) --- addons/im_livechat/__manifest__.py | 3 +++ addons/im_livechat/static/src/primary_variables.scss | 4 ++++ addons/mail/static/src/scss/variables/primary_variables.scss | 4 ---- 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 addons/im_livechat/static/src/primary_variables.scss diff --git a/addons/im_livechat/__manifest__.py b/addons/im_livechat/__manifest__.py index 6c825103998..e422cd154cc 100644 --- a/addons/im_livechat/__manifest__.py +++ b/addons/im_livechat/__manifest__.py @@ -49,6 +49,9 @@ Help your customers with this chat, and analyse their feedback. 'mail.assets_discuss_public': [ 'im_livechat/static/src/components/*/*', ], + 'web._assets_primary_variables': [ + 'im_livechat/static/src/primary_variables.scss', + ], 'web.assets_frontend': [ ('include', 'im_livechat.assets_public_livechat'), 'im_livechat/static/src/public/main.js', diff --git a/addons/im_livechat/static/src/primary_variables.scss b/addons/im_livechat/static/src/primary_variables.scss new file mode 100644 index 00000000000..ddb4c3eba3c --- /dev/null +++ b/addons/im_livechat/static/src/primary_variables.scss @@ -0,0 +1,4 @@ +$o-mail-chat-header-height: 46px !default; +$o-mail-chatter-gap: 10px !default; +$o-mail-thread-icon-opacity: 0.6 !default; +$o-mail-thread-side-date-opacity: 0.6 !default; diff --git a/addons/mail/static/src/scss/variables/primary_variables.scss b/addons/mail/static/src/scss/variables/primary_variables.scss index e30df7ba6a6..4768b2ce5f9 100644 --- a/addons/mail/static/src/scss/variables/primary_variables.scss +++ b/addons/mail/static/src/scss/variables/primary_variables.scss @@ -1,13 +1,9 @@ $o-mail-thread-avatar-size: 36px !default; -$o-mail-thread-icon-opacity: 0.6 !default; -$o-mail-thread-side-date-opacity: 0.6 !default; $o-mail-thread-window-bg: #FAFAFA !default; $o-mail-thread-window-width: 340px !default; $o-mail-thread-typing-icon-size-medium: 5px !default; $o-mail-thread-typing-icon-size-small: 3px !default; -$o-mail-chatter-gap: 10px !default; $o-mail-chatter-mobile-gap: 2% !default; -$o-mail-chat-header-height: 46px !default; $o-mail-attachment-image-size: 100px !default; $o-mail-sidebar-icon-opacity: 0.7 !default; $o-mail-chat-sidebar-width: 250px !default;