pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] website, web_editor: fix overlay options of the timeline snippet

Browse Source 
Before this commit, the CSS of the overlay option buttons of the
timeline snippet was broken.

task-2648348

closes odoo/odoo#78491

X-original-commit: 13770d650def3107378fe4010aac48dc85a5256a
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
This commit is contained in:
Benjamin Vray
2021-10-18 10:21:49 +00:00
parent 5201f0fa0b
commit 2e57d784d3
2 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_editor/static/src/scss/wysiwyg_snippets.scss
+13 -17
View File
@@ -2081,16 +2081,14 @@ body.editor_enable.editor_has_snippets {
&, > .o_overlay_move_options, .o_overlay_edit_options {
display: flex;
}
> .o_overlay_move_options, .o_overlay_edit_options {
> * {
@extend %we-generic-button;
margin: 0 1px 0;
min-width: 22px;
padding: 0 $o-we-sidebar-content-field-button-group-button-spacing * .5;
color: $o-we-fg-lighter;
&.oe_snippet_remove {
background-color: mix($o-we-color-danger, $o-we-sidebar-content-field-clickable-bg);
}
.o_overlay_move_options > *, .o_overlay_edit_options > *, > we-button {
@extend %we-generic-button;
margin: 0 1px 0;
min-width: 22px;
padding: 0 $o-we-sidebar-content-field-button-group-button-spacing * .5;
color: $o-we-fg-lighter;
&.oe_snippet_remove {
background-color: mix($o-we-color-danger, $o-we-sidebar-content-field-clickable-bg);
}
}
> .o_overlay_move_options > .o_move_handle {
@@ -2102,14 +2100,12 @@ body.editor_enable.editor_has_snippets {
background-repeat: no-repeat;
}
&:hover {
> .o_overlay_move_options, .o_overlay_edit_options {
> * {
@include o-hover-opacity(.6);
.o_overlay_move_options > *, .o_overlay_edit_options > *, > we-button {
@include o-hover-opacity(.6);
&:hover {
border-color: mix($o-we-handles-accent-color, $o-we-sidebar-content-field-pressed-bg, .4);
background-color: $o-we-sidebar-content-field-pressed-bg;
}
&:hover {
border-color: mix($o-we-handles-accent-color, $o-we-sidebar-content-field-pressed-bg, .4);
background-color: $o-we-sidebar-content-field-pressed-bg;
}
}
}
addons/website/static/src/snippets/s_timeline/options.js
+1 -1
View File
@@ -12,7 +12,7 @@ options.registry.Timeline = options.Class.extend({
start: function () {
var $buttons = this.$el.find('we-button.o_we_overlay_opt');
var $overlayArea = this.$overlay.find('.o_overlay_options_wrap');
$overlayArea.append($('<div/>').append($buttons));
$overlayArea.append($buttons);
return this._super(...arguments);
},