diff options
| author | Géry Debongnie <ged@odoo.com> | 2016-01-11 10:56:12 +0100 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2016-01-11 11:00:18 +0100 |
| commit | cf294f723f78744a2d4839445e64e218517586af (patch) | |
| tree | 07aa50fc1ef21615a521e24f3112f443e4dafe2b /addons/mail/static/src/xml | |
| parent | b38cd437e48da61991b5b7093174e874d3a935d4 (diff) | |
[FIX] mail: prevent double scrollbar with notification bar
when the bar asking for notification permission appears, it can cause
two scrollbars to appear in the client action. This commit moves the
notification bar inside the chat content, which solves the issue.
Diffstat (limited to 'addons/mail/static/src/xml')
| -rw-r--r-- | addons/mail/static/src/xml/client_action.xml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/addons/mail/static/src/xml/client_action.xml b/addons/mail/static/src/xml/client_action.xml index 18fef4a4ed6..da2e29057e0 100644 --- a/addons/mail/static/src/xml/client_action.xml +++ b/addons/mail/static/src/xml/client_action.xml @@ -4,14 +4,15 @@ <!-- Client Action --> <t t-name="mail.client_action"> <div class="o_mail_chat"> - <t t-if="widget.notification_bar"> - <div class="o_mail_annoying_notification_bar"> - <span class="o_mail_request_permission">Odoo needs your permission to <a href="#"> enable desktop notifications</a>.</span> - <span class="fa fa-close"></span> - </div> - </t> <div class="o_mail_chat_sidebar"/> - <div class="o_mail_chat_content"/> + <div class="o_mail_chat_content"> + <t t-if="widget.notification_bar"> + <div class="o_mail_annoying_notification_bar"> + <span class="o_mail_request_permission">Odoo needs your permission to <a href="#"> enable desktop notifications</a>.</span> + <span class="fa fa-close"></span> + </div> + </t> + </div> </div> </t> <t t-name="mail.chat.Sidebar"> |