diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-03-09 16:25:58 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-03-09 16:25:58 +0100 |
| commit | 0f57bdba72b592ca097d4cd3da99a75883d8c623 (patch) | |
| tree | 94eef0c9aaf885c7f717bab5e468ca72b59a219d /addons/mail/static/src/less | |
| parent | 35f0797002e44ce5673e9fab63710d2764329694 (diff) | |
| parent | 42659dc70c2b9b124e7e4fdc0449f660c3de5c76 (diff) | |
[MERGE] forward port branch saas-11.2 up to 42659dc70c2
Diffstat (limited to 'addons/mail/static/src/less')
| -rw-r--r-- | addons/mail/static/src/less/composer.less | 4 | ||||
| -rw-r--r-- | addons/mail/static/src/less/discuss.less | 8 | ||||
| -rw-r--r-- | addons/mail/static/src/less/thread.less | 7 |
3 files changed, 11 insertions, 8 deletions
diff --git a/addons/mail/static/src/less/composer.less b/addons/mail/static/src/less/composer.less index 9df25c895a3..e2fae8b106e 100644 --- a/addons/mail/static/src/less/composer.less +++ b/addons/mail/static/src/less/composer.less @@ -264,6 +264,7 @@ img { width: @o-mail-attachment-image-size; height: @o-mail-attachment-image-size; + image-orientation: from-image; // Only supported in Firefox } .o_image_overlay{ display: none; @@ -365,6 +366,9 @@ .o-flex-display(); justify-content: center; align-items: center; + img { + image-orientation: from-image; // Only supported in Firefox + } img, video { max-width: 100%; max-height: 100%; diff --git a/addons/mail/static/src/less/discuss.less b/addons/mail/static/src/less/discuss.less index 46dc6d41bfd..4e0ae26dccc 100644 --- a/addons/mail/static/src/less/discuss.less +++ b/addons/mail/static/src/less/discuss.less @@ -321,15 +321,11 @@ .o_mail_chat_content { .o-flex(1, 0, 0); - margin-left: 0; + margin-left: 10px; + margin-right: 10px; background-color: transparent; - .o_mail_no_content { - .o-position-absolute(@top: 30%); - text-align: center; - } } - .o_mail_chat_tab_pane { overflow-x: scroll; .o_mail_add_channel { diff --git a/addons/mail/static/src/less/thread.less b/addons/mail/static/src/less/thread.less index 8d8bc761829..81dee297011 100644 --- a/addons/mail/static/src/less/thread.less +++ b/addons/mail/static/src/less/thread.less @@ -208,11 +208,14 @@ .o_thread_title { margin-top: 20px; margin-bottom: 20px; - font-size: 20px; + font-weight: bold; + font-size: 125%; } .o_mail_no_content { - .o-webclient-padding(); + .o-position-absolute(30%, 0, 0, 0); + text-align: center; + font-size: 115%; } .o_thread_message .o_thread_message_core .o_mail_read_more { |