diff options
| author | Olivier Dony <odo@openerp.com> | 2016-02-03 17:15:37 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2016-02-03 17:19:16 +0100 |
| commit | d67d24d8b46e27df126429abc7572dcd455c03f4 (patch) | |
| tree | a17fa6b8a46e2a0204653f40d4299f685112ddef /addons/mail/static/src/less | |
| parent | 9c89f83d21b6b64f0ae05fad7aaaa3e885ab8b38 (diff) | |
| parent | 93e8bf8ccfb405a79377d1abaac0043f3d7f9157 (diff) | |
[MERGE] Forward-port 9.0 up to 93e8bf8ccfb405a79377d1abaac0043f3d7f9157
Diffstat (limited to 'addons/mail/static/src/less')
| -rw-r--r-- | addons/mail/static/src/less/client_action.less | 17 | ||||
| -rw-r--r-- | addons/mail/static/src/less/thread.less | 9 |
2 files changed, 20 insertions, 6 deletions
diff --git a/addons/mail/static/src/less/client_action.less b/addons/mail/static/src/less/client_action.less index c4b28874358..ecf4785f03e 100644 --- a/addons/mail/static/src/less/client_action.less +++ b/addons/mail/static/src/less/client_action.less @@ -112,6 +112,9 @@ height: 100%; margin-left: @mail-chat-sidebar-width; position: relative; + @media (min-width: @screen-sm-min) { + overflow: auto; + } @media (max-width: @screen-xs-max) { margin-left: 0; @@ -120,8 +123,7 @@ .o_mail_thread { .o-flex(1, 0, 0); overflow: auto; - .o-webclient-padding(); - padding-bottom: 15px; + padding: 0 0 15px 0; .o_chat_help_message { padding: 25px 0; @@ -253,6 +255,17 @@ } } } + + &.o_mail_selection_mode { + .o_thread_message { + opacity: 0.5; + &.o_thread_selected_message { + padding: 4px @odoo-horizontal-padding; + opacity: 1; + background-color: lightgray; + } + } + } } // User status bullet (in Discuss sidebar and Invite dialog) diff --git a/addons/mail/static/src/less/thread.less b/addons/mail/static/src/less/thread.less index 7f0f144ffd8..7da1a13802e 100644 --- a/addons/mail/static/src/less/thread.less +++ b/addons/mail/static/src/less/thread.less @@ -40,7 +40,8 @@ .o_thread_message { .o-flex-display(); - padding: 4px 0; + padding: 4px @odoo-horizontal-padding; + margin-bottom: 0px; .o_thread_message_sidebar { .o-flex(0, 0, @mail-thread-avatar-size); @@ -69,7 +70,7 @@ } } - i.o_thread_message_star, i.o_thread_message_needaction { + i.o_thread_message_star, i.o_thread_message_needaction, i.o_thread_message_reply { cursor: pointer; opacity: 0; &.fa-star { @@ -83,7 +84,7 @@ opacity: @mail-thread-side-date-opacity; } - i.o_thread_message_star, i.o_thread_message_needaction { + i.o_thread_message_star, i.o_thread_message_needaction, i.o_thread_message_reply { opacity: @mail-thread-icon-opacity; &:hover { opacity: 1; @@ -141,7 +142,7 @@ } } - .o_thread_message_star, .o_thread_message_needaction { + .o_thread_message_star, .o_thread_message_needaction, .o_thread_message_reply { padding: 4px; } } |