From 18b0477006a215e900234d317da2cfa4c8dea9ee Mon Sep 17 00:00:00 2001 From: Benjamin Vray Date: Thu, 9 Dec 2021 08:59:31 +0000 Subject: [PATCH] [FIX] website, *: fix elements position in fullscreen or/and edit mode * = website_livechat Before this commit, some elements (e.g. sidebar, livechat button) were not correctly positioned in edit mode or/and full screen mode. task-2677132 X-original-commit: 42db4d432d39a8db87c66cd682064ab76fd0aa27 Part-of: odoo/odoo#81151 --- addons/website/static/src/scss/website.scss | 4 ++-- .../static/src/legacy/public_livechat.scss | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/addons/website/static/src/scss/website.scss b/addons/website/static/src/scss/website.scss index 91e2b089a6d..e04949fb3cf 100644 --- a/addons/website/static/src/scss/website.scss +++ b/addons/website/static/src/scss/website.scss @@ -1023,7 +1023,7 @@ header { } } - .o_connected_user:not(.editor_has_snippets) header & { + .o_connected_user:not(.editor_has_snippets):not(.o_fullscreen) header & { // TODO this has to be reviewed $-header-template: o-website-value('header-template'); @if not index(('Contact', 'boxed', 'magazine'), $-header-template) { @@ -1133,7 +1133,7 @@ header { } } } - body.o_connected_user { + body.o_connected_user:not(.o_fullscreen) { &:not(.editor_has_snippets) #wrapwrap > header { top: $o-navbar-height; } diff --git a/addons/website_livechat/static/src/legacy/public_livechat.scss b/addons/website_livechat/static/src/legacy/public_livechat.scss index 7f85aa80693..ab6870b1e16 100644 --- a/addons/website_livechat/static/src/legacy/public_livechat.scss +++ b/addons/website_livechat/static/src/legacy/public_livechat.scss @@ -1,4 +1,4 @@ -.editor_has_snippets { +.editor_has_snippets:not(.o_fullscreen) { .o_livechat_button, .o_thread_window { // TODO add this in an edit-mode only file in master (in 14.0 that asset // would be website.assets_wysiwyg...) @@ -6,6 +6,14 @@ } } +@if o-website-value('header-template') == 'sidebar' and $-hamburger-right { + @include media-breakpoint-up(lg) { + .o_livechat_button, .o_thread_window { + transform: translate(- o-website-value('sidebar-width')); + } + } +} + .o_website_livechat_button { display: flex; justify-content: center;