From 329b0522a78bef233bb95eb904908cd1ac938dbf Mon Sep 17 00:00:00 2001
From: Benoit Socias <bso@odoo.com>
Date: Mon, 3 Oct 2022 07:55:43 +0000
Subject: [PATCH] [FIX] website: restore padding editability of discrete
 cookies bar

In [1] the padding of the discrete cookies bar template was moved from
the column to the row.
This prevents editing the padding per column using the website editor.

This commit moves this padding back onto the columns and wraps the text
inside a paragraph so that it does not get closer to the bottom border
of the screen.

[1]: https://github.com/odoo/odoo/commit/2ca91a90d0aa61405547349d5cd366179bc3f419

task-2800976

X-original-commit: c50e2adf592a336d1f991e9a461eeeb21a2a64f0
Part-of: odoo/odoo#102380
---
 .../website/static/src/xml/website.cookies_bar.xml   | 12 +++++++-----
 addons/website/views/website_templates.xml           | 12 +++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/addons/website/static/src/xml/website.cookies_bar.xml b/addons/website/static/src/xml/website.cookies_bar.xml
index 703cc85af33..ed89cf53a8b 100644
--- a/addons/website/static/src/xml/website.cookies_bar.xml
+++ b/addons/website/static/src/xml/website.cookies_bar.xml
@@ -28,12 +28,14 @@
              backend `website.cookies_bar` template -->
         <section class="o_colored_level o_cc o_cc1">
             <div class="container">
-                <div class="row pt16 pb16">
-                    <div class="col-lg-8">
-                        <span class="pe-1">We use cookies to provide you a better user experience on this website.</span>
-                        <a href="/cookie-policy" class="o_cookies_bar_text_policy btn btn-link btn-sm px-0">Cookie Policy</a>
+                <div class="row">
+                    <div class="col-lg-8 pt16">
+                        <p>
+                            <span class="pe-1">We use cookies to provide you a better user experience on this website.</span>
+                            <a href="/cookie-policy" class="o_cookies_bar_text_policy btn btn-link btn-sm px-0">Cookie Policy</a>
+                        </p>
                     </div>
-                    <div class="col-lg-4 text-end">
+                    <div class="col-lg-4 text-end pt16 pb16">
                         <a href="#" id="cookies-consent-essential" role="button"
                            class="js_close_popup btn btn-outline-primary rounded-circle btn-sm px-2">Only essentials</a>
                         <a href="#" id="cookies-consent-all" role="button"
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 4c57bd412ba..8ff06c7f7d3 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -1897,12 +1897,14 @@
                         <!-- Keep this section equivalent to the rendering of the `website.cookies_bar.discrete` client template -->
                         <section class="o_colored_level o_cc o_cc1">
                             <div class="container">
-                                <div class="row pt16 pb16">
-                                    <div class="col-lg-8">
-                                        <span class="pe-1">We use cookies to provide you a better user experience on this website.</span>
-                                        <a href="/cookie-policy" class="o_cookies_bar_text_policy btn btn-link btn-sm px-0">Cookie Policy</a>
+                                <div class="row">
+                                    <div class="col-lg-8 pt16">
+                                        <p>
+                                            <span class="pe-1">We use cookies to provide you a better user experience on this website.</span>
+                                            <a href="/cookie-policy" class="o_cookies_bar_text_policy btn btn-link btn-sm px-0">Cookie Policy</a>
+                                        </p>
                                     </div>
-                                    <div class="col-lg-4 text-end">
+                                    <div class="col-lg-4 text-end pt16 pb16">
                                         <a href="#" id="cookies-consent-essential" role="button"
                                            class="js_close_popup btn btn-outline-primary rounded-circle btn-sm px-2">Only essentials</a>
                                         <a href="#" id="cookies-consent-all" role="button"