From d1b74862fc6da50aec83ff4c019fcfa6fd91d4d8 Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Mon, 8 Mar 2021 10:57:11 +0100 Subject: [PATCH 01/12] Fix scroll on local toctree --- extensions/odoo_theme/static/style.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss index 65e18567b..9d6b27208 100644 --- a/extensions/odoo_theme/static/style.scss +++ b/extensions/odoo_theme/static/style.scss @@ -244,8 +244,10 @@ header.o_main_header{ top: $o-header-height; right: 0; width: $o-on-page-width; - height: calc(100% - #{$o-header-height}); + height: 100%; + max-height: calc(100vh - #{$o-header-height}); padding: 3rem 3rem 3rem 0; + overflow-y: auto; } h3 { From 401f4d5fef7f698709af46fa3ae42d62f95dc0cf Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Mon, 8 Mar 2021 10:57:59 +0100 Subject: [PATCH 02/12] [DESIGN] search results highlight color --- extensions/odoo_theme/static/style.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss index 9d6b27208..273f59eb4 100644 --- a/extensions/odoo_theme/static/style.scss +++ b/extensions/odoo_theme/static/style.scss @@ -514,7 +514,7 @@ header.o_main_header{ } */ // Search items highlighted dt:target, span.highlighted { - background-color: lighten($color-alpha, 50%); + background-color: lighten($warning, 15%); } section { From 95012afbb209349f6a1e8f66a7546bd16350d78c Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Mon, 8 Mar 2021 10:58:29 +0100 Subject: [PATCH 03/12] fix margin on version switcher --- extensions/odoo_theme/layout_templates/version_switcher.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/odoo_theme/layout_templates/version_switcher.html b/extensions/odoo_theme/layout_templates/version_switcher.html index c8799749b..1cdd79dcd 100644 --- a/extensions/odoo_theme/layout_templates/version_switcher.html +++ b/extensions/odoo_theme/layout_templates/version_switcher.html @@ -1,6 +1,6 @@
- +
{% include "layout_templates/searchbox.html" %} -
+
{#{% if alternate_languages %}#} {% include "layout_templates/language_switcher.html" %} {#{% endif %}#} diff --git a/extensions/odoo_theme/layout_templates/searchbox.html b/extensions/odoo_theme/layout_templates/searchbox.html index 27f0f459b..dda32524b 100644 --- a/extensions/odoo_theme/layout_templates/searchbox.html +++ b/extensions/odoo_theme/layout_templates/searchbox.html @@ -1,4 +1,4 @@ -