From f37e92a0baf86c2aed18aa67ca20ebb8bc627989 Mon Sep 17 00:00:00 2001 From: "stefanorigano (SRI)" Date: Mon, 12 Sep 2022 13:41:07 +0000 Subject: [PATCH] [MOV] web_editor: move floating toolbar variables in a dedicated file Commit preparatory to the introduction of dark-mode. task-2710677 Part-of: odoo/odoo#102868 --- addons/web_editor/__manifest__.py | 1 + addons/web_editor/static/src/scss/wysiwyg.scss | 13 ------------- .../static/src/scss/wysiwyg.variables.scss | 12 ++++++++++++ 3 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 addons/web_editor/static/src/scss/wysiwyg.variables.scss diff --git a/addons/web_editor/__manifest__.py b/addons/web_editor/__manifest__.py index f59d5bf2720..1170461d8cc 100644 --- a/addons/web_editor/__manifest__.py +++ b/addons/web_editor/__manifest__.py @@ -139,6 +139,7 @@ Odoo Web Editor widget. 'web._assets_primary_variables': [ 'web_editor/static/src/scss/web_editor.variables.scss', + 'web_editor/static/src/scss/wysiwyg.variables.scss', ], 'web._assets_secondary_variables': [ 'web_editor/static/src/scss/secondary_variables.scss', diff --git a/addons/web_editor/static/src/scss/wysiwyg.scss b/addons/web_editor/static/src/scss/wysiwyg.scss index 6fed08806a6..76ef597c6a5 100644 --- a/addons/web_editor/static/src/scss/wysiwyg.scss +++ b/addons/web_editor/static/src/scss/wysiwyg.scss @@ -1,19 +1,6 @@ $o-we-overlay-zindex: ($zindex-fixed + $zindex-modal-backdrop) / 2 !default; $o-we-zindex: $o-we-overlay-zindex + 1 !default; -// Floating Toolbar Variables -$o-we-toolbar-entries-gap: $o-we-sidebar-content-field-control-item-spacing * .7; -$o-we-toolbar-entries-border-width: 1px; -$o-we-toolbar-entries-padding: $o-we-sidebar-content-padding-base * .7; - -$o-we-toolbar-bg: #FFF; -$o-we-toolbar-bg-active: rgba($o-we-fg-light, .2); -$o-we-toolbar-border: $o-we-fg-light; -$o-we-toolbar-color-text: $o-we-bg-light; -$o-we-toolbar-color-accent: #018597; -$o-we-toolbar-color-clickable: $o-we-bg-lightest; -$o-we-toolbar-color-clickable-active: $o-we-bg-darkest; - // Use css variables to control the default style of the editor so that an // external assets bundle can influence it without duplicating the css. :root { diff --git a/addons/web_editor/static/src/scss/wysiwyg.variables.scss b/addons/web_editor/static/src/scss/wysiwyg.variables.scss new file mode 100644 index 00000000000..c3265aad940 --- /dev/null +++ b/addons/web_editor/static/src/scss/wysiwyg.variables.scss @@ -0,0 +1,12 @@ +// Floating Toolbar Variables +$o-we-toolbar-entries-gap: $o-we-sidebar-content-field-control-item-spacing * .7 !default; +$o-we-toolbar-entries-border-width: 1px !default; +$o-we-toolbar-entries-padding: $o-we-sidebar-content-padding-base * .7 !default; + +$o-we-toolbar-bg: #FFF !default; +$o-we-toolbar-bg-active: rgba($o-we-fg-light, .2) !default; +$o-we-toolbar-border: $o-we-fg-light !default; +$o-we-toolbar-color-text: $o-we-bg-light !default; +$o-we-toolbar-color-accent: #018597 !default; +$o-we-toolbar-color-clickable: $o-we-bg-lightest !default; +$o-we-toolbar-color-clickable-active: $o-we-bg-darkest !default;