diff options
| author | qsm-odoo <qsm@odoo.com> | 2018-06-27 17:55:08 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2018-07-27 12:36:54 +0200 |
| commit | 770aec399c4e6e29cfc5854318cbda19a605315d (patch) | |
| tree | f40289ac738237eb051ae0766fb49a978edf37e9 /addons/mail/static/src | |
| parent | a991a579bc53a087d05460aa01724b4a4af4be1b (diff) | |
[REF] *: get rid of vendor prefixes
BS4 do not provide vendor prefixes scss mixins anymore as it is meant
to be used with the 'autoprefixer' library. As we only support the last
version of every major browsers in Odoo, we took the decision to not
use the library as it was also complex to integrate in Odoo. We decided
to do the library's work by hand if it ever become necessary.
Diffstat (limited to 'addons/mail/static/src')
| -rw-r--r-- | addons/mail/static/src/scss/abstract_thread_window.scss | 14 | ||||
| -rw-r--r-- | addons/mail/static/src/scss/chatter.scss | 4 | ||||
| -rw-r--r-- | addons/mail/static/src/scss/composer.scss | 72 | ||||
| -rw-r--r-- | addons/mail/static/src/scss/discuss.scss | 58 | ||||
| -rw-r--r-- | addons/mail/static/src/scss/mail_activity.scss | 2 | ||||
| -rw-r--r-- | addons/mail/static/src/scss/systray.scss | 20 | ||||
| -rw-r--r-- | addons/mail/static/src/scss/thread.scss | 6 | ||||
| -rw-r--r-- | addons/mail/static/src/scss/thread_window.scss | 8 |
8 files changed, 92 insertions, 92 deletions
diff --git a/addons/mail/static/src/scss/abstract_thread_window.scss b/addons/mail/static/src/scss/abstract_thread_window.scss index c55662f4bb3..a05d6c24fda 100644 --- a/addons/mail/static/src/scss/abstract_thread_window.scss +++ b/addons/mail/static/src/scss/abstract_thread_window.scss @@ -1,8 +1,8 @@ $o-mail-thread-window-zindex: $zindex-modal + 1 !default; .o_thread_window { - @include o-flex-display; - @include o-flex-flow(column, nowrap); + display: flex; + flex-flow: column nowrap; position: fixed; width: $o-mail-thread-window-width; max-width: 100%; @@ -28,8 +28,8 @@ $o-mail-thread-window-zindex: $zindex-modal + 1 !default; } .o_thread_window_header { - @include o-flex-display; - @include o-flex(0, 0, auto); + display: flex; + flex: 0 0 auto; color: white; padding: $o-mail-chatter-gap*0.5 $o-mail-chatter-gap; border-radius: 3px 3px 0 0; @@ -54,12 +54,12 @@ $o-mail-thread-window-zindex: $zindex-modal + 1 !default; .o_thread_window_title { cursor: pointer; - @include o-flex(1, 1, auto); + flex: 1 1 auto; @include o-text-overflow; } .o_thread_window_buttons { - @include o-flex(0, 0, auto); + flex: 0 0 auto; .o_thread_window_close, .o_thread_window_expand { color: white; padding: 3px; @@ -71,7 +71,7 @@ $o-mail-thread-window-zindex: $zindex-modal + 1 !default; } .o_mail_thread { - @include o-flex(1, 1, auto); + flex: 1 1 auto; overflow: auto; -webkit-overflow-scrolling: touch; // smooth scrolling in iOS app (Safari) .o_thread_date_separator { diff --git a/addons/mail/static/src/scss/chatter.scss b/addons/mail/static/src/scss/chatter.scss index 314eb9b8bac..059c4e98320 100644 --- a/addons/mail/static/src/scss/chatter.scss +++ b/addons/mail/static/src/scss/chatter.scss @@ -14,7 +14,7 @@ position: relative; margin: $grid-gutter-width*0.5 0 0; padding: 0; - @include o-flex-display; + display: flex; > .btn { height: $o-statusbar-height + 1; @@ -24,7 +24,7 @@ > .o_followers { height: $o-statusbar-height + 1; border-bottom: 1px solid transparent; - @include o-flex(1,1,auto); + flex: 1 1 auto; } } diff --git a/addons/mail/static/src/scss/composer.scss b/addons/mail/static/src/scss/composer.scss index 58bf5596cd3..f12d0cbf528 100644 --- a/addons/mail/static/src/scss/composer.scss +++ b/addons/mail/static/src/scss/composer.scss @@ -14,8 +14,8 @@ .o_thread_composer { position: relative; - @include o-flex(0, 0, auto); - @include o-flex-display; + flex: 0 0 auto; + display: flex; margin: 1px 0; border-top: none; background: $gray-lighter; @@ -30,11 +30,11 @@ } .o_composer_subject { - @include o-flex-display; + display: flex; padding-bottom: 5px; > input { - @include o-flex(1, 1, auto); + flex: 1 1 auto; padding: 5px; margin-right: 30px; } @@ -100,7 +100,7 @@ } .o_chatter_composer_info, .o_composer_suggested_partners { - @include o-flex(0, 0, 100%); + flex: 0 0 100%; margin-bottom: $o-mail-chatter-gap*0.5; } @@ -137,10 +137,10 @@ } &:not(.o_chat_inline_composer) { - @include o-flex-flow(row, wrap); + flex-flow: row wrap; .o_composer_container, .o_composer_button_send { - @include o-flex(1, 0, 100%); + flex: 1 0 100%; } .o_composer, .o_composer_subject { padding: $o-mail-chatter-gap $o-mail-chatter-gap 0; @@ -152,7 +152,7 @@ &.o_chat_inline_composer { .o_composer_container { - @include o-flex(1, 1, auto); + flex: 1 1 auto; } .o_composer { padding: $o-mail-chatter-gap $o-mail-chatter-gap 0 $o-mail-chatter-gap; @@ -165,26 +165,26 @@ } } .o_composer_input { - @include o-flex-display(); - @include o-flex-flow(row, wrap); + display: flex; + flex-flow: row wrap; } .o_composer_text_field { - @include o-flex(1, 1, 50%); + flex: 1 1 50%; margin: 0; padding: 0; } .o_chatter_composer_tools { - @include o-flex(0, 1, auto); + flex: 0 1 auto; } .o_composer_attachments_list { - @include o-flex(1, 0, 100%); + flex: 1 0 100%; } .o_chatter_composer_tools { border: none; border-left: 1px solid $gray-lighter-dark; padding-left: $o-mail-chatter-gap*0.5; - @include o-transform(translateY(-$o-mail-chatter-gap*0.5)); + transform: translateY(-$o-mail-chatter-gap*0.5); } .o_composer_button_send { @@ -210,15 +210,15 @@ } } .o_composer_input { - @include o-flex-display(); - @include o-flex-flow(row, nowrap); + display: flex; + flex-flow: row nowrap; textarea.o_composer_text_field { - @include o-flex(1, 1, auto); + flex: 1 1 auto; } .o_chatter_composer_tools { - @include o-flex(0, 0, auto); + flex: 0 0 auto; } @media (max-width: $screen-xs-max) { .o_composer_button_send { @@ -255,8 +255,8 @@ $o-mail-attachment-margin: 5px; .o_attachments_list, .o_attachments_previews { margin: 0 (-$o-mail-attachment-margin) 0; - @include o-flex-display; - @include o-flex-flow(row, wrap); + display: flex; + flex-flow: row wrap; } .o_attachment { @@ -311,9 +311,9 @@ $o-mail-attachment-margin: 5px; .o_attachment_uploaded, .o_attachment_delete { @include o-position-absolute(0, 0, 0, $left: auto); - @include o-flex-display(); - @include o-align-items(center); - @include o-justify-content(center); + display: flex; + align-items: center; + justify-content: center; width: 45px; } @@ -322,8 +322,8 @@ $o-mail-attachment-margin: 5px; color: white; cursor: pointer; font-size: 20px; - @include o-transform(translateX(100%)); - @include o-transition(all, 0.3s); + transform: translateX(100%); + transition: all 0.3s ease 0s; &:hover { background: $brand-primary; @@ -349,8 +349,8 @@ $o-mail-attachment-margin: 5px; } &:hover .o_attachment_delete { - @include o-transition(all, 0.1s); - @include o-transform(translateX(0)); + transition: all 0.1s ease 0s; + transform: translateX(0); } } @@ -382,20 +382,20 @@ $o-mail-attachment-margin: 5px; @include o-position-absolute(0, 0, 0, 0); background-size: cover; background-position: center; - @include o-transform(scale(1.05)); - @include o-transition(all, 0.3s); + transform: scale(1.05); + transition: all 0.3s ease 0s; } &:hover .o_attachment_image { - @include o-transform(scale(1)); + transform: scale(1); } } .o_image_overlay { @include o-position-absolute($top: 0, $left: 0, $right:0, $bottom:0); @include o-hover-opacity($default-opacity: 0, $hover-opacity: 1); - @include o-linear-gradient(180deg, rgba(black, 0.2), rgba(black, 0.9)); - @include o-transition(all, 0.3s); + background-image: linear-gradient(180deg, rgba(black, 0.2), rgba(black, 0.9)); + transition: all 0.3s ease 0s; padding: 10px; .o_attachment_title { @@ -468,9 +468,9 @@ $o-mail-attachment-margin: 5px; .o_viewer_zoomer { width: 100%; height: 100%; - @include o-flex-display; - @include o-justify-content(center); - @include o-align-items(center); + display: flex; + justify-content: center; + align-items: center; padding: 45px 0; img { @@ -500,7 +500,7 @@ $o-mail-attachment-margin: 5px; .o_viewer_toolbar { @include o-position-absolute($left: 50%, $bottom: $grid-gutter-width*0.5); - @include o-transform(translate(-50%, -50%)); + transform: translate(-50%, -50%); overflow: hidden; border-radius: 4px; background-color: rgba(black, 0.4); diff --git a/addons/mail/static/src/scss/discuss.scss b/addons/mail/static/src/scss/discuss.scss index 2bbf26ba220..8096138ef5f 100644 --- a/addons/mail/static/src/scss/discuss.scss +++ b/addons/mail/static/src/scss/discuss.scss @@ -12,13 +12,13 @@ background-color: #DFA941; color: white; text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.25); - @include o-flex-display; + display: flex; border-bottom: 1px solid $o-main-color-muted; .o_mail_request_permission { - @include o-flex-display; + display: flex; justify-content: center; - @include o-flex(1,1, auto); + flex: 1 1 auto; } > span { font-size: 16px; @@ -48,7 +48,7 @@ } .o_mail_sidebar_title { - @include o-flex-display; + display: flex; padding: 6px $o-horizontal-padding 0 $o-horizontal-padding; align-items: center; justify-content: space-between; @@ -64,16 +64,16 @@ } } .o_mail_discuss_item { - @include o-flex-display; + display: flex; width: 100%; padding: 2px $o-horizontal-padding 2px ($o-horizontal-padding + 12px); // compensate icon .o_thread_name { - @include o-flex(1, 1, auto); + flex: 1 1 auto; @include o-text-overflow; } .o_mail_sidebar_needaction, .o_mail_partner_unpin, .o_mail_channel_settings { - @include o-flex(0, 0, auto); + flex: 0 0 auto; } .o_mail_sidebar_needaction { margin: 0 0 0 5px; @@ -111,8 +111,8 @@ } .o_mail_discuss_content { - @include o-flex-display; - @include o-flex-flow(column, nowrap); + display: flex; + flex-flow: column nowrap; height: 100%; margin-left: $o-mail-chat-sidebar-width; position: relative; @@ -125,7 +125,7 @@ } .o_mail_thread { - @include o-flex(1, 0, 0); + flex: 1 0 0; overflow: auto; padding: 0 0 15px 0; -webkit-overflow-scrolling: touch; // smooth scrolling in iOS app (Safari) @@ -262,18 +262,18 @@ // ------------------------------------------------------------------ @media (max-width: $screen-xs-max) { .o_mail_discuss { - @include o-flex-display; - @include o-flex-flow(column, nowrap); + display: flex; + flex-flow: column nowrap; background: white; .o_mail_discuss_mobile_mailboxes_buttons { - @include o-flex-display; - @include o-flex(0, 0, auto); + display: flex; + flex: 0 0 auto; z-index: 2; box-shadow: 0 2px 4px $gray-lighter-darker; .o_mailbox_inbox_item { - @include o-flex(1, 1, auto); + flex: 1 1 auto; width: 50%; padding: 2%; @@ -284,7 +284,7 @@ } .o_mail_discuss_content { - @include o-flex(1, 0, 0); + flex: 1 0 0; margin-left: 10px; margin-right: 10px; background-color: transparent; @@ -310,7 +310,7 @@ } } .o_mail_mobile_tabs { - @include o-flex(0, 0, auto); + flex: 0 0 auto; } } } @@ -320,7 +320,7 @@ // ------------------------------------------------------------------ .o_mail_preview { - @include o-flex-display; + display: flex; background-color: $gray-lighter; color: $o-main-text-color; cursor: pointer; @@ -339,7 +339,7 @@ border-bottom: 1px solid $gray-lighter-darker; } .o_mail_preview_image { - @include o-flex(0, 0, auto); + flex: 0 0 auto; position: relative; > img { @include square(100%); @@ -353,19 +353,19 @@ } } .o_preview_info { - @include o-flex(1, 1, 100%); + flex: 1 1 100%; overflow: hidden; .o_preview_title { - @include o-flex-display; + display: flex; .o_preview_name { - @include o-flex(0, 1, auto); + flex: 0 1 auto; @include o-text-overflow; } .o_preview_counter { - @include o-flex(1, 1, auto); + flex: 1 1 auto; } .o_last_message_date { - @include o-flex(0, 0, auto); + flex: 0 0 auto; color: $o-main-color-muted; font-weight: 500; } @@ -429,15 +429,15 @@ } .o_mail_mobile_tabs { - @include o-flex-display; + display: flex; box-shadow: 0 0 8px $gray-lighter-darker; .o_mail_mobile_tab { - @include o-flex-display; - @include o-flex(1, 1, auto); + display: flex; + flex: 1 1 auto; width: 20%; - @include o-flex-flow(column, nowrap); - @include o-justify-content(space-between); + flex-flow: column nowrap; + justify-content: space-between; padding: $o-mail-chatter-mobile-gap $o-mail-chatter-mobile-gap*2; box-shadow: 1px 0 0 $gray-lighter-darker; text-align: center; diff --git a/addons/mail/static/src/scss/mail_activity.scss b/addons/mail/static/src/scss/mail_activity.scss index d4d9a3ffecb..b4bd611f31c 100644 --- a/addons/mail/static/src/scss/mail_activity.scss +++ b/addons/mail/static/src/scss/mail_activity.scss @@ -16,7 +16,7 @@ &.collapsed { margin-bottom: 0; - @include o-transition(margin, 0.8s); + transition: margin 0.8s ease 0s; .o_chatter_planned_activities_summary { display: inline-block; diff --git a/addons/mail/static/src/scss/systray.scss b/addons/mail/static/src/scss/systray.scss index 9937608e040..dfad781ab42 100644 --- a/addons/mail/static/src/scss/systray.scss +++ b/addons/mail/static/src/scss/systray.scss @@ -9,15 +9,15 @@ &.o_no_notification > a { opacity: 0.5; > i { - @include o-transform(translateY(0px)); + transform: translateY(0px); } .o_notification_counter { display: none; } } &.open .o_mail_systray_dropdown { - @include o-flex-display; - @include o-flex-flow(column, nowrap); + display: flex; + flex-flow: column nowrap; } .o_notification_counter { @include o-position-absolute($top: 20%, $right: 1px); @@ -31,16 +31,16 @@ padding: 0; .o_spinner { - @include o-flex-display; - @include o-align-items(center); - @include o-justify-content(center); + display: flex; + align-items: center; + justify-content: center; color: $o-main-text-color; height: 50px; } .o_mail_systray_dropdown_top { - @include o-flex-display; - @include o-flex(0, 0, auto); + display: flex; + flex: 0 0 auto; justify-content: space-between; border-bottom: 1px solid $gray-lighter-darker; box-shadow: 0 0 2px $gray-lighter-darker; @@ -60,7 +60,7 @@ } .o_mail_systray_dropdown_items { - @include o-flex(0, 1, auto); + flex: 0 1 auto; max-height: 400px; min-height: 50px; overflow-y: auto; @@ -91,7 +91,7 @@ } .o_no_activity { cursor: initial; - @include o-align-items(center); + align-items: center; color: grey; opacity: 0.5; padding: 3px; diff --git a/addons/mail/static/src/scss/thread.scss b/addons/mail/static/src/scss/thread.scss index 6d8eb8b8254..1bcc80daa6b 100644 --- a/addons/mail/static/src/scss/thread.scss +++ b/addons/mail/static/src/scss/thread.scss @@ -38,7 +38,7 @@ } .o_thread_message { - @include o-flex-display; + display: flex; padding: 4px $o-horizontal-padding; margin-bottom: 0px; @@ -48,7 +48,7 @@ } .o_thread_message_sidebar { - @include o-flex(0, 0, $o-mail-thread-avatar-size); + flex: 0 0 $o-mail-thread-avatar-size; margin-right: 10px; margin-top: 2px; text-align: center; @@ -99,7 +99,7 @@ } .o_thread_message_core { - @include o-flex(1, 1, auto); + flex: 1 1 auto; min-width: 0; max-width: 100%; word-wrap: break-word; diff --git a/addons/mail/static/src/scss/thread_window.scss b/addons/mail/static/src/scss/thread_window.scss index bca79bc9c7a..572ff0c8ff3 100644 --- a/addons/mail/static/src/scss/thread_window.scss +++ b/addons/mail/static/src/scss/thread_window.scss @@ -1,18 +1,18 @@ .o_thread_window { &.o_thread_less { .o_thread_search_input { - @include o-flex-display; - @include o-align-items(baseline); + display: flex; + align-items: baseline; padding: $o-mail-chatter-gap*0.5 $o-mail-chatter-gap; > span { - @include o-flex(0, 0, auto); + flex: 0 0 auto; } > input { margin-left: 5px; padding: $o-mail-chatter-gap*0.5; - @include o-flex(1, 1, 100%); + flex: 1 1 100%; } } |
