diff options
| author | qsm-odoo <qsm@odoo.com> | 2018-03-12 16:25:32 +0100 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2018-04-18 15:59:16 +0200 |
| commit | 97aa0a8dec384ad75eb66045f43384b6e54f1d6e (patch) | |
| tree | ff62455c37178caad486a7d1dc90231d91cb6871 /addons/im_livechat/static/src | |
| parent | b04dec4025013c60e4857c1e177bb20d811cd41a (diff) | |
[REF] *: convert less content to scss content
Convert content so that the assets compile on app installation. The
style is still broken after this as the variables/mixins/... are not
defined in the right order (as it did not matter in LESS but does in
SCSS).
This commit basically changes:
- Variables: @var_hello -> $var-hello
- Mixins: .mixin_world() {} -> @mixin mixin-world {}
- Classes used as mixin: .my_class() -> @extend .my_class
- Here there were no other solution than to convert the use of
a mixin call by the use of an extend as a first approximation
- LESS functions -> SCSS functions (e.g. fade -> rgba)
- Move first variable definition before the variable is used
- Still need to make sure last variable definition is at the
right place
Diffstat (limited to 'addons/im_livechat/static/src')
3 files changed, 15 insertions, 15 deletions
diff --git a/addons/im_livechat/static/src/scss/copy_clipboard.scss b/addons/im_livechat/static/src/scss/copy_clipboard.scss index 1d56022f28e..db206941685 100644 --- a/addons/im_livechat/static/src/scss/copy_clipboard.scss +++ b/addons/im_livechat/static/src/scss/copy_clipboard.scss @@ -2,10 +2,10 @@ .o_field_copy { position: relative; border-radius: 5px; - border: 1px solid @btn-primary-border; - font-size: @font-size-small; - color: @odoo-brand-optional; - font-weight: @badge-font-weight; + border: 1px solid $btn-primary-border; + font-size: $font-size-small; + color: $odoo-brand-optional; + font-weight: $badge-font-weight; text-align: center; .o_clipboard_button { &.o_btn_text_copy { diff --git a/addons/im_livechat/static/src/scss/im_livechat.scss b/addons/im_livechat/static/src/scss/im_livechat.scss index c52fc7d2b9e..1620182fcd9 100644 --- a/addons/im_livechat/static/src/scss/im_livechat.scss +++ b/addons/im_livechat/static/src/scss/im_livechat.scss @@ -27,7 +27,7 @@ .o_livechat_rating { /* Livechat Rating : feedback smiley */ - .o-flex(1, 1, auto); + @include o-flex(1, 1, auto); overflow: auto; padding: 15px; diff --git a/addons/im_livechat/static/src/scss/im_livechat_bootstrap.scss b/addons/im_livechat/static/src/scss/im_livechat_bootstrap.scss index 8df74c9796d..b9d31dc05b8 100644 --- a/addons/im_livechat/static/src/scss/im_livechat_bootstrap.scss +++ b/addons/im_livechat/static/src/scss/im_livechat_bootstrap.scss @@ -1,20 +1,20 @@ // bootstrap variables and vendor prefixes needed to embed im_livechat in external pages -@gray-light: lighten(#000, 46.7%); // #777 -@gray-lighter: lighten(#000, 93.5%); // #eee -@screen-xs-max: 767px; -@navbar-height: 44px; +$gray-light: lighten(#000, 46.7%); // #777 +$gray-lighter: lighten(#000, 93.5%); // #eee +$screen-xs-max: 767px; +$navbar-height: 44px; .text-muted { - color: @gray-light; + color: $gray-light; } -.box-sizing(@boxmodel) { - -webkit-box-sizing: @boxmodel; - -moz-box-sizing: @boxmodel; - box-sizing: @boxmodel; +@mixin box-sizing($boxmodel) { + -webkit-box-sizing: $boxmodel; + -moz-box-sizing: $boxmodel; + box-sizing: $boxmodel; } .o_chat_window { &,* { - .box-sizing(border-box); + @include box-sizing(border-box); } .o_chat_header { height: 28px; |
