diff --git a/addons/im_livechat/static/src/less/im_livechat_bootstrap.less b/addons/im_livechat/static/src/less/im_livechat_bootstrap.less new file mode 100644 index 00000000000..83c3bfb7757 --- /dev/null +++ b/addons/im_livechat/static/src/less/im_livechat_bootstrap.less @@ -0,0 +1,7 @@ +// bootstrap variables needed for embedding of im_livechat outside website +@gray-light: lighten(#000, 46.7%); // #777 +@gray-lighter: lighten(#000, 93.5%); // #eee +@screen-xs-max: 767px; +.text-muted { + color: @gray-light; +} diff --git a/addons/im_livechat/views/im_livechat_channel_templates.xml b/addons/im_livechat/views/im_livechat_channel_templates.xml index 19882bcb34e..cfcddf9f8d8 100644 --- a/addons/im_livechat/views/im_livechat_channel_templates.xml +++ b/addons/im_livechat/views/im_livechat_channel_templates.xml @@ -128,6 +128,9 @@ + + + diff --git a/addons/mail/static/src/js/chat_window.js b/addons/mail/static/src/js/chat_window.js index 8fa1e2a2536..3936ef956e1 100644 --- a/addons/mail/static/src/js/chat_window.js +++ b/addons/mail/static/src/js/chat_window.js @@ -76,7 +76,8 @@ return Widget.extend({ this.fold(); }, on_keydown: function (event) { - if (event.which === $.ui.keyCode.ENTER) { + // ENTER key (avoid requiring jquery ui for external livechat) + if (event.which === 13) { var message = { content: this.$input.val(), attachment_ids: [],