diff options
| author | Xavier-Do <Xavier-Do@users.noreply.github.com> | 2018-01-19 11:37:51 +0100 |
|---|---|---|
| committer | Xavier-Do <Xavier-Do@users.noreply.github.com> | 2018-01-19 11:37:51 +0100 |
| commit | 5d04c4c5ee0951f87d546a107f214fe97edce76f (patch) | |
| tree | 2aec0ee71866f42d4c8dd65e24037d19fe899ce1 /addons/mail/static/src | |
| parent | 935e4f6a252ecd87d660d8433aa88fee41839fff (diff) | |
[REV] Miss push
This reverts commit 935e4f6a252ecd87d660d8433aa88fee41839fff.
Diffstat (limited to 'addons/mail/static/src')
| -rw-r--r-- | addons/mail/static/src/js/chat_manager.js | 1 | ||||
| -rw-r--r-- | addons/mail/static/src/less/thread.less | 2 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/thread.xml | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/addons/mail/static/src/js/chat_manager.js b/addons/mail/static/src/js/chat_manager.js index 35d16915341..9d1b9cddb70 100644 --- a/addons/mail/static/src/js/chat_manager.js +++ b/addons/mail/static/src/js/chat_manager.js @@ -130,7 +130,6 @@ function make_message (data) { subtype_description: data.subtype_description, is_author: data.author_id && data.author_id[0] === session.partner_id, is_note: data.is_note, - is_discussion: data.is_discussion, is_system_notification: (data.message_type === 'notification' && data.model === 'mail.channel') || data.info === 'transient_message', attachment_ids: data.attachment_ids || [], diff --git a/addons/mail/static/src/less/thread.less b/addons/mail/static/src/less/thread.less index c6c5783cc5b..3683ecd9bbe 100644 --- a/addons/mail/static/src/less/thread.less +++ b/addons/mail/static/src/less/thread.less @@ -109,7 +109,7 @@ text-align: justify; } - &.o_mail_not_discussion { + &.o_mail_note { background-color: @mail-thread-note; padding-left: @grid-gutter-width*0.3; border-bottom: 1px solid @gray-lighter-dark; diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml index 2d5d1ba45b2..7806029557b 100644 --- a/addons/mail/static/src/xml/thread.xml +++ b/addons/mail/static/src/xml/thread.xml @@ -160,7 +160,7 @@ t-att-class="'fa o_thread_message_star o_thread_icon ' + (message.is_starred ? 'fa-star' : 'fa-star-o')" t-att-data-message-id="message.id" title="Mark as Todo"/> </div> - <div t-att-class="'o_thread_message_core' + (message.is_note ? ' o_mail_note' : '') + (message.is_discussion ? ' o_mail_discussion' : ' o_mail_not_discussion') + ' '+message.is_discussion"> + <div t-att-class="'o_thread_message_core' + (message.is_note ? ' o_mail_note' : '')"> <p t-if="message.display_author" class="o_mail_info"> <t t-if="message.is_note"> Note by |