From e95ff9c5eda1679c380b19f65f9a04edf5c59aad Mon Sep 17 00:00:00 2001 From: Jonathan Castillo Date: Tue, 8 Jun 2021 12:26:27 +0200 Subject: [PATCH 1/3] [FIX] general: redirection for "export-data" --- redirects.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redirects.txt b/redirects.txt index 536f45d2e..c173efd65 100644 --- a/redirects.txt +++ b/redirects.txt @@ -207,7 +207,7 @@ applications/general/unsplash/unsplash_access_key.rst applications/general/unspl applications/general/unsplash/unsplash_application_id.rst applications/general/unsplash.rst # unsplash/unsplash_application_id -> unsplash applications/general/base_import/import_faq.rst applications/general/export_import_data.rst # base_import/import_faq -> odoo_basics/import_data applications/general/base_import/adapt_template.rst applications/general/export_import_data.rst # base_import/adapt_template -> odoo_basics/import_data -content/applications/general/odoo_basics/export-data.rst applications/general/export_import_data.rst # odoo_basics/export-data -> export_import_data +applications/general/odoo_basics/export-data.rst applications/general/export_import_data.rst # odoo_basics/export-data -> export_import_data applications/settings/users_and_features.rst applications/general.rst # settings/users_and_features -> general applications/general/mobile.rst applications/general.rst # general/mobile -> general applications/general/developer_mode/activate.rst applications/general.rst # developer_mode/activate -> general From c8750ae032f73d435e00d13a50dd96de95fe3866 Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Wed, 9 Jun 2021 11:22:58 +0200 Subject: [PATCH 2/3] [FIX] odoo_theme: fix header display on small screen widths The highlight-link was pushing the header height to be on two lines. It is now absolutely positioned below the searchbar instead of to its right. The switchers now push themselves to the right instead of being pushed by the searchbar-wrapper. --- .../odoo_theme/layout_templates/header.html | 2 +- .../layout_templates/searchbox.html | 2 +- .../layout_templates/version_switcher.html | 2 +- extensions/odoo_theme/static/style.scss | 22 ++++++++----------- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/extensions/odoo_theme/layout_templates/header.html b/extensions/odoo_theme/layout_templates/header.html index 7922bba2a..ff2cad8fd 100644 --- a/extensions/odoo_theme/layout_templates/header.html +++ b/extensions/odoo_theme/layout_templates/header.html @@ -5,7 +5,7 @@ {%- include "layout_templates/searchbox.html" %} -
+
{%- include "layout_templates/language_switcher.html" %} {%- include "layout_templates/version_switcher.html" %} Try Odoo for FREE diff --git a/extensions/odoo_theme/layout_templates/searchbox.html b/extensions/odoo_theme/layout_templates/searchbox.html index 22c7b5f90..8d3189f96 100644 --- a/extensions/odoo_theme/layout_templates/searchbox.html +++ b/extensions/odoo_theme/layout_templates/searchbox.html @@ -1,5 +1,5 @@ {# NOTE: the 'searchbox' id is used to hook the "Hide Search Matches" button #} -