diff options
Diffstat (limited to 'addons/website/static/src')
| -rw-r--r-- | addons/website/static/src/js/menu/content.js | 4 | ||||
| -rw-r--r-- | addons/website/static/src/scss/website.scss | 16 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.backend.xml | 2 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.contentMenu.xml | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/addons/website/static/src/js/menu/content.js b/addons/website/static/src/js/menu/content.js index d9e634c729e..d051a62c46a 100644 --- a/addons/website/static/src/js/menu/content.js +++ b/addons/website/static/src/js/menu/content.js @@ -49,7 +49,7 @@ var PagePropertiesDialog = weWidgets.Dialog.extend({ buttons.push({ text: _t("Go To Page"), icon: 'fa-globe', - classes: 'btn-link pull-right', + classes: 'btn-link float-right', click: function (e) { window.location.href = '/' + self.page.url; }, @@ -58,7 +58,7 @@ var PagePropertiesDialog = weWidgets.Dialog.extend({ buttons.push({ text: _t("Delete Page"), icon: 'fa-trash', - classes: 'btn-link pull-right', + classes: 'btn-link float-right', click: function (e) { _deletePage.call(this, self.page_id, options.fromPageManagement); }, diff --git a/addons/website/static/src/scss/website.scss b/addons/website/static/src/scss/website.scss index 406b25e2e24..fa35b6dbc58 100644 --- a/addons/website/static/src/scss/website.scss +++ b/addons/website/static/src/scss/website.scss @@ -149,37 +149,37 @@ table.table_desc tr td { &.o_margin_s { margin-bottom: 4px; } - &.o_margin_s.pull-right { + &.o_margin_s.float-right { margin-left: 8px; } - &.o_margin_s.pull-left { + &.o_margin_s.float-left { margin-right: 8px; } &.o_margin_m { margin-bottom: 8px; } - &.o_margin_m.pull-right { + &.o_margin_m.float-right { margin-left: 12px; } - &.o_margin_m.pull-left { + &.o_margin_m.float-left { margin-right: 12px; } &.o_margin_l { margin-bottom: 12px; } - &.o_margin_l.pull-right { + &.o_margin_l.float-right { margin-left: 16px; } - &.o_margin_l.pull-left { + &.o_margin_l.float-left { margin-right: 16px; } &.o_margin_xl { margin-bottom: 24px; } - &.o_margin_xl.pull-right { + &.o_margin_xl.float-right { margin-left: 32px; } - &.o_margin_xl.pull-left { + &.o_margin_xl.float-left { margin-right: 32px; } } diff --git a/addons/website/static/src/xml/website.backend.xml b/addons/website/static/src/xml/website.backend.xml index cf53351c256..11afcaacd52 100644 --- a/addons/website/static/src/xml/website.backend.xml +++ b/addons/website/static/src/xml/website.backend.xml @@ -62,7 +62,7 @@ <t t-name="website.DateRangeButtons"> <!-- TODO: Hide in mobile as it is going to push in control panel and it breaks UI, maybe we will improve it in future --> - <div class="btn-group o_date_range_buttons d-none d-md-inline-flex pull-right"> + <div class="btn-group o_date_range_buttons d-none d-md-inline-flex float-right"> <button class="btn btn-secondary js_date_range active" data-date="week">Last Week</button> <button class="btn btn-secondary js_date_range" data-date="month">Last Month</button> <button class="btn btn-secondary js_date_range" data-date="year">Last Year</button> diff --git a/addons/website/static/src/xml/website.contentMenu.xml b/addons/website/static/src/xml/website.contentMenu.xml index 1fdfd31fe7c..abcd94d5764 100644 --- a/addons/website/static/src/xml/website.contentMenu.xml +++ b/addons/website/static/src/xml/website.contentMenu.xml @@ -10,7 +10,7 @@ <span class="js_menu_label"> <t t-esc="submenu.name"/> </span> - <i t-if="submenu.is_homepage" class="pull-right fa fa-home" style="margin-top: 3px" role="img" aria-label="Home" title="Home"/> + <i t-if="submenu.is_homepage" class="float-right fa fa-home" style="margin-top: 3px" role="img" aria-label="Home" title="Home"/> </span> <span class="input-group-append"> <button type="button" class="btn btn-primary js_edit_menu fa fa-pencil-square-o" aria-label="Edit menu" title="Edit menu"/> @@ -44,7 +44,7 @@ </t> </ul> <div class="mt32"> - <small class="pull-right text-muted"> + <small class="float-right text-muted"> Drag a menu to the right to create a sub-menu </small> <a href="#" class="js_add_menu"> |