From 1954ef8de99b396348998f89a459a292bc4c17f9 Mon Sep 17 00:00:00 2001 From: "Robin Lejeune (role)" Date: Thu, 8 Jun 2023 09:09:25 +0000 Subject: [PATCH] [FIX] website: display TourPointer on configurator screen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since [1] where the CSS / classes of the TourPointer was completely redone, the pointer doesn't show up anymore in the default tip on the configurator waiting screen. This commit redisplays it as it appeared before. Since [2], the classes `o_theme_install_loader` and derivatives have been replaced. The commit thus also removes the file `website.theme_install.scss` which is not needed anymore. task-3358028 [1]: https://github.com/odoo/odoo/commit/3a79803 [2]: https://github.com/odoo/odoo/commit/1ff7f1e closes odoo/odoo#124634 X-original-commit: 1569edb57e2e5adb242945557d9a64fac46fda96 Signed-off-by: Dieleman Guillaume (gdi) --- addons/website/__manifest__.py | 1 - .../website_loader/website_loader.scss | 11 +++---- .../website_loader/website_loader.xml | 4 ++- .../src/scss/website.theme_install.scss | 31 ------------------- 4 files changed, 7 insertions(+), 40 deletions(-) delete mode 100644 addons/website/static/src/scss/website.theme_install.scss diff --git a/addons/website/__manifest__.py b/addons/website/__manifest__.py index 7042c2f8d18..63eddc2f513 100644 --- a/addons/website/__manifest__.py +++ b/addons/website/__manifest__.py @@ -171,7 +171,6 @@ 'website/static/src/scss/website.backend.scss', 'website/static/src/xml/website.backend.xml', 'website/static/src/scss/website_visitor_views.scss', - 'website/static/src/scss/website.theme_install.scss', 'website/static/src/js/backend/**/*', 'website/static/src/client_actions/*/*', ('remove', 'website/static/src/client_actions/website_preview/website_preview_test_mode.js'), diff --git a/addons/website/static/src/components/website_loader/website_loader.scss b/addons/website/static/src/components/website_loader/website_loader.scss index 92074abf437..f6aead4786a 100644 --- a/addons/website/static/src/components/website_loader/website_loader.scss +++ b/addons/website/static/src/components/website_loader/website_loader.scss @@ -23,17 +23,14 @@ .o_website_loader_tip { font-size: 0.5em; color: var(--website-loader-color); - + @include media-breakpoint-down(md) { width: 50% !important; } - .o_tooltip { - top: auto !important; - bottom: 11px !important; - left: 0 !important; - margin-right: 7px !important; - padding-left: 33px !important; + .o_tour_pointer { + --TourPointer__height: 1em; + --TourPointer__width: 1em; } } } diff --git a/addons/website/static/src/components/website_loader/website_loader.xml b/addons/website/static/src/components/website_loader/website_loader.xml index ded91941bfe..4a3d5939a10 100644 --- a/addons/website/static/src/components/website_loader/website_loader.xml +++ b/addons/website/static/src/components/website_loader/website_loader.xml @@ -9,7 +9,9 @@

TIP: Once loaded, follow the - + + +
pointer to build the perfect page in 7 steps.

diff --git a/addons/website/static/src/scss/website.theme_install.scss b/addons/website/static/src/scss/website.theme_install.scss deleted file mode 100644 index ea08b7703d6..00000000000 --- a/addons/website/static/src/scss/website.theme_install.scss +++ /dev/null @@ -1,31 +0,0 @@ -.o_theme_install_loader_container { - padding: 7%; - background-color: rgba($o-shadow-color, .9); - font-size: 37px; - font-family: "Montserrat", $font-family-sans-serif; - pointer-events: all; - justify-content: space-evenly; - // above menu bar - z-index: $zindex-modal - 1; - .o_tooltip { - top: auto !important; - bottom: 11px !important; - left: 0 !important; - margin-right: 7px !important; - padding-left: 33px !important; - } - .o_theme_install_loader_tip { - font-size: 0.5em; - @include media-breakpoint-down(lg) { - width: 50% !important; - } - } -} -.o_theme_install_loader { - display: inline-block; - width: 400px; - height: 220px; - background-image: url('/website/static/src/img/theme_loader.gif'); - background-size: cover; - border-radius: 6px; -}