diff options
| author | qsm-odoo <qsm@odoo.com> | 2017-09-20 12:26:18 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2017-09-20 15:03:56 +0200 |
| commit | 7b965a9673a9124e6e045b8a290a156eed402ad5 (patch) | |
| tree | a791aaf93119b04b5548c90cdcf28e87bd9eba4d /addons/mail/static/src/xml/composer.xml | |
| parent | 26e079f246c196bc08669db3894c8b2c83cc2639 (diff) | |
[FIX] mail, web: chat window and emojis
- Fix several contexts where the emoji popover was hidden by a webclient
element (control panel / ...). To solve this bug, the design has been
improved to not use popover but instead use custom design (better
integrated with new chatter design)
- Chat window is now still usable when a modal is opened
- Simplify chatter LESS
Diffstat (limited to 'addons/mail/static/src/xml/composer.xml')
| -rw-r--r-- | addons/mail/static/src/xml/composer.xml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/addons/mail/static/src/xml/composer.xml b/addons/mail/static/src/xml/composer.xml index a7b2e7cb02f..b46af297928 100644 --- a/addons/mail/static/src/xml/composer.xml +++ b/addons/mail/static/src/xml/composer.xml @@ -32,16 +32,15 @@ <input type="hidden" name="session_id" t-att-value="widget.getSession().session_id"/> </t> </span> - <span t-att-class="widget.emoji_container_classname"></span> </div> - <t t-name="mail.ChatComposer.emojis"> + <div t-name="mail.ChatComposer.emojis" class="o_mail_emoji_container"> <t t-foreach="emojis" t-as="emoji"> - <span t-att-data-emoji="emoji.source" class="o_mail_emoji" t-att-title="emoji.description"> + <button t-att-data-emoji="emoji.source" class="btn btn-link o_mail_emoji" t-att-title="emoji.description"> <t t-raw="emoji.substitution"/> - </span> + </button> </t> - </t> + </div> <t t-name="mail.AbstractMentionSuggestions"> <ul class="dropdown-menu" aria-labelledby="dropdownMailMentionMenu"> |