[REF] web,*: group Bootstrap config/customization files
- Take them out of `legacy` codebase. - Group them in a generic `static/src/scss` folder, as those files are used in webclient but also in public livechat, portal... X-original-commit: ca2e4fea92b5a26078a412072275a969508358c7 Part-of: odoo/odoo#100759
This commit is contained in:
Pierre Paridans
@@ -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',
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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',
|
||||
],
|
||||
|
||||
@@ -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'),
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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',
|
||||
|
||||
+17
-17
@@ -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'),
|
||||
|
||||
@@ -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',
|
||||
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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',
|
||||
|
||||
Reference in New Issue
Block a user