From cd1d9824abda24d05f7f975d3bb714c551f6ab1b Mon Sep 17 00:00:00 2001
From: Anshuman Sharma <ans@odoo.com>
Date: Tue, 11 Dec 2018 05:49:20 +0000
Subject: [FIX] website: solve alignment bugs in onboarding

- Fix the position of 'Add to menu' toggle button in new page dialog
- Properly align tip icon in the welcome message

task-1895287

closes odoo/odoo#29403
---
 addons/website/static/src/js/menu/new_content.js      | 2 +-
 addons/website/static/src/scss/website.edit_mode.scss | 2 --
 addons/website/static/src/xml/website.editor.xml      | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'addons/website/static/src')

diff --git a/addons/website/static/src/js/menu/new_content.js b/addons/website/static/src/js/menu/new_content.js
index 490e4f75516..2b4d1177a08 100644
--- a/addons/website/static/src/js/menu/new_content.js
+++ b/addons/website/static/src/js/menu/new_content.js
@@ -81,7 +81,7 @@ var NewContentMenu = websiteNavbarData.WebsiteNavbarActionWidget.extend({
                 var $group = this.$dialog.find('div.form-group');
                 $group.removeClass('mb0');
 
-                var $add = $('<div/>', {'class': 'form-group mb0'})
+                var $add = $('<div/>', {'class': 'form-group mb0 row'})
                             .append($('<span/>', {'class': 'offset-md-3 col-md-9 text-left'})
                                     .append(qweb.render('web_editor.components.switch', {id: 'switch_addTo_menu', label: _t("Add to menu")})));
                 $add.find('input').prop('checked', true);
diff --git a/addons/website/static/src/scss/website.edit_mode.scss b/addons/website/static/src/scss/website.edit_mode.scss
index 681156835ab..5419be8f539 100644
--- a/addons/website/static/src/scss/website.edit_mode.scss
+++ b/addons/website/static/src/scss/website.edit_mode.scss
@@ -180,8 +180,6 @@
     font-family: Roboto, $font-family-sans-serif;
 
     .o_tooltip_container {
-        display: inline-flex;
-        align-items: center;
         transition: opacity 1s linear;
 
         > .o_tooltip {
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index b3f823314f9..3adf02fcc68 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -3,7 +3,7 @@
     <div t-name="website.homepage_editor_welcome_message" class="container text-center o_homepage_editor_welcome_message">
         <h2 class="mt0">Welcome to your <b>Homepage</b>!</h2>
         <p class="lead d-none d-md-block">Let's start designing.</p>
-        <div class="o_tooltip_container d-none d-md-block fade">Follow all the <div class="o_tooltip bottom"/> signs to get your website ready in no time.</div>
+        <div class="o_tooltip_container d-none d-md-inline-flex fade">Follow all the <div class="o_tooltip bottom"/> signs to get your website ready in no time.</div>
     </div>
     <div t-name="website.leaving_current_page_edition">
         <p>What do you want to do?</p>
-- 
cgit v1.2.3


From 07e1a24368fcd968d1a569df547829ec7309c506 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Thu, 10 Jan 2019 12:33:30 +0000
Subject: [FIX] website: allow to remove jumbotron bg color

In the 'banner' snippet, there is a column using a white jumbotron
component. Those comes with a default background color so when using the
website builder to remove the white background, it did not go away;
it was replaced with the default background color (some gray).

This commit sets the default background color of jumbotron components to
'transparent'.

task-1889341

closes odoo/odoo#30099
---
 addons/website/static/src/scss/bootstrap_overridden.scss | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'addons/website/static/src')

diff --git a/addons/website/static/src/scss/bootstrap_overridden.scss b/addons/website/static/src/scss/bootstrap_overridden.scss
index 4dc818b7eea..7424587df13 100644
--- a/addons/website/static/src/scss/bootstrap_overridden.scss
+++ b/addons/website/static/src/scss/bootstrap_overridden.scss
@@ -29,3 +29,7 @@ $font-family-sans-serif: nth($o-theme-fonts, $o-theme-font-number);
 
 $headings-font-family: nth($o-theme-fonts, $o-theme-headings-font-number);
 $headings-color: color('h1');
+
+// Jumbotron
+
+$jumbotron-bg: transparent !default;
-- 
cgit v1.2.3


From fccef8d19180904906539186bccbed7fc074d04f Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Wed, 23 Jan 2019 16:25:19 +0000
Subject: [FIX] web,website: use correct variable to define h* size + force fa
 font

if you have some style e.g. on btn, and use class="fa fa-bug btn btn-sm" the
icon will be rendered with font-family style of btn
---
 addons/website/static/src/scss/website.scss | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/website/static/src')

diff --git a/addons/website/static/src/scss/website.scss b/addons/website/static/src/scss/website.scss
index e1c7bff9750..d55266cb77f 100644
--- a/addons/website/static/src/scss/website.scss
+++ b/addons/website/static/src/scss/website.scss
@@ -104,6 +104,7 @@ font[class*='bg-'] {
 
 // Icons
 .fa {
+    font-family: "FontAwesome" !important;
     $size: 3rem;
 
     &.rounded-circle,
-- 
cgit v1.2.3