diff --git a/addons/im_livechat/__manifest__.py b/addons/im_livechat/__manifest__.py index 21bd5cc9573..a0636ac0885 100644 --- a/addons/im_livechat/__manifest__.py +++ b/addons/im_livechat/__manifest__.py @@ -193,7 +193,7 @@ Help your customers with this chat, and analyse their feedback. ('include', 'web._assets_helpers'), - 'web/static/src/libs/bootstrap/pre_variables.scss', + 'web/static/src/scss/pre_variables.scss', 'web/static/lib/bootstrap/scss/_variables.scss', 'im_livechat/static/src/scss/im_livechat_bootstrap.scss', 'im_livechat/static/src/legacy/public_livechat.scss', diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py index b0b4ba7ad5d..96c7a5c0bc6 100644 --- a/addons/mail/__manifest__.py +++ b/addons/mail/__manifest__.py @@ -131,13 +131,13 @@ For more specific needs, you may also assign custom-defined actions 'mail.assets_discuss_public': [ # SCSS dependencies (the order is important) ('include', 'web._assets_helpers'), - 'web/static/src/legacy/scss/bootstrap_overridden.scss', - 'web/static/src/libs/bootstrap/pre_variables.scss', + 'web/static/src/scss/bootstrap_overridden.scss', + 'web/static/src/scss/pre_variables.scss', 'web/static/lib/bootstrap/scss/_variables.scss', - 'web/static/src/legacy/scss/import_bootstrap.scss', - 'web/static/src/libs/bootstrap/utilities_custom.scss', + 'web/static/src/scss/import_bootstrap.scss', + 'web/static/src/scss/utilities_custom.scss', 'web/static/lib/bootstrap/scss/utilities/_api.scss', - 'web/static/src/legacy/scss/bootstrap_review.scss', + 'web/static/src/scss/bootstrap_review.scss', 'web/static/src/webclient/webclient.scss', 'web/static/src/core/utils/*.scss', # depends on BS variables, can't be loaded in assets_primary or assets_secondary diff --git a/addons/mass_mailing/__manifest__.py b/addons/mass_mailing/__manifest__.py index 4d37823908b..9e62f35dc64 100644 --- a/addons/mass_mailing/__manifest__.py +++ b/addons/mass_mailing/__manifest__.py @@ -105,7 +105,7 @@ ], 'mass_mailing.assets_mail_themes_edition': [ ('include', 'web._assets_helpers'), - 'web/static/src/libs/bootstrap/pre_variables.scss', + 'web/static/src/scss/pre_variables.scss', 'web/static/lib/bootstrap/scss/_variables.scss', 'mass_mailing/static/src/scss/mass_mailing.ui.scss', ], diff --git a/addons/point_of_sale/__manifest__.py b/addons/point_of_sale/__manifest__.py index e9a27d9e6d7..d866642fcd0 100644 --- a/addons/point_of_sale/__manifest__.py +++ b/addons/point_of_sale/__manifest__.py @@ -157,7 +157,7 @@ # It is expected to add other lines coming from the web.assets_frontend # if we need to add more and more legacy stuff that would require other scss or js. ('include', 'web._assets_helpers'), - 'web/static/src/libs/bootstrap/pre_variables.scss', + 'web/static/src/scss/pre_variables.scss', 'web/static/lib/bootstrap/scss/_variables.scss', ('include', 'web.frontend_legacy'), diff --git a/addons/point_of_sale/static/src/scss/pos_variables_extra.scss b/addons/point_of_sale/static/src/scss/pos_variables_extra.scss index 4b7857cd489..80494471b9a 100644 --- a/addons/point_of_sale/static/src/scss/pos_variables_extra.scss +++ b/addons/point_of_sale/static/src/scss/pos_variables_extra.scss @@ -1,4 +1,4 @@ -// This file duplicates variables from web_enterprise/static/src/legacy/scss/primary_variables.scss +// This file duplicates variables from web_enterprise/static/src/scss/primary_variables.scss // to force the colors to use those of Enterprise on Community. $o-gray-100: #f6f7fa !default; diff --git a/addons/snailmail/__manifest__.py b/addons/snailmail/__manifest__.py index 4d450500a4d..617d659fc44 100644 --- a/addons/snailmail/__manifest__.py +++ b/addons/snailmail/__manifest__.py @@ -30,7 +30,7 @@ Allows users to send documents by post ], 'snailmail.report_assets_snailmail': [ ('include', 'web._assets_helpers'), - 'web/static/src/libs/bootstrap/pre_variables.scss', + 'web/static/src/scss/pre_variables.scss', 'web/static/lib/bootstrap/scss/_variables.scss', 'snailmail/static/src/scss/snailmail_external_layout_asset.scss', 'snailmail/static/src/js/snailmail_external_layout.js', diff --git a/addons/survey/__manifest__.py b/addons/survey/__manifest__.py index 8217de7110c..e067ce0ce37 100644 --- a/addons/survey/__manifest__.py +++ b/addons/survey/__manifest__.py @@ -72,7 +72,7 @@ sent mails with personal token for the invitation of the survey. 'survey/static/src/js/survey_result.js', ('include', 'web._assets_helpers'), ('include', 'web._assets_frontend_helpers'), - 'web/static/src/libs/bootstrap/pre_variables.scss', + 'web/static/src/scss/pre_variables.scss', 'web/static/lib/bootstrap/scss/_variables.scss', 'survey/static/src/scss/survey_templates_form.scss', 'survey/static/src/scss/survey_templates_results.scss', diff --git a/addons/web/__manifest__.py b/addons/web/__manifest__.py index 2cac6d07a29..5f02956314d 100644 --- a/addons/web/__manifest__.py +++ b/addons/web/__manifest__.py @@ -49,7 +49,7 @@ This module provides the core of the Odoo Web Client. 'web.assets_common': [ ('include', 'web._assets_helpers'), - 'web/static/src/libs/bootstrap/pre_variables.scss', + 'web/static/src/scss/pre_variables.scss', 'web/static/lib/bootstrap/scss/_variables.scss', 'web/static/src/legacy/scss/tempusdominus_overridden.scss', @@ -178,7 +178,7 @@ This module provides the core of the Odoo Web Client. ('include', 'web._assets_helpers'), ('include', 'web._assets_backend_helpers'), - 'web/static/src/libs/bootstrap/pre_variables.scss', + 'web/static/src/scss/pre_variables.scss', 'web/static/lib/bootstrap/scss/_variables.scss', ('include', 'web._assets_bootstrap'), @@ -301,7 +301,7 @@ This module provides the core of the Odoo Web Client. "web.assets_backend_legacy_lazy": [ ("include", "web._assets_helpers"), ('include', 'web._assets_backend_helpers'), - 'web/static/src/libs/bootstrap/pre_variables.scss', + 'web/static/src/scss/pre_variables.scss', 'web/static/lib/bootstrap/scss/_variables.scss', ], 'web.assets_frontend_minimal': [ @@ -322,7 +322,7 @@ This module provides the core of the Odoo Web Client. ('include', 'web._assets_helpers'), ('include', 'web._assets_frontend_helpers'), - 'web/static/src/libs/bootstrap/pre_variables.scss', + 'web/static/src/scss/pre_variables.scss', 'web/static/lib/bootstrap/scss/_variables.scss', 'web/static/lib/luxon/luxon.js', @@ -497,7 +497,7 @@ This module provides the core of the Odoo Web Client. ('include', 'web._assets_helpers'), 'web/static/src/webclient/actions/reports/bootstrap_overridden_report.scss', - 'web/static/src/libs/bootstrap/pre_variables.scss', + 'web/static/src/scss/pre_variables.scss', 'web/static/lib/bootstrap/scss/_variables.scss', ('include', 'web._assets_bootstrap'), @@ -537,35 +537,35 @@ This module provides the core of the Odoo Web Client. # > web._assets_helpers = define assets needed in most main bundles 'web._assets_primary_variables': [ - 'web/static/src/legacy/scss/primary_variables.scss', + 'web/static/src/scss/primary_variables.scss', 'web/static/src/**/**/*.variables.scss', ], 'web._assets_secondary_variables': [ - 'web/static/src/legacy/scss/secondary_variables.scss', + 'web/static/src/scss/secondary_variables.scss', ], 'web._assets_helpers': [ 'web/static/lib/bootstrap/scss/_functions.scss', 'web/static/lib/bootstrap/scss/_mixins.scss', - 'web/static/src/libs/bootstrap/mixins_forwardport.scss', - 'web/static/src/legacy/scss/bs_mixins_overrides.scss', + 'web/static/src/scss/mixins_forwardport.scss', + 'web/static/src/scss/bs_mixins_overrides.scss', 'web/static/src/legacy/scss/utils.scss', ('include', 'web._assets_primary_variables'), ('include', 'web._assets_secondary_variables'), ], 'web._assets_bootstrap': [ - 'web/static/src/legacy/scss/import_bootstrap.scss', - 'web/static/src/libs/bootstrap/helpers_backport.scss', - 'web/static/src/libs/bootstrap/utilities_custom.scss', + 'web/static/src/scss/import_bootstrap.scss', + 'web/static/src/scss/helpers_backport.scss', + 'web/static/src/scss/utilities_custom.scss', 'web/static/lib/bootstrap/scss/utilities/_api.scss', - 'web/static/src/legacy/scss/bootstrap_review.scss', + 'web/static/src/scss/bootstrap_review.scss', ], 'web._assets_backend_helpers': [ - 'web/static/src/legacy/scss/bootstrap_overridden.scss', - 'web/static/src/legacy/scss/bs_mixins_overrides_backend.scss', + 'web/static/src/scss/bootstrap_overridden.scss', + 'web/static/src/scss/bs_mixins_overrides_backend.scss', ], 'web._assets_frontend_helpers': [ - 'web/static/src/legacy/scss/bootstrap_overridden_frontend.scss', + 'web/static/src/scss/bootstrap_overridden_frontend.scss', ], # Used during the transition of the web architecture @@ -635,7 +635,7 @@ This module provides the core of the Odoo Web Client. # It is expected to add other lines coming from the web.assets_frontend # if we need to add more and more legacy stuff that would require other scss or js. ('include', 'web._assets_helpers'), - 'web/static/src/libs/bootstrap/pre_variables.scss', + 'web/static/src/scss/pre_variables.scss', 'web/static/lib/bootstrap/scss/_variables.scss', ('include', 'web.frontend_legacy'), diff --git a/addons/web/static/src/legacy/scss/bootstrap_overridden.scss b/addons/web/static/src/scss/bootstrap_overridden.scss similarity index 100% rename from addons/web/static/src/legacy/scss/bootstrap_overridden.scss rename to addons/web/static/src/scss/bootstrap_overridden.scss diff --git a/addons/web/static/src/legacy/scss/bootstrap_overridden_frontend.scss b/addons/web/static/src/scss/bootstrap_overridden_frontend.scss similarity index 100% rename from addons/web/static/src/legacy/scss/bootstrap_overridden_frontend.scss rename to addons/web/static/src/scss/bootstrap_overridden_frontend.scss diff --git a/addons/web/static/src/legacy/scss/bootstrap_review.scss b/addons/web/static/src/scss/bootstrap_review.scss similarity index 100% rename from addons/web/static/src/legacy/scss/bootstrap_review.scss rename to addons/web/static/src/scss/bootstrap_review.scss diff --git a/addons/web/static/src/legacy/scss/bs_mixins_overrides.scss b/addons/web/static/src/scss/bs_mixins_overrides.scss similarity index 100% rename from addons/web/static/src/legacy/scss/bs_mixins_overrides.scss rename to addons/web/static/src/scss/bs_mixins_overrides.scss diff --git a/addons/web/static/src/legacy/scss/bs_mixins_overrides_backend.scss b/addons/web/static/src/scss/bs_mixins_overrides_backend.scss similarity index 100% rename from addons/web/static/src/legacy/scss/bs_mixins_overrides_backend.scss rename to addons/web/static/src/scss/bs_mixins_overrides_backend.scss diff --git a/addons/web/static/src/libs/bootstrap/helpers_backport.scss b/addons/web/static/src/scss/helpers_backport.scss similarity index 100% rename from addons/web/static/src/libs/bootstrap/helpers_backport.scss rename to addons/web/static/src/scss/helpers_backport.scss diff --git a/addons/web/static/src/legacy/scss/import_bootstrap.scss b/addons/web/static/src/scss/import_bootstrap.scss similarity index 100% rename from addons/web/static/src/legacy/scss/import_bootstrap.scss rename to addons/web/static/src/scss/import_bootstrap.scss diff --git a/addons/web/static/src/libs/bootstrap/mixins_forwardport.scss b/addons/web/static/src/scss/mixins_forwardport.scss similarity index 100% rename from addons/web/static/src/libs/bootstrap/mixins_forwardport.scss rename to addons/web/static/src/scss/mixins_forwardport.scss diff --git a/addons/web/static/src/libs/bootstrap/pre_variables.scss b/addons/web/static/src/scss/pre_variables.scss similarity index 100% rename from addons/web/static/src/libs/bootstrap/pre_variables.scss rename to addons/web/static/src/scss/pre_variables.scss diff --git a/addons/web/static/src/legacy/scss/primary_variables.scss b/addons/web/static/src/scss/primary_variables.scss similarity index 100% rename from addons/web/static/src/legacy/scss/primary_variables.scss rename to addons/web/static/src/scss/primary_variables.scss diff --git a/addons/web/static/src/legacy/scss/secondary_variables.scss b/addons/web/static/src/scss/secondary_variables.scss similarity index 100% rename from addons/web/static/src/legacy/scss/secondary_variables.scss rename to addons/web/static/src/scss/secondary_variables.scss diff --git a/addons/web/static/src/libs/bootstrap/utilities_custom.scss b/addons/web/static/src/scss/utilities_custom.scss similarity index 100% rename from addons/web/static/src/libs/bootstrap/utilities_custom.scss rename to addons/web/static/src/scss/utilities_custom.scss diff --git a/addons/web_editor/__manifest__.py b/addons/web_editor/__manifest__.py index f51375626be..62c368283f3 100644 --- a/addons/web_editor/__manifest__.py +++ b/addons/web_editor/__manifest__.py @@ -59,7 +59,7 @@ Odoo Web Editor widget. ('include', 'web._assets_helpers'), 'web_editor/static/src/scss/bootstrap_overridden.scss', - 'web/static/src/libs/bootstrap/pre_variables.scss', + 'web/static/src/scss/pre_variables.scss', 'web/static/lib/bootstrap/scss/_variables.scss', 'web_editor/static/src/js/editor/odoo-editor/src/style.scss', diff --git a/addons/website/__manifest__.py b/addons/website/__manifest__.py index 40bf8dc804b..da49235192c 100644 --- a/addons/website/__manifest__.py +++ b/addons/website/__manifest__.py @@ -195,7 +195,7 @@ 'website.assets_wysiwyg': [ ('include', 'web._assets_helpers'), 'web_editor/static/src/scss/bootstrap_overridden.scss', - 'web/static/src/libs/bootstrap/pre_variables.scss', + 'web/static/src/scss/pre_variables.scss', 'web/static/lib/bootstrap/scss/_variables.scss', 'website/static/src/scss/website.wysiwyg.scss', 'website/static/src/scss/website.edit_mode.scss', @@ -241,7 +241,7 @@ ], 'website.assets_editor': [ ('include', 'web._assets_helpers'), - 'web/static/src/libs/bootstrap/pre_variables.scss', + 'web/static/src/scss/pre_variables.scss', 'web/static/lib/bootstrap/scss/_variables.scss', 'website/static/src/components/ace_editor/ace_editor.js', 'website/static/src/components/ace_editor/ace_editor.scss', diff --git a/addons/website_slides/__manifest__.py b/addons/website_slides/__manifest__.py index 462eaa07500..14e7922774d 100644 --- a/addons/website_slides/__manifest__.py +++ b/addons/website_slides/__manifest__.py @@ -122,7 +122,7 @@ Featuring ], 'website_slides.slide_embed_assets': [ ('include', 'web._assets_helpers'), - 'web/static/src/libs/bootstrap/pre_variables.scss', + 'web/static/src/scss/pre_variables.scss', 'web/static/lib/bootstrap/scss/_variables.scss', ('include', 'web._assets_bootstrap'), 'website_slides/static/src/scss/website_slides.scss',