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/webclient.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/webclient.scss')
| -rw-r--r-- | addons/web/static/src/scss/webclient.scss | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/addons/web/static/src/scss/webclient.scss b/addons/web/static/src/scss/webclient.scss index 1de198d282b..d4bd0b4e0f2 100644 --- a/addons/web/static/src/scss/webclient.scss +++ b/addons/web/static/src/scss/webclient.scss @@ -3,19 +3,19 @@ // ------------------------------------------------------------------ .o_web_client { position: relative; // normally useless but required by bootstrap-datepicker - background-color: @odoo-webclient-background-color; + background-color: $odoo-webclient-background-color; } // ------------------------------------------------------------------ // Misc. widgets // ------------------------------------------------------------------ -@notification-error-bg-color: #F16567; -@notification-info-bg-color: #FCFBEA; +$notification-error-bg-color: #F16567; +$notification-info-bg-color: #FCFBEA; .o_notification_manager { width: 300px; max-width: 100%; - .o-position-absolute(@navbar-height, 0px); + @include o-position-absolute($navbar-height, 0px); z-index: 1100; // Bootstrap modal z-index is 1050 .o_notification { @@ -24,19 +24,19 @@ opacity: 0; - background-color: @notification-info-bg-color; - box-shadow: 0px 0px 5px 1px @odoo-main-text-color; + background-color: $notification-info-bg-color; + box-shadow: 0px 0px 5px 1px $odoo-main-text-color; position: relative; .o_close { - .o-position-absolute(5px, 5px); + @include o-position-absolute(5px, 5px); color: rgba(0, 0, 0, 0.3); text-decoration: none; } .o_notification_title { - .o-flex-display(); - .o-align-items(center); + @include o-flex-display; + @include o-align-items(center); border-bottom: 1px solid rgba(0, 0, 0, 0.1); padding: 10px 10px 10px 20px; @@ -56,7 +56,7 @@ &.o_error { color: white; - background-color: @notification-error-bg-color; + background-color: $notification-error-bg-color; } } } @@ -103,30 +103,30 @@ div.o_boolean_toggle { } > input:checked + .slider { - background-color: @odoo-brand-optional; + background-color: $odoo-brand-optional; &:before { - .translate(14px; 0px); + @include translate(14px, 0px); } } } // Full bg colors (bootstrap extension) .bg-success-full { - background-color: @brand-success; + background-color: $brand-success; } .bg-warning-full { - background-color: @brand-warning; + background-color: $brand-warning; } .bg-danger-full { - background-color: @brand-danger; + background-color: $brand-danger; } .bg-info-full { - background-color: @brand-info; + background-color: $brand-info; } .o_web_accesskey_overlay { - font-family: @font-family-sans-serif; + font-family: $font-family-sans-serif; position: absolute; width: 100%; height: 100%; @@ -137,4 +137,4 @@ div.o_boolean_toggle { justify-content: center; display: flex; align-items: center; -}
\ No newline at end of file +} |
