diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-01-05 15:51:49 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-01-05 15:51:49 +0100 |
| commit | 31ce19bd7c8ff90aa3a3f34ba13dfbbe00865b3b (patch) | |
| tree | 4f24c985d7f4f7d08af1830f8199b120f35018f7 /addons/mail/static/src/less | |
| parent | 9b5311e0c94ea2b3ad6c36bc9a4ea63228779b66 (diff) | |
| parent | 97e87a42cdfaed04a6f50d928d86ac6e3bec9f91 (diff) | |
[MERGE] forward port of branch 9.0 up to 97e87a4
Diffstat (limited to 'addons/mail/static/src/less')
| -rw-r--r-- | addons/mail/static/src/less/client_action.less | 66 | ||||
| -rw-r--r-- | addons/mail/static/src/less/composer.less | 1 |
2 files changed, 52 insertions, 15 deletions
diff --git a/addons/mail/static/src/less/client_action.less b/addons/mail/static/src/less/client_action.less index 408f3074311..8ab1c9f221c 100644 --- a/addons/mail/static/src/less/client_action.less +++ b/addons/mail/static/src/less/client_action.less @@ -10,6 +10,35 @@ height: auto; } + .o_mail_annoying_notification_bar { + height: 40px; + background-color: #DFA941; + color: white; + text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.25); + .o-flex-display(); + border-bottom: 1px solid @odoo-main-color-muted; + + .o_mail_request_permission { + .o-flex-display(); + justify-content: center; + .o-flex(1,1, auto); + } + > span { + font-size: 16px; + line-height: 40px; + > a { + color: white; + margin-left: 5px; + text-decoration: underline; + } + + &.fa-close { + margin-right: 10px; + cursor: pointer; + } + } + } + .o_mail_chat_sidebar { width: @mail-chat-sidebar-width; height: 100%; @@ -103,12 +132,15 @@ margin-right: 5px; border: none; } + &.o_extended_composer .o_composer_input { + margin-right: 0; + } + } - .o_composer_buttons { - .o-flex(0, 0, auto); - .o_composer_button_send { - float: right; - } + .o_composer_buttons { + .o-flex(0, 0, auto); + .o_composer_button_send { + float: right; } } } @@ -167,16 +199,6 @@ font-weight: bold; } - .o_user_status { - font-size: 10px; - position: relative; - bottom: 1px; - margin-right: 3px; - &.fa-circle { - color: @odoo-brand-optional; - } - } - > .badge { color: white; background-color: @odoo-brand-optional; @@ -223,3 +245,17 @@ } } } + +// User status bullet (in Discuss sidebar and Invite dialog) +.o_mail_user_status { + font-size: 10px; + position: relative; + bottom: 1px; + margin-right: 3px; + &.o_user_online { + color: @odoo-brand-optional; + } + &.o_user_idle { + color: orange; + } +} diff --git a/addons/mail/static/src/less/composer.less b/addons/mail/static/src/less/composer.less index 3a0881d5da9..6dad1dac3d2 100644 --- a/addons/mail/static/src/less/composer.less +++ b/addons/mail/static/src/less/composer.less @@ -4,6 +4,7 @@ > input { .o-flex(1, 1, auto); + padding: 5px; margin-right: 30px; } } |