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/web/static/src/scss/modal.scss | |
| 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/web/static/src/scss/modal.scss')
| -rw-r--r-- | addons/web/static/src/scss/modal.scss | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/addons/web/static/src/scss/modal.scss b/addons/web/static/src/scss/modal.scss index 5b74583ee41..82faabfa3bc 100644 --- a/addons/web/static/src/scss/modal.scss +++ b/addons/web/static/src/scss/modal.scss @@ -13,8 +13,8 @@ } .o_modal_header { - .o-webclient-padding(@top: 10px, @bottom: 10px); - .clearfix(); + @include o-webclient-padding($top: 10px, $bottom: 10px); + @include clearfix; .o_search_options { display: inline-block; @@ -31,7 +31,7 @@ } - @media (min-width: @screen-sm-min) { + @media (min-width: $screen-sm-min) { .modal-dialog { height: 100%; padding: 30px 0; @@ -39,11 +39,11 @@ .modal-content { max-height: 100%; - .o-flex-display(); - .o-flex-flow(column, nowrap); + @include o-flex-display; + @include o-flex-flow(column, nowrap); .modal-header, .modal-footer { - .o-flex(0, 0, auto); + @include o-flex(0, 0, auto); } .modal-body { @@ -54,15 +54,15 @@ &.o_dialog_error { overflow: visible; - .o-flex-display(); - .o-flex-flow(column, nowrap); + @include o-flex-display; + @include o-flex-flow(column, nowrap); > .alert, > button { - .o-flex(0, 0, auto); + @include o-flex(0, 0, auto); } > .o_error_detail { - .o-flex(1, 1, auto); + @include o-flex(1, 1, auto); min-height: 0; overflow: auto; } @@ -74,10 +74,10 @@ } // Temporary fix for modals which are not instantiated thanks to the Dialog -// JS classes (deprecated case) (see bootstrap_overridden.less) + Frontend. +// JS classes (deprecated case) (see bootstrap_overridden.scss) + Frontend. // // TODO the following code was disabled because it is saas-incompatible // // :not(body) > .modal { -// z-index: @zindex-modal-background + 1; +// z-index: $zindex-modal-background + 1; // } |
