From fbfd0119041ca7dc830796e76d9ae5c303459d4f Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Thu, 15 Feb 2018 18:14:58 +0100 Subject: [PATCH] =?UTF-8?q?[REF]=20*:=20get=20rid=20of=20introduced=20@?= =?UTF-8?q?=E2=80=8Bextend?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During first scss convertion, classes called as mixins were changed to an @​extend instruction which was the best approximation given the fact there is no equivalent in sass to do that. The problem is that the instruction is slowing the scss computation a lot and might also break the style in unexpected ways because of the complex unwanted selectors the instruction induces. This commit removes the need of extends. This is done case per case. Sometimes this involves adding classes in xml, sometimes to change the style a little, ... The button rendering refactoring which was made at the start of the LESS to SASS merge was also done in prevision of this. After this commit, sass computation is like 5-6 times faster than less computation while it was like 10 times *slower* before this commit. --- .../views/account_journal_dashboard_view.xml | 2 +- .../base_import/static/src/js/import_action.js | 2 +- .../base_import/static/src/scss/base_import.scss | 16 ---------------- .../base_import/static/src/xml/base_import.xml | 8 ++++---- addons/hr/views/hr_views.xml | 2 +- addons/hr_recruitment/views/hr_job_views.xml | 2 +- addons/mail/static/src/scss/systray.scss | 2 -- addons/mail/static/src/scss/thread.scss | 4 ---- addons/mail/static/src/xml/activity.xml | 2 +- addons/mail/static/src/xml/systray.xml | 9 ++++----- addons/mail/static/src/xml/thread.xml | 6 +++--- addons/mail/wizard/mail_compose_message_view.xml | 2 +- addons/maintenance/views/maintenance_views.xml | 2 +- .../views/mass_mailing_stats_views.xml | 2 +- addons/mass_mailing/views/mass_mailing_views.xml | 6 +++--- addons/mrp/views/mrp_workcenter_views.xml | 2 +- addons/mrp/views/stock_picking_views.xml | 2 +- .../views/point_of_sale_dashboard.xml | 2 +- addons/project/views/project_views.xml | 2 +- addons/sales_team/views/sales_team_dashboard.xml | 2 +- addons/stock/views/stock_picking_views.xml | 2 +- addons/web/static/src/scss/dropdown_extra.scss | 5 ----- addons/web/static/src/scss/form_view.scss | 7 +++---- addons/web/static/src/scss/kanban_dashboard.scss | 6 ++++-- .../web/static/src/scss/search_view_extra.scss | 7 ------- addons/web/static/src/xml/base.xml | 8 ++++---- odoo/addons/base/views/res_users_views.xml | 2 +- 27 files changed, 40 insertions(+), 74 deletions(-) diff --git a/addons/account/views/account_journal_dashboard_view.xml b/addons/account/views/account_journal_dashboard_view.xml index 9c7f1aca551..f6b74013d54 100644 --- a/addons/account/views/account_journal_dashboard_view.xml +++ b/addons/account/views/account_journal_dashboard_view.xml @@ -29,7 +29,7 @@ -
+
diff --git a/addons/base_import/static/src/js/import_action.js b/addons/base_import/static/src/js/import_action.js index 1e17798ae34..d995e9cf055 100644 --- a/addons/base_import/static/src/js/import_action.js +++ b/addons/base_import/static/src/js/import_action.js @@ -281,7 +281,7 @@ var DataImport = AbstractAction.extend(ControlPanelMixin, { // TODO: test that write // succeeded? this.$el.removeClass('oe_import_preview_error oe_import_error'); this.$el.toggleClass( - 'oe_import_noheaders', + 'oe_import_noheaders text-muted', !this.$('input.oe_import_has_header').prop('checked')); this._rpc({ model: 'base_import.import', diff --git a/addons/base_import/static/src/scss/base_import.scss b/addons/base_import/static/src/scss/base_import.scss index 72fe2651331..9a4ce56f5c2 100644 --- a/addons/base_import/static/src/scss/base_import.scss +++ b/addons/base_import/static/src/scss/base_import.scss @@ -84,10 +84,6 @@ display: block; } - .oe_import_noheaders { - @extend .text-muted; // FIXME was a mixin before scss convertion - } - /* ------------- ERRORS AND WARNINGS REPORT ------------ */ .oe_import_error_report { > ul { @@ -99,18 +95,6 @@ list-style: none; border-radius: $border-radius-base; } - .oe_import_report_error { - @extend .bg-danger; // FIXME was a mixin before scss convertion - @extend .text-danger; // FIXME was a mixin before scss convertion - } - .oe_import_report_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 { - @extend .bg-info; // FIXME was a mixin before scss convertion - @extend .text-info; // FIXME was a mixin before scss convertion - } } /* ------------- THE CSV TABLE ------------ */ diff --git a/addons/base_import/static/src/xml/base_import.xml b/addons/base_import/static/src/xml/base_import.xml index f882bf7f557..276d9ca0245 100644 --- a/addons/base_import/static/src/xml/base_import.xml +++ b/addons/base_import/static/src/xml/base_import.xml @@ -68,7 +68,7 @@ Track history during import -
@@ -84,7 +84,7 @@ -

If the file contains +

If the file contains the column names, Odoo can try auto-detecting the field corresponding to the column. This makes imports simpler especially when the file has many columns.

@@ -124,7 +124,7 @@ -
+

Import preview failed due to: .

For CSV files, the issue could be an incorrect encoding.

Here is the start of the file we could not import:

@@ -133,7 +133,7 @@
  • + t-attf-class="oe_import_report bg-#{error_value[0].type} text-#{error_value[0].type}"> diff --git a/addons/hr/views/hr_views.xml b/addons/hr/views/hr_views.xml index 7fd75167757..7e5d6a61b39 100644 --- a/addons/hr/views/hr_views.xml +++ b/addons/hr/views/hr_views.xml @@ -554,7 +554,7 @@
-
+
diff --git a/addons/hr_recruitment/views/hr_job_views.xml b/addons/hr_recruitment/views/hr_job_views.xml index 60971806e89..2311188baed 100644 --- a/addons/hr_recruitment/views/hr_job_views.xml +++ b/addons/hr_recruitment/views/hr_job_views.xml @@ -68,7 +68,7 @@
-
+
    diff --git a/addons/mail/static/src/scss/systray.scss b/addons/mail/static/src/scss/systray.scss index 958e1ff2c08..c06bde1d3f1 100644 --- a/addons/mail/static/src/scss/systray.scss +++ b/addons/mail/static/src/scss/systray.scss @@ -45,7 +45,6 @@ border-bottom: 1px solid $gray-lighter-darker; box-shadow: 0 0 2px $gray-lighter-darker; .o_filter_button, .o_new_message { - @extend .btn-link; // FIXME was a mixin before scss convertion padding: 5px; } .o_filter_button { @@ -87,7 +86,6 @@ } } .o_activity_filter_button { - @extend .btn-link; // FIXME was a mixin before scss convertion padding: 2px; } .o_no_activity { diff --git a/addons/mail/static/src/scss/thread.scss b/addons/mail/static/src/scss/thread.scss index 9f9ace65de9..4a2edb68913 100644 --- a/addons/mail/static/src/scss/thread.scss +++ b/addons/mail/static/src/scss/thread.scss @@ -144,10 +144,6 @@ .o_mail_info { margin-bottom: 2px; - @extend .text-muted; // FIXME was a mixin before scss convertion - .o_mail_mailto, .o_mail_mailto:hover { - @extend .text-muted; // FIXME was a mixin before scss convertion - } strong { color: $headings-color; diff --git a/addons/mail/static/src/xml/activity.xml b/addons/mail/static/src/xml/activity.xml index fadb93dfa7d..9bdcfcdcb90 100644 --- a/addons/mail/static/src/xml/activity.xml +++ b/addons/mail/static/src/xml/activity.xml @@ -23,7 +23,7 @@
-
+
: “” diff --git a/addons/mail/static/src/xml/systray.xml b/addons/mail/static/src/xml/systray.xml index dd61c486b9b..54df73c1b94 100644 --- a/addons/mail/static/src/xml/systray.xml +++ b/addons/mail/static/src/xml/systray.xml @@ -14,11 +14,11 @@
  • - - - + + +
    - +
  • @@ -93,4 +93,3 @@
    • - diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml index 118e96da8ff..c3aa2388154 100644 --- a/addons/mail/static/src/xml/thread.xml +++ b/addons/mail/static/src/xml/thread.xml @@ -142,14 +142,14 @@ t-att-class="'fa o_thread_message_star o_thread_icon ' + (message.is_starred ? 'fa-star' : 'fa-star-o')" t-att-data-message-id="message.id" title="Mark as Todo"/>
    -
    -

    +

    +

    Note by - + diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml index a3d00f5228c..45aa65256b4 100644 --- a/addons/mail/wizard/mail_compose_message_view.xml +++ b/addons/mail/wizard/mail_compose_message_view.xml @@ -18,7 +18,7 @@ -

    diff --git a/addons/maintenance/views/maintenance_views.xml b/addons/maintenance/views/maintenance_views.xml index 2a3f2e4b8d3..06709b3bb3b 100644 --- a/addons/maintenance/views/maintenance_views.xml +++ b/addons/maintenance/views/maintenance_views.xml @@ -872,7 +872,7 @@

    -
    +
    diff --git a/addons/mass_mailing/views/mass_mailing_stats_views.xml b/addons/mass_mailing/views/mass_mailing_stats_views.xml index dfa12f5b564..7cf644dad93 100644 --- a/addons/mass_mailing/views/mass_mailing_stats_views.xml +++ b/addons/mass_mailing/views/mass_mailing_stats_views.xml @@ -51,7 +51,7 @@ mail.mail.statistics
    -
    +

    This email could not be sent.

    diff --git a/addons/mass_mailing/views/mass_mailing_views.xml b/addons/mass_mailing/views/mass_mailing_views.xml index 586d805bf8b..fc7ca90e12d 100644 --- a/addons/mass_mailing/views/mass_mailing_views.xml +++ b/addons/mass_mailing/views/mass_mailing_views.xml @@ -419,7 +419,7 @@ -
    +

    -
    +

    -
    +

    This mailing is scheduled for . diff --git a/addons/mrp/views/mrp_workcenter_views.xml b/addons/mrp/views/mrp_workcenter_views.xml index 605d904e14a..954da835817 100644 --- a/addons/mrp/views/mrp_workcenter_views.xml +++ b/addons/mrp/views/mrp_workcenter_views.xml @@ -242,7 +242,7 @@ attrs="{'invisible': [('working_state','in',('normal','blocked'))]}"/>

    -
    +
    diff --git a/addons/mrp/views/stock_picking_views.xml b/addons/mrp/views/stock_picking_views.xml index 844a669489b..e647d45705a 100644 --- a/addons/mrp/views/stock_picking_views.xml +++ b/addons/mrp/views/stock_picking_views.xml @@ -55,7 +55,7 @@
    -
    +
    diff --git a/addons/point_of_sale/views/point_of_sale_dashboard.xml b/addons/point_of_sale/views/point_of_sale_dashboard.xml index 8b70e02c9ec..de8d20ab2c0 100644 --- a/addons/point_of_sale/views/point_of_sale_dashboard.xml +++ b/addons/point_of_sale/views/point_of_sale_dashboard.xml @@ -118,7 +118,7 @@
    -
    +
    diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml index 4ec031f7aa7..35326927f15 100644 --- a/addons/project/views/project_views.xml +++ b/addons/project/views/project_views.xml @@ -326,7 +326,7 @@
    -
    +
    Edit diff --git a/addons/sales_team/views/sales_team_dashboard.xml b/addons/sales_team/views/sales_team_dashboard.xml index e77949ad667..18f3ade0013 100644 --- a/addons/sales_team/views/sales_team_dashboard.xml +++ b/addons/sales_team/views/sales_team_dashboard.xml @@ -41,7 +41,7 @@
    -
    +
    diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml index 998231982c1..e02f5773093 100644 --- a/addons/stock/views/stock_picking_views.xml +++ b/addons/stock/views/stock_picking_views.xml @@ -688,7 +688,7 @@
    -
    +
    diff --git a/addons/web/static/src/scss/dropdown_extra.scss b/addons/web/static/src/scss/dropdown_extra.scss index f925c4f6190..d15496fe0c9 100644 --- a/addons/web/static/src/scss/dropdown_extra.scss +++ b/addons/web/static/src/scss/dropdown_extra.scss @@ -56,8 +56,3 @@ $tag-border: #afafb6; } } } - -// Buttons used as dropdown toggler -.o_dropdown_toggler_btn { - @extend .btn-default; // FIXME was a mixin before scss convertion -} diff --git a/addons/web/static/src/scss/form_view.scss b/addons/web/static/src/scss/form_view.scss index 3698ee07e74..c5e0207022d 100644 --- a/addons/web/static/src/scss/form_view.scss +++ b/addons/web/static/src/scss/form_view.scss @@ -3,7 +3,6 @@ // Utility classes .oe_form_box_info { - @extend .bg-info; // FIXME was a mixin before scss convertion @include o-webclient-padding($top: 5px, $bottom: 5px); > p { margin: auto; @@ -24,11 +23,11 @@ } } .oe_left { - @extend .oe_inline; // FIXME was a mixin before scss convertion + @extend .oe_inline; float: left!important; } .oe_right { - @extend .oe_inline; // FIXME was a mixin before scss convertion + @extend .oe_inline; float: right!important; } @@ -443,7 +442,7 @@ // Specific style classes .o_group.o_inner_group.oe_subtotal_footer { - @extend .oe_right; // FIXME was a mixin after scss convertion + @extend .oe_right; > tbody > tr > td { padding: 0; diff --git a/addons/web/static/src/scss/kanban_dashboard.scss b/addons/web/static/src/scss/kanban_dashboard.scss index 0a1688260a8..791b582efd1 100644 --- a/addons/web/static/src/scss/kanban_dashboard.scss +++ b/addons/web/static/src/scss/kanban_dashboard.scss @@ -209,7 +209,6 @@ $o-kanban-dashboard-dropdown-complex-gap: 5px; } .o_kanban_card_manage_pane { - @extend .dropdown-menu; // FIXME was a mixin before scss convertion @include o-kanban-dropdown-menu; // Arbitrary value to place the dropdown-menu exactly below the @@ -252,8 +251,11 @@ $o-kanban-dashboard-dropdown-complex-gap: 5px; padding-right: $o-kanban-dashboard-dropdown-complex-gap; > .o_kanban_card_manage_title { - @extend .h5; // FIXME was a mixin before scss convertion + margin: ($line-height-computed / 2) 0; + color: $headings-color; + font-size: $font-size-h5; font-weight: 500; + line-height: $headings-line-height; } > div:not(.o_kanban_card_manage_title) { @include o-kanban-dashboard-dropdown-link($link-padding-gap: $o-kanban-dashboard-dropdown-complex-gap); diff --git a/addons/web/static/src/scss/search_view_extra.scss b/addons/web/static/src/scss/search_view_extra.scss index e5b378e6e41..247b188c396 100644 --- a/addons/web/static/src/scss/search_view_extra.scss +++ b/addons/web/static/src/scss/search_view_extra.scss @@ -34,10 +34,3 @@ } } } - -// Search options: inputs and selects style -.o_search_options { - input[type="text"], select { - @extend .form-control; // FIXME was a mixin before scss convertion - } -} diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 44412379a93..957e5ce6953 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -318,7 +318,7 @@
    - @@ -1026,7 +1026,7 @@
    -