From ffb8823c1ff16ff9ac7b97eedbdc8038e32a9c6d Mon Sep 17 00:00:00 2001
From: luvi <luvi@odoo.com>
Date: Thu, 18 Aug 2022 12:12:28 +0000
Subject: [PATCH] [FIX] crm,*: fix styling issues in settings

*: point_of_sale, website

This commit fixes the style of the settings affected
by changes during the conversion to Owl.

Because of the new DOM of fields, some elements displayed
using the 'row' class were not horizontally aligned
because of the changes made to the DOM of the field that
were used. As the layout have changed, it was needed to
adapt and add new styling class in the template.

closes odoo/odoo#98387

Signed-off-by: Samuel Degueldre <sad@odoo.com>
---
 addons/crm/views/res_config_settings_views.xml           | 4 ++--
 addons/point_of_sale/views/res_config_settings_views.xml | 6 +++---
 addons/website/views/res_config_settings_views.xml       | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/crm/views/res_config_settings_views.xml b/addons/crm/views/res_config_settings_views.xml
index d0af2d8f18a..f35b0bb17a0 100644
--- a/addons/crm/views/res_config_settings_views.xml
+++ b/addons/crm/views/res_config_settings_views.xml
@@ -92,11 +92,11 @@
                                         specified otherwise.
                                     </span>
                                 </div>
-                                <div class="row mt16" attrs="{'invisible': [('crm_use_auto_assignment', '=', False)]}">
+                                <div class="row flex-row flex-nowrap mt16" attrs="{'invisible': [('crm_use_auto_assignment', '=', False)]}">
                                     <label string="Running" for="crm_auto_assignment_action" class="col-lg-3 o_light_label"/>
                                     <field name="crm_auto_assignment_action"
                                         attrs="{'required': [('crm_use_auto_assignment', '=', True)]}"/>
-                                    <button name="action_crm_assign_leads" type="object" class="btn-link">
+                                    <button name="action_crm_assign_leads" type="object" class="btn-link w-auto">
                                         <i title="Update now" role="img" aria-label="Update now" class="fa fa-fw fa-refresh"></i>
                                     </button>
                                 </div>
diff --git a/addons/point_of_sale/views/res_config_settings_views.xml b/addons/point_of_sale/views/res_config_settings_views.xml
index 971b72a85f3..769bdf2d9bf 100644
--- a/addons/point_of_sale/views/res_config_settings_views.xml
+++ b/addons/point_of_sale/views/res_config_settings_views.xml
@@ -22,10 +22,10 @@
                         <div class="col-xs-12 col-md-6 ms-0 o_setting_box">
                             <div class="o_setting_right_pane border-start-0 ms-0 ps-0">
                                 <div class="content-group">
-                                    <div class="row mt8">
-                                        <label class="col align-self-center ml8" string="Point of Sale" for="pos_config_id"/>
+                                    <div class="row flex-row flex-nowrap mt8 align-items-center">
+                                        <label class="col text-nowrap ml8 flex-nowrap" string="Point of Sale" for="pos_config_id"/>
                                         <field name="pos_config_id" options="{'no_open': True, 'no_create': True}" title="Settings on this page will apply to this point of sale."/>
-                                        <button name="action_pos_config_create_new" type="object" string="+ New Shop" class="col btn-link ms-2" style="line-height: 0.5;"/>
+                                        <button name="action_pos_config_create_new" type="object" string="+ New Shop" class="col btn-link ms-2 text-nowrap" style="line-height: 0.5;"/>
                                     </div>
                                 </div>
                             </div>
diff --git a/addons/website/views/res_config_settings_views.xml b/addons/website/views/res_config_settings_views.xml
index 674fcd8bb79..31863f4618b 100644
--- a/addons/website/views/res_config_settings_views.xml
+++ b/addons/website/views/res_config_settings_views.xml
@@ -26,10 +26,10 @@
                         <div class="col-xs-12 col-md-6 ms-0 o_setting_box">
                             <div class="o_setting_right_pane border-start-0 ms-0 ps-0">
                                 <div class="content-group">
-                                    <div class="row mt8">
-                                        <label class="col-lg-3 ps-0" string="Settings of Website" for="website_id"/>
+                                    <div class="row flex-row flex-nowrap mt8 align-items-center">
+                                        <label class="col ps-0 text-nowrap" string="Settings of Website" for="website_id"/>
                                         <field name="website_id" options="{'no_open': True, 'no_create': True}" title="Settings on this page will apply to this website"/>
-                                        <button name="action_website_create_new" type="object" string="+ New Website" class="col-auto btn-link ms-2" style="line-height: 0.5;"/>
+                                        <button name="action_website_create_new" type="object" string="+ New Website" class="col-auto btn-link ms-2 text-nowrap" style="line-height: 0.5;"/>
                                     </div>
                                 </div>
                             </div>