From 94cf6128df38fe566693a2ca5b2fe7a7ce5ce14d Mon Sep 17 00:00:00 2001
From: Ivan Yelizariev <iel@odoo.com>
Date: Fri, 3 Mar 2023 11:26:12 +0000
Subject: [PATCH] [FIX] *: fix css issue with labels in Settings page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Settings page lacks a space between some labels and corresponding selection
input. Example: label *Digest Email* and default value *Your Odoo Periodic
Digest*.

Fix it by adding margin via mr8 class

Code analysis
=============

v15 has margin:
https://github.com/odoo/odoo/blob/eee0a77619b0cef70272b24f6ff663210e94eb1e/addons/web/static/src/legacy/scss/form_view.scss#L673

while v16 doesn't have it
https://github.com/odoo/odoo/blob/3ee5d7a0fbccae5f742e1aba8d3d24f8bab3cbdd/addons/web/static/src/views/form/form_controller.scss#L605

v16 was refactored first https://github.com/odoo/odoo/commit/8fa6e923d0fc8695d92e0b114e230d3abab7d9bc

- margin: 0 $o-form-spacing-unit 0 0;
+ margin-right: $o-form-spacing-unit;

but then it was completely removed
https://github.com/odoo/odoo/commit/fb629dc91df1720cb0658d3e9f946a4fda83fbd0

opw-3115232

closes odoo/odoo#117187

X-original-commit: b87e214e7b6ea23aa187f87f922ef8f077393e9a
Related: odoo/enterprise#39054
Signed-off-by: Adrien Dieudonné (adr) <adr@odoo.com>
Signed-off-by: Ivan Elizaryev (iel) <iel@odoo.com>
---
 addons/digest/views/res_config_settings_views.xml             | 2 +-
 addons/sale_management/views/res_config_settings_views.xml    | 2 +-
 addons/stock_landed_costs/views/res_config_settings_views.xml | 2 +-
 addons/web_unsplash/views/res_config_settings_view.xml        | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/digest/views/res_config_settings_views.xml b/addons/digest/views/res_config_settings_views.xml
index b8b7c8e460c..1a3afbf7068 100644
--- a/addons/digest/views/res_config_settings_views.xml
+++ b/addons/digest/views/res_config_settings_views.xml
@@ -12,7 +12,7 @@
                             <field name="digest_emails"/>
                             <div class="content-group" attrs="{'invisible': [('digest_emails','=',False)]}">
                                 <div class="mt16">
-                                    <label for="digest_id" class="o_light_label"/>
+                                    <label for="digest_id" class="o_light_label mr8"/>
                                     <field name="digest_id" class="oe_inline"/>
                                 </div>
                                 <div class="mt8">
diff --git a/addons/sale_management/views/res_config_settings_views.xml b/addons/sale_management/views/res_config_settings_views.xml
index 6f2266feafb..bf8bbe8607d 100644
--- a/addons/sale_management/views/res_config_settings_views.xml
+++ b/addons/sale_management/views/res_config_settings_views.xml
@@ -11,7 +11,7 @@
                     <field name="group_sale_order_template"/>
                     <div class="content-group" attrs="{'invisible': [('group_sale_order_template', '=', False)]}">
                         <div class="mt16">
-                            <label for="company_so_template_id" class="o_light_label"/>
+                            <label for="company_so_template_id" class="o_light_label mr8"/>
                             <field name="company_so_template_id" class="oe_inline"/>
                             <span class="fa fa-lg fa-building-o p-2"
                                title="Values set here are company-specific."
diff --git a/addons/stock_landed_costs/views/res_config_settings_views.xml b/addons/stock_landed_costs/views/res_config_settings_views.xml
index 6b591823881..0f359b6996a 100644
--- a/addons/stock_landed_costs/views/res_config_settings_views.xml
+++ b/addons/stock_landed_costs/views/res_config_settings_views.xml
@@ -9,7 +9,7 @@
             <div name="landed_cost_info" position="replace">
                 <div class="content-group" attrs="{'invisible': [('module_stock_landed_costs', '=', False)]}">
                     <div class="mt16">
-                        <label for="lc_journal_id" string="Default Journal"/>
+                        <label for="lc_journal_id" class="mr8" string="Default Journal"/>
                         <field name="lc_journal_id"/>
                     </div>
                 </div>
diff --git a/addons/web_unsplash/views/res_config_settings_view.xml b/addons/web_unsplash/views/res_config_settings_view.xml
index fa289da726c..5ed5527075e 100644
--- a/addons/web_unsplash/views/res_config_settings_view.xml
+++ b/addons/web_unsplash/views/res_config_settings_view.xml
@@ -8,11 +8,11 @@
             <div id="web_unsplash_warning" position="replace">
                 <div attrs="{'invisible': [('module_web_unsplash', '=', False)]}">
                     <div class="content-group mt16">
-                        <label for="unsplash_access_key" class="o_light_label"/>
+                        <label for="unsplash_access_key" class="o_light_label mr8"/>
                         <field name="unsplash_access_key"/>
                     </div>
                     <div class="content-group">
-                        <label for="unsplash_app_id" class="o_light_label"/>
+                        <label for="unsplash_app_id" class="o_light_label mr8"/>
                         <field name="unsplash_app_id"/>
                     </div>
                     <div>