summaryrefslogtreecommitdiff
path: root/addons/mass_mailing/static/src
diff options
context:
space:
mode:
authorxO-Tx <mou@odoo.com>2020-06-15 07:46:36 +0000
committerThibault Delavallée <tde@odoo.com>2020-08-11 14:38:32 +0000
commit6e8f4ff3ead93ad1e9294b0ebed8d60e4e4bf1ce (patch)
treeb3fc6a5ccd3837289bff6c2d0451a56a492a707e /addons/mass_mailing/static/src
parent7a253beab2e2bb3a8eab02fd6d538b4284a747cc (diff)
[IMP] sms/mass_mailing: add emojis support to the base SmsWidget
This commit adds emojis to base SmsWidget in order to use a text field with both sms and emoji widgets in "mass_mailing_sms" module for sms content. The emoji feature is optional (depends on "enable_emojis" attribute). To add the emoji support, the following changes have been made: * override the method "on_attach_callback" from emoji widget base code to hide emojis if not enabled; We also adjust the css of emoji widget to make it suitable for a text field with sms option. Task ID-2224393 PR #49096
Diffstat (limited to 'addons/mass_mailing/static/src')
-rw-r--r--addons/mass_mailing/static/src/scss/mass_mailing.scss7
1 files changed, 6 insertions, 1 deletions
diff --git a/addons/mass_mailing/static/src/scss/mass_mailing.scss b/addons/mass_mailing/static/src/scss/mass_mailing.scss
index 8e20d437232..5b8ebff2023 100644
--- a/addons/mass_mailing/static/src/scss/mass_mailing.scss
+++ b/addons/mass_mailing/static/src/scss/mass_mailing.scss
@@ -14,7 +14,12 @@
}
}
}
-
+.o_form_view {
+ // This will display the emoji widget in the right position after a text field with sms option.
+ .o_sms_container ~ .o_mail_add_emoji{
+ bottom: 55px;
+ }
+}
.o_white_body {
background-color: white;
}