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/base_import/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/base_import/static/src')
| -rw-r--r-- | addons/base_import/static/src/scss/base_import.scss | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/addons/base_import/static/src/scss/base_import.scss b/addons/base_import/static/src/scss/base_import.scss index 4af6f00f069..72fe2651331 100644 --- a/addons/base_import/static/src/scss/base_import.scss +++ b/addons/base_import/static/src/scss/base_import.scss @@ -1,5 +1,5 @@ .oe_import { - .o-webclient-padding(@top: 8px); + @include o-webclient-padding($top: 8px); background-color: white; overflow: auto; position: absolute; // Needed for chrome @@ -7,7 +7,7 @@ right: 0; bottom: 0; left: 0; - @media (max-width: @screen-xs-max) { + @media (max-width: $screen-xs-max) { position: static; } @@ -29,7 +29,7 @@ .oe_import_box { padding: 16px; background: #F0EEEE; - border-radius: @border-radius-base; + border-radius: $border-radius-base; border: solid 1px #dddddd; label { font-weight: normal; @@ -85,7 +85,7 @@ } .oe_import_noheaders { - .text-muted(); + @extend .text-muted; // FIXME was a mixin before scss convertion } /* ------------- ERRORS AND WARNINGS REPORT ------------ */ @@ -97,19 +97,19 @@ padding: 4px; margin: 2px 0; list-style: none; - border-radius: @border-radius-base; + border-radius: $border-radius-base; } .oe_import_report_error { - .bg-danger(); - .text-danger(); + @extend .bg-danger; // FIXME was a mixin before scss convertion + @extend .text-danger; // FIXME was a mixin before scss convertion } .oe_import_report_warning { - .bg-warning(); - .text-warning(); + @extend .bg-warning; // FIXME was a mixin before scss convertion + @extend .text-warning; // FIXME was a mixin before scss convertion } .oe_import_report_info { - .bg-info(); - .text-info(); + @extend .bg-info; // FIXME was a mixin before scss convertion + @extend .text-info; // FIXME was a mixin before scss convertion } } @@ -136,7 +136,7 @@ /* Field dropdown */ .oe_import_selector { - font-size: @font-size-small; + font-size: $font-size-small; ul, li { margin: 0; padding: 0; } |
