diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-01-28 13:58:11 +0000 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-01-28 13:58:11 +0000 |
| commit | cf52a04979d7634908c2f0d8eb6a83b7dd614f64 (patch) | |
| tree | 2f8c25f3fab45268400c4ac6addfa15f1f2d37f0 /addons/website/static/src | |
| parent | cd1f57e9ded2e8ca81d7290e4b5b95a8776045c6 (diff) | |
| parent | d3b8422c9c44557256836bdc0da5480f553eec4d (diff) | |
[MERGE] forward port branch saas-12.1 up to d3b8422c9c4
closes odoo/odoo#30614
Diffstat (limited to 'addons/website/static/src')
5 files changed, 7 insertions, 4 deletions
diff --git a/addons/website/static/src/js/menu/new_content.js b/addons/website/static/src/js/menu/new_content.js index 18e7e5a6904..d414bc8a800 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('website.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/bootstrap_overridden.scss b/addons/website/static/src/scss/bootstrap_overridden.scss index fbf776ae283..1dd53f6a7bf 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) !default; $headings-font-family: nth($o-theme-fonts, $o-theme-headings-font-number) !default; $headings-color: palette-color('h1') !default; + +// Jumbotron + +$jumbotron-bg: transparent !default; diff --git a/addons/website/static/src/scss/website.edit_mode.scss b/addons/website/static/src/scss/website.edit_mode.scss index de6f5d4c1a4..85ee8dc8fd4 100644 --- a/addons/website/static/src/scss/website.edit_mode.scss +++ b/addons/website/static/src/scss/website.edit_mode.scss @@ -176,8 +176,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/scss/website.scss b/addons/website/static/src/scss/website.scss index 3c506db48ac..71619d3aaa3 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, diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml index f636ad3d2dd..5b060389618 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> |