diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-01-18 14:26:33 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-01-18 14:26:33 +0100 |
| commit | a337b9ec92943017089ff24ea35ca592557121aa (patch) | |
| tree | d8b111991257d17aa7d9325ef15bf11730b988e6 /addons/website/static/src | |
| parent | f8e37d6a808a302cda973bc0c6f2b275355ef74c (diff) | |
| parent | f854e01a983334e214357b4e05083b9a96a61be7 (diff) | |
[MERGE] forward port branch 12.0 up to f854e01a983
Diffstat (limited to 'addons/website/static/src')
| -rw-r--r-- | addons/website/static/src/js/menu/new_content.js | 2 | ||||
| -rw-r--r-- | addons/website/static/src/scss/website.edit_mode.scss | 2 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.editor.xml | 2 |
3 files changed, 2 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 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 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/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml index 5018d28d1d9..292f624e403 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> |