From cd2504c75fb7afeca2388925c4e790cda94ceeeb Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Fri, 13 Apr 2018 15:51:22 +0200 Subject: [PATCH] [FIX] *: wrap negated variables with parenthesis * mail, web, web_editor, website_sale Tricky difference between LESS and SCSS: `0 -$var` will be one value in SCSS (the result of 0 - $var) but two space-separated values in LESS. --- addons/mail/static/src/scss/composer.scss | 2 +- addons/web/static/src/scss/form_view.scss | 4 ++-- addons/web/static/src/scss/kanban_dashboard.scss | 2 +- addons/web/static/src/scss/rainbow.scss | 4 ++-- addons/web/static/src/scss/utils.scss | 2 +- addons/web_editor/static/src/scss/web_editor.ui.scss | 4 ++-- .../website_sale/static/src/scss/website_sale_frontend.scss | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/mail/static/src/scss/composer.scss b/addons/mail/static/src/scss/composer.scss index 477a7e536e1..59f529789ab 100644 --- a/addons/mail/static/src/scss/composer.scss +++ b/addons/mail/static/src/scss/composer.scss @@ -249,7 +249,7 @@ $o-mail-attachment-image-size: 38px; $o-mail-attachment-margin: 5px; .o_attachments_list, .o_attachments_previews { - margin: 0 -$o-mail-attachment-margin 0; + margin: 0 (-$o-mail-attachment-margin) 0; @include o-flex-display; @include o-flex-flow(row, wrap); } diff --git a/addons/web/static/src/scss/form_view.scss b/addons/web/static/src/scss/form_view.scss index e4dfdca3811..7aa5a6b288f 100644 --- a/addons/web/static/src/scss/form_view.scss +++ b/addons/web/static/src/scss/form_view.scss @@ -40,7 +40,7 @@ @include o-align-items(baseline); min-width: 50px; - margin: 0 -$o-form-spacing-unit/2; + margin: 0 (-$o-form-spacing-unit/2); > div, > span, > button, > label, > a, > input { // > * did not add a level of priority to the rule @include o-flex(0, 0, auto); @@ -124,7 +124,7 @@ @include o-webclient-padding($top: $o-sheet-vpadding, $bottom: $o-sheet-vpadding); .o_form_statusbar { - margin: -$o-sheet-vpadding -$o-horizontal-padding $o-sheet-vpadding -$o-horizontal-padding; + margin: (-$o-sheet-vpadding) (-$o-horizontal-padding) $o-sheet-vpadding (-$o-horizontal-padding); } } diff --git a/addons/web/static/src/scss/kanban_dashboard.scss b/addons/web/static/src/scss/kanban_dashboard.scss index 3f3b2185b58..9a6a334f266 100644 --- a/addons/web/static/src/scss/kanban_dashboard.scss +++ b/addons/web/static/src/scss/kanban_dashboard.scss @@ -194,7 +194,7 @@ .o_dashboard_graph { overflow: hidden; - margin: ($o-kanban-dashboard-vpadding * 2) -$o-kanban-dashboard-hpadding; + margin: ($o-kanban-dashboard-vpadding * 2) (-$o-kanban-dashboard-hpadding); } } diff --git a/addons/web/static/src/scss/rainbow.scss b/addons/web/static/src/scss/rainbow.scss index eb6f4ce3c59..8a705242adc 100644 --- a/addons/web/static/src/scss/rainbow.scss +++ b/addons/web/static/src/scss/rainbow.scss @@ -9,9 +9,9 @@ will-change: transform; z-index: $zindex-modal; padding: 50px; - margin: -5% auto 0 -($reward-size / 2); + margin: -5% auto 0 (-$reward-size / 2); @media (max-width: $screen-xs-max) { - margin: -5% auto 0 -($reward-size-mobile / 2); + margin: -5% auto 0 (-$reward-size-mobile / 2); } background-image: -webkit-radial-gradient(#EDEFF4 30%, transparent 70%, transparent); background-image: -o-radial-gradient(#EDEFF4 30%, transparent 70%, transparent); diff --git a/addons/web/static/src/scss/utils.scss b/addons/web/static/src/scss/utils.scss index f64d50fd240..a0dae170507 100644 --- a/addons/web/static/src/scss/utils.scss +++ b/addons/web/static/src/scss/utils.scss @@ -439,7 +439,7 @@ padding: 0; > a { - margin: auto auto auto -$link-padding-gap; + margin: auto auto auto (-$link-padding-gap); padding: 3px $link-padding-gap; color: $text-color; display: block; diff --git a/addons/web_editor/static/src/scss/web_editor.ui.scss b/addons/web_editor/static/src/scss/web_editor.ui.scss index 0208a43509c..72e6dc56872 100644 --- a/addons/web_editor/static/src/scss/web_editor.ui.scss +++ b/addons/web_editor/static/src/scss/web_editor.ui.scss @@ -268,7 +268,7 @@ html[lang] > body.editor_enable [data-oe-translation-state] { position: relative; width: 100%; height: $o-we-dropzone-size; - margin: -$o-we-dropzone-size/2 0; + margin: (-$o-we-dropzone-size/2) 0; @include o-transition(margin, 400ms, linear); @@ -288,7 +288,7 @@ html[lang] > body.editor_enable [data-oe-translation-state] { width: $o-we-dropzone-size; float: left; - margin: 0 -$o-we-dropzone-size/2; + margin: 0 (-$o-we-dropzone-size/2); &:after { width: 50%; diff --git a/addons/website_sale/static/src/scss/website_sale_frontend.scss b/addons/website_sale/static/src/scss/website_sale_frontend.scss index 7ddf72e289f..7dd4d686581 100644 --- a/addons/website_sale/static/src/scss/website_sale_frontend.scss +++ b/addons/website_sale/static/src/scss/website_sale_frontend.scss @@ -57,7 +57,7 @@ $o-wsale-wizard-label-completed: $state-success-text; @media (min-width: $screen-sm-min) { @include o-position-absolute($left: 50%); - margin: -$tmp-dot-radius 0 0 -($o-wsale-wizard-dot-size*0.5); + margin: (-$tmp-dot-radius) 0 0 (-$o-wsale-wizard-dot-size*0.5); } }