diff --git a/addons/web_editor/__manifest__.py b/addons/web_editor/__manifest__.py index 319f10e6857757cc61a72885217ca4762ad848e0..efbbfc7f984bb940c87ff2ecf03fdb7314de2fa3 100644 --- a/addons/web_editor/__manifest__.py +++ b/addons/web_editor/__manifest__.py @@ -85,6 +85,7 @@ Odoo Web Editor widget. 'web_editor/static/src/js/wysiwyg/wysiwyg_iframe.js', ], 'web.assets_common': [ + 'web_editor/static/lib/odoo-editor/src/base_style.css', 'web_editor/static/lib/vkbeautify/**/*', 'web_editor/static/src/js/common/**/*', 'web_editor/static/lib/odoo-editor/src/utils/utils.js', diff --git a/addons/web_editor/static/lib/odoo-editor/demo/index.html b/addons/web_editor/static/lib/odoo-editor/demo/index.html index 45e7dca3d26c725ba8c12932080700e1abe03972..5a2e5a61199a7237fbf10fc6917a1a47b66469ca 100644 --- a/addons/web_editor/static/lib/odoo-editor/demo/index.html +++ b/addons/web_editor/static/lib/odoo-editor/demo/index.html @@ -14,6 +14,8 @@ <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ho+j7jyWK8fNQe+A12Hb8AhRq26LrZ/JpcUGGOn+Y7RsweNrtN/tE3MoK7ZeZDyx" crossorigin="anonymous"></script> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.1/css/all.min.css" integrity="sha512-+4zCK9k+qNFUR5X+cKL9EIR+ZOhtIloNl9GIKS57V1MyNsYpYcUrUeQc9vNfzsWfV28IaLL3i96P9sdNyeRssA==" crossorigin="anonymous"/> + <!-- Base style to be loaded without the editor --> + <link rel="stylesheet" href="../src/base_style.css"/> <!-- custom style --> <link rel="stylesheet" href="../src/style.css"/> <!-- Checklists are styled separately in Odoo --> diff --git a/addons/web_editor/static/lib/odoo-editor/src/base_style.css b/addons/web_editor/static/lib/odoo-editor/src/base_style.css new file mode 100644 index 0000000000000000000000000000000000000000..04cfa68c98ecf579ddf032dc856315f59aff2a37 --- /dev/null +++ b/addons/web_editor/static/lib/odoo-editor/src/base_style.css @@ -0,0 +1,3 @@ +li.oe-nested { + display: block; +} diff --git a/addons/web_editor/static/lib/odoo-editor/src/style.css b/addons/web_editor/static/lib/odoo-editor/src/style.css index 1ea8483abc482a67fa433a868930131a8b0786ff..b2bd6234ff990abff6dd6d74aaa47131546f7142 100644 --- a/addons/web_editor/static/lib/odoo-editor/src/style.css +++ b/addons/web_editor/static/lib/odoo-editor/src/style.css @@ -194,9 +194,6 @@ } /* Content styling */ -li.oe-nested { - display: block; -} .oe-commandbar-wrapper { position: absolute; z-index: 1051; diff --git a/addons/web_editor/static/lib/odoo-editor/test/editor-test.html b/addons/web_editor/static/lib/odoo-editor/test/editor-test.html index 1a63b04f083814cfb893c6823a90105bb5a464b3..2ee7f1b8e282431210ef07e9c60bb397a49731e7 100644 --- a/addons/web_editor/static/lib/odoo-editor/test/editor-test.html +++ b/addons/web_editor/static/lib/odoo-editor/test/editor-test.html @@ -7,6 +7,7 @@ <title>Odoo Editor tests</title> + <link rel="stylesheet" href="../src/base_style.css"/> <link rel="stylesheet" href="../src/checklist.css"/> <link rel="stylesheet" href="lib/mocha.css" /> <style type="text/css">