From ba6784eebdb338bed04843cbfe9048d25b340be8 Mon Sep 17 00:00:00 2001 From: Pierre Paridans Date: Thu, 27 Jul 2023 14:19:38 +0000 Subject: [PATCH] [REF] web,website_slides: move scss out of legacy closes odoo/odoo#129983 Signed-off-by: Aaron Bohy (aab) --- addons/web/__manifest__.py | 16 ++++++++-------- .../scss => core/colorpicker}/colorpicker.scss | 0 addons/web/static/src/{legacy => }/scss/ace.scss | 0 .../static/src/{legacy => }/scss/animation.scss | 0 .../{legacy => }/scss/base_document_layout.scss | 0 .../src/{legacy => }/scss/base_frontend.scss | 0 .../many2many_binary_field.scss} | 0 addons/website_slides/__manifest__.py | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) rename addons/web/static/src/{legacy/scss => core/colorpicker}/colorpicker.scss (100%) rename addons/web/static/src/{legacy => }/scss/ace.scss (100%) rename addons/web/static/src/{legacy => }/scss/animation.scss (100%) rename addons/web/static/src/{legacy => }/scss/base_document_layout.scss (100%) rename addons/web/static/src/{legacy => }/scss/base_frontend.scss (100%) rename addons/web/static/src/{legacy/scss/attachment_preview.scss => views/fields/many2many_binary/many2many_binary_field.scss} (100%) diff --git a/addons/web/__manifest__.py b/addons/web/__manifest__.py index 023dd01f1b5..67db4d6d9e5 100644 --- a/addons/web/__manifest__.py +++ b/addons/web/__manifest__.py @@ -58,11 +58,11 @@ This module provides the core of the Odoo Web Client. 'web/static/lib/select2/select2.css', 'web/static/lib/select2-bootstrap-css/select2-bootstrap.css', 'web/static/src/webclient/navbar/navbar.scss', + 'web/static/src/scss/animation.scss', + 'web/static/src/core/colorpicker/colorpicker.scss', 'web/static/src/legacy/scss/ui.scss', 'web/static/src/legacy/scss/mimetypes.scss', 'web/static/src/legacy/scss/modal.scss', - 'web/static/src/legacy/scss/animation.scss', - 'web/static/src/legacy/scss/colorpicker.scss', 'web/static/src/legacy/scss/popover.scss', 'web/static/src/legacy/scss/translation_dialog.scss', 'web/static/src/legacy/scss/keyboard.scss', @@ -199,15 +199,15 @@ This module provides the core of the Odoo Web Client. 'web/static/lib/py.js/lib/py_extras.js', 'web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js', + 'web/static/src/scss/ace.scss', + 'web/static/src/scss/base_document_layout.scss', + 'web/static/src/legacy/scss/model_field_selector.scss', 'web/static/src/legacy/scss/dropdown.scss', 'web/static/src/legacy/scss/tooltip.scss', 'web/static/src/legacy/scss/switch_company_menu.scss', - 'web/static/src/legacy/scss/ace.scss', 'web/static/src/legacy/scss/fields.scss', 'web/static/src/legacy/scss/views.scss', - 'web/static/src/legacy/scss/attachment_preview.scss', - 'web/static/src/legacy/scss/base_document_layout.scss', 'web/static/src/legacy/scss/fields_extra.scss', 'web/static/src/legacy/scss/color_picker.scss', 'base/static/src/scss/res_partner.scss', @@ -270,11 +270,12 @@ This module provides the core of the Odoo Web Client. 'web/static/lib/select2/select2.css', 'web/static/lib/select2-bootstrap-css/select2-bootstrap.css', 'web/static/src/webclient/navbar/navbar.scss', + 'web/static/src/scss/animation.scss', + 'web/static/src/scss/base_frontend.scss', + 'web/static/src/legacy/scss/ui.scss', 'web/static/src/legacy/scss/mimetypes.scss', 'web/static/src/legacy/scss/modal.scss', - 'web/static/src/legacy/scss/animation.scss', - 'web/static/src/legacy/scss/colorpicker.scss', 'web/static/src/legacy/scss/popover.scss', 'web/static/src/legacy/scss/translation_dialog.scss', 'web/static/src/legacy/scss/keyboard.scss', @@ -282,7 +283,6 @@ This module provides the core of the Odoo Web Client. 'web/static/src/legacy/scss/web.zoomodoo.scss', 'web/static/src/legacy/scss/fontawesome_overridden.scss', - 'web/static/src/legacy/scss/base_frontend.scss', 'web/static/src/legacy/scss/lazyloader.scss', ('include', 'web.assets_frontend_minimal'), diff --git a/addons/web/static/src/legacy/scss/colorpicker.scss b/addons/web/static/src/core/colorpicker/colorpicker.scss similarity index 100% rename from addons/web/static/src/legacy/scss/colorpicker.scss rename to addons/web/static/src/core/colorpicker/colorpicker.scss diff --git a/addons/web/static/src/legacy/scss/ace.scss b/addons/web/static/src/scss/ace.scss similarity index 100% rename from addons/web/static/src/legacy/scss/ace.scss rename to addons/web/static/src/scss/ace.scss diff --git a/addons/web/static/src/legacy/scss/animation.scss b/addons/web/static/src/scss/animation.scss similarity index 100% rename from addons/web/static/src/legacy/scss/animation.scss rename to addons/web/static/src/scss/animation.scss diff --git a/addons/web/static/src/legacy/scss/base_document_layout.scss b/addons/web/static/src/scss/base_document_layout.scss similarity index 100% rename from addons/web/static/src/legacy/scss/base_document_layout.scss rename to addons/web/static/src/scss/base_document_layout.scss diff --git a/addons/web/static/src/legacy/scss/base_frontend.scss b/addons/web/static/src/scss/base_frontend.scss similarity index 100% rename from addons/web/static/src/legacy/scss/base_frontend.scss rename to addons/web/static/src/scss/base_frontend.scss diff --git a/addons/web/static/src/legacy/scss/attachment_preview.scss b/addons/web/static/src/views/fields/many2many_binary/many2many_binary_field.scss similarity index 100% rename from addons/web/static/src/legacy/scss/attachment_preview.scss rename to addons/web/static/src/views/fields/many2many_binary/many2many_binary_field.scss diff --git a/addons/website_slides/__manifest__.py b/addons/website_slides/__manifest__.py index 1f3ee34617c..e28b4e6858c 100644 --- a/addons/website_slides/__manifest__.py +++ b/addons/website_slides/__manifest__.py @@ -138,12 +138,12 @@ Featuring 'web/static/lib/select2/select2.css', 'web/static/lib/select2-bootstrap-css/select2-bootstrap.css', 'web/static/src/webclient/navbar/navbar.scss', + 'web/static/src/scss/animation.scss', + 'web/static/src/core/colorpicker/colorpicker.scss', 'web/static/src/legacy/scss/ui.scss', 'web/static/src/legacy/scss/mimetypes.scss', 'web/static/src/legacy/scss/modal.scss', - 'web/static/src/legacy/scss/animation.scss', 'web/static/src/legacy/scss/daterangepicker.scss', - 'web/static/src/legacy/scss/colorpicker.scss', 'web/static/src/legacy/scss/popover.scss', 'web/static/src/legacy/scss/translation_dialog.scss', 'web/static/src/legacy/scss/keyboard.scss',