From 4a5dbf6a5792df5b9dbe0f6d08ea82194e4f9fea Mon Sep 17 00:00:00 2001 From: "stefanorigano (SRI)" Date: Mon, 7 Feb 2022 12:51:25 +0000 Subject: [PATCH] [FIX] web, *: float utility-classes 'pull-[left/right]' classes are discontinued since Bootstrap v3 [1]. The reason why we never noticed is that we were unknowingly relying on fontAwesome utility classes that are basically the same. Since v3 we were supposed to use 'float-[left/right]' classes [2], but these classes will be renamed again in v5 with 'float-[start/end]'[3]. This commit introduces "v5 ready" utility-classes and replaces v2 legacy occurrences across the UI. These classes definitions can be safely removed when v5 migration will be completed. Notes: - this commit will *not* adapt frontend occurrences since its CSS already relies on a "migration table" [4]. - this commit will *not* adapt the few v3 'float-[left/right]' occurrences since are supposed to be handled in the v5 migration task (task-2704984). This commit is part of v16 overall restyle (task-2704984). enterprise: https://github.com/odoo/enterprise/pull/23848 task-2745275 [1] https://getbootstrap.com/docs/4.3/migration/#utilities [2] https://getbootstrap.com/docs/4.3/utilities/float/#classes [3] https://getbootstrap.com/docs/5.1/utilities/float/#overview [4] https://github.com/odoo/odoo/blob/15.0/addons/website/static/src/scss/compatibility/bs3_for_12_0.scss#L49 Part-of: odoo/odoo#83501 --- .../static/src/xml/account_journal_activity.xml | 2 +- addons/account/wizard/account_invoice_send_views.xml | 2 +- .../static/src/dashboard/time_off_card.xml | 2 +- addons/hr_recruitment/views/hr_recruitment_views.xml | 2 +- addons/hr_skills/static/src/xml/resume_templates.xml | 2 +- addons/hr_timesheet/views/hr_timesheet_views.xml | 2 +- addons/hr_timesheet/views/project_sharing_views.xml | 4 ++-- addons/hr_timesheet/views/project_views.xml | 4 ++-- addons/l10n_cl/views/report_invoice.xml | 2 +- addons/mail/static/src/js/activity.js | 2 +- addons/mail/static/src/xml/activity_view.xml | 2 +- .../views/mass_mailing_templates_portal.xml | 12 ++++++------ .../static/src/xml/payment_post_processing.xml | 12 ++++++------ addons/project/views/project_sharing_views.xml | 2 +- addons/project/views/project_views.xml | 2 +- addons/stock/views/stock_quant_views.xml | 2 +- .../static/lib/daterangepicker/daterangepicker.js | 2 +- .../static/src/legacy/js/fields/relational_fields.js | 2 +- .../web/static/src/legacy/js/widgets/data_export.js | 2 +- addons/web/static/src/legacy/xml/base.xml | 2 +- addons/web/static/src/webclient/webclient.scss | 12 ++++++++++++ .../views/hr_recruitment_views.xml | 2 +- odoo/addons/base/views/res_config_settings_views.xml | 2 +- 23 files changed, 46 insertions(+), 34 deletions(-) diff --git a/addons/account/static/src/xml/account_journal_activity.xml b/addons/account/static/src/xml/account_journal_activity.xml index e91b9d4ca44..9d5dbf4d97f 100644 --- a/addons/account/static/src/xml/account_journal_activity.xml +++ b/addons/account/static/src/xml/account_journal_activity.xml @@ -15,7 +15,7 @@ - See all activities + See all activities diff --git a/addons/account/wizard/account_invoice_send_views.xml b/addons/account/wizard/account_invoice_send_views.xml index b2d4cdc6d91..1f80df4f877 100644 --- a/addons/account/wizard/account_invoice_send_views.xml +++ b/addons/account/wizard/account_invoice_send_views.xml @@ -74,7 +74,7 @@ @@ -113,8 +113,8 @@
- - + +
@@ -159,11 +159,11 @@
-
+ -
+
Copyright © Company name
diff --git a/addons/payment/static/src/xml/payment_post_processing.xml b/addons/payment/static/src/xml/payment_post_processing.xml index 9c8723f5b64..c40c9b788b5 100644 --- a/addons/payment/static/src/xml/payment_post_processing.xml +++ b/addons/payment/static/src/xml/payment_post_processing.xml @@ -12,7 +12,7 @@
  • - +

    An error occurred during the processing of this payment.
    @@ -30,7 +30,7 @@

    - +

    @@ -48,7 +48,7 @@

    - +

    @@ -69,7 +69,7 @@
  • - +

    @@ -94,7 +94,7 @@
  • - +

    @@ -118,7 +118,7 @@
  • - +

    This transaction has been cancelled.
    diff --git a/addons/project/views/project_sharing_views.xml b/addons/project/views/project_sharing_views.xml index 05904481382..34be8d7eb69 100644 --- a/addons/project/views/project_sharing_views.xml +++ b/addons/project/views/project_sharing_views.xml @@ -213,7 +213,7 @@ -
  • diff --git a/addons/web/static/src/webclient/webclient.scss b/addons/web/static/src/webclient/webclient.scss index 55875b77d02..b4d165e79c8 100644 --- a/addons/web/static/src/webclient/webclient.scss +++ b/addons/web/static/src/webclient/webclient.scss @@ -131,6 +131,18 @@ $o-inline-spacers: map-merge($spacers, ('auto': auto)); } } +// == Float Classes +//------------------------------------------------------------------------------ +// "Bootstrap v5 ready" utility-classes to float elements to the left or right. +// These classes definitions can be safely removed after migrating to BTS v5. + +.float-start { + float: left !important; +} +.float-end { + float: right !important; +} + //== Badges .badge { min-width: $o-badge-min-width; diff --git a/addons/website_hr_recruitment/views/hr_recruitment_views.xml b/addons/website_hr_recruitment/views/hr_recruitment_views.xml index e8b6d3aaf3b..fe939d4596e 100644 --- a/addons/website_hr_recruitment/views/hr_recruitment_views.xml +++ b/addons/website_hr_recruitment/views/hr_recruitment_views.xml @@ -20,7 +20,7 @@ -