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/control_panel.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/control_panel.scss')
| -rw-r--r-- | addons/web/static/src/scss/control_panel.scss | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/addons/web/static/src/scss/control_panel.scss b/addons/web/static/src/scss/control_panel.scss index 325ed25b3ac..4174db62c6a 100644 --- a/addons/web/static/src/scss/control_panel.scss +++ b/addons/web/static/src/scss/control_panel.scss @@ -1,11 +1,11 @@ -@breadcrumb-height: 30px; +$breadcrumb-height: 30px; .o_control_panel { - .o-flex-display(); - .o-flex-flow(row, wrap); - border-bottom: 1px solid darken(@odoo-control-panel-background-color, 20%); - .o-webclient-padding(@top: 10px, @bottom: 10px); - background-color: @odoo-control-panel-background-color; + @include o-flex-display; + @include o-flex-flow(row, wrap); + border-bottom: 1px solid darken($odoo-control-panel-background-color, 20%); + @include o-webclient-padding($top: 10px, $bottom: 10px); + background-color: $odoo-control-panel-background-color; > .breadcrumb { width: 50%; @@ -13,7 +13,7 @@ font-size: 18px; > li { - .o-text-overflow(@max-width: 90%); + @include o-text-overflow($max-width: 90%); > a { cursor: pointer; @@ -27,7 +27,7 @@ > .o_cp_searchview { width: 50%; - min-height: @breadcrumb-height; + min-height: $breadcrumb-height; } .btn.o_enable_searchview { @@ -37,8 +37,8 @@ } > .o_cp_left { - .o-flex-display(); - .o-justify-content(space-between); + @include o-flex-display; + @include o-justify-content(space-between); width: 50%; margin-top: 5px; @@ -56,10 +56,10 @@ } .o_form_binary_form span { padding: 3px 25px; - color: @btn-default-color; + color: $btn-default-color; } .o_form_binary_form:hover { - background-color: @table-bg-hover; + background-color: $table-bg-hover; } } .o_sidebar_delete_attachment { @@ -72,7 +72,7 @@ } > .o_cp_right { - .o-flex-display(); + @include o-flex-display; width: 50%; margin-top: 5px; @@ -80,11 +80,11 @@ margin: auto 0 auto auto; padding-left: 5px; text-align: center; - .user-select(none); + @include user-select(none); > div { - .o-flex-display(); - .o-align-items(center); + @include o-flex-display; + @include o-align-items(center); } .o_pager_counter { @@ -93,24 +93,24 @@ } > .o_cp_switch_buttons > .btn:first-child { - margin-left: @odoo-horizontal-padding; + margin-left: $odoo-horizontal-padding; } } } .o_x2m_control_panel { - .o-flex-display(); - .o-flex-flow(row, wrap); + @include o-flex-display; + @include o-flex-flow(row, wrap); .o_cp_buttons { - .o-flex-display(); + @include o-flex-display; margin-right: auto; > div { margin-top: 5px; } } .o_cp_pager { - .o-flex-display(); + @include o-flex-display; margin-left: auto; } } |
