diff options
| author | qsm-odoo <qsm@odoo.com> | 2018-05-25 17:00:00 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2018-07-27 12:36:54 +0200 |
| commit | d48b8593dde7c6adf679359e2dd64dee288e9544 (patch) | |
| tree | d26e7a77bfd33c66157531918f066377270ef1fb /addons/website | |
| parent | 54aee4626bd2486ff86df490e4d2350f5702f898 (diff) | |
[REF] *: BS4, 'pull-left/right' -> 'float-left/right'
Diffstat (limited to 'addons/website')
| -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 | ||||
| -rw-r--r-- | addons/website/views/res_config_settings_views.xml | 2 | ||||
| -rw-r--r-- | addons/website/views/snippets.xml | 22 | ||||
| -rw-r--r-- | addons/website/views/website_navbar_templates.xml | 2 | ||||
| -rw-r--r-- | addons/website/views/website_templates.xml | 10 |
8 files changed, 31 insertions, 31 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"> diff --git a/addons/website/views/res_config_settings_views.xml b/addons/website/views/res_config_settings_views.xml index 994475b6111..98ce013e813 100644 --- a/addons/website/views/res_config_settings_views.xml +++ b/addons/website/views/res_config_settings_views.xml @@ -26,7 +26,7 @@ </div> <div class="row"> <label class="col-lg-3 o_light_label" for="favicon" /> - <field name="favicon" widget="image" class="pull-left oe_avatar"/> + <field name="favicon" widget="image" class="float-left oe_avatar"/> </div> </div> </div> diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml index 616237db330..6fb0a8d21b6 100644 --- a/addons/website/views/snippets.xml +++ b/addons/website/views/snippets.xml @@ -57,7 +57,7 @@ </p> </div> <div class="col-lg-6"> - <img class="img img-fluid pull-left mb16" src="/web/image/website.s_text_image_default_image" alt="Odoo text and image block"/> + <img class="img img-fluid float-left mb16" src="/web/image/website.s_text_image_default_image" alt="Odoo text and image block"/> </div> </div> </div> @@ -260,7 +260,7 @@ </template> <template id="s_image_floating" name="Image Floating"> - <div class="o_image_floating o_margin_l pull-right s_image_floating"> + <div class="o_image_floating o_margin_l float-right s_image_floating"> <div class="o_container"> <img class="img rounded img-fluid" src="/web/image/website.s_image_floating_default_image" alt="Odoo CMS- Sample image floating"/> </div> @@ -465,7 +465,7 @@ </p> </div> <div class="col-lg-3"> - <a role="button" href="/contactus" class="btn btn-primary btn-lg pull-right mt8" aria-label="Contact Us Now" title=""> + <a role="button" href="/contactus" class="btn btn-primary btn-lg float-right mt8" aria-label="Contact Us Now" title=""> <span>Contact Us Now</span> <i class="fa fa-chevron-right"></i> </a> @@ -565,17 +565,17 @@ <h5 class="text-muted">Add a great slogan</h5> </div> <div class="col-lg-12"> - <span style="min-width: 45px" class="fa fa-2x fa-comment pull-left mb16" role="img" aria-label="Change icons" title="Change icons"></span> + <span style="min-width: 45px" class="fa fa-2x fa-comment float-left mb16" role="img" aria-label="Change icons" title="Change icons"></span> <h4 class="mt0 mb0">Change Icons</h4> <p>Click on the icon to adapt it to your feature</p><br/> </div> <div class="col-lg-12"> - <span style="min-width: 45px" class="fa fa-2x fa-columns pull-left mb16" role="img" aria-label="Duplicate" title="Duplicate"></span> + <span style="min-width: 45px" class="fa fa-2x fa-columns float-left mb16" role="img" aria-label="Duplicate" title="Duplicate"></span> <h4 class="mt0 mb0">Duplicate</h4> <p>Duplicate blocks to add more features.</p><br/> </div> <div class="col-lg-12"> - <span style="min-width: 45px" class="fa fa-2x fa-user pull-left mb16" role="img" aria-label="Delete blocks" title="Delete blocks"></span> + <span style="min-width: 45px" class="fa fa-2x fa-user float-left mb16" role="img" aria-label="Delete blocks" title="Delete blocks"></span> <h4 class="mt0 mb0">Delete Blocks</h4> <p>Select and delete blocks to remove some features.</p><br/> </div> @@ -588,17 +588,17 @@ <h5 class="text-muted">Add a great slogan</h5> </div> <div class="col-lg-12"> - <span style="min-width: 45px" class="fa fa-2x fa-magic pull-left mb16" role="img" aria-label="Great value" title="Great value"></span> + <span style="min-width: 45px" class="fa fa-2x fa-magic float-left mb16" role="img" aria-label="Great value" title="Great value"></span> <h4 class="mt0 mb0">Great Value</h4> <p>Tell features the visitor would like to know, not what you'd like to say.</p> </div> <div class="col-lg-12"> - <span style="min-width: 45px" class="fa fa-2x fa-bolt pull-left mb16" role="img" aria-label="Change background" title="Change background"></span> + <span style="min-width: 45px" class="fa fa-2x fa-bolt float-left mb16" role="img" aria-label="Change background" title="Change background"></span> <h4 class="mt0 mb0">Change Background</h4> <p>From the main container, you can change the background to highlight features.</p> </div> <div class="col-lg-12"> - <span style="min-width: 45px" class="fa fa-2x fa-picture-o pull-left mb16" role="img" aria-label="Sample images" title="Change background"></span> + <span style="min-width: 45px" class="fa fa-2x fa-picture-o float-left mb16" role="img" aria-label="Sample images" title="Change background"></span> <h4 class="mt0 mb0">Sample images</h4> <p>All these icons are licensed under creative commons so that you can use them.</p> </div> @@ -924,8 +924,8 @@ <div class="dropdown-submenu"> <a tabindex="-2" href="#" class="dropdown-item"><i class="fa fa-magnet"/>Float</a> <div class="dropdown-menu" role="menu" data-no-preview="true"> - <a href="#" class="dropdown-item" role="menuitem" data-select-class="pull-left">Left</a> - <a href="#" class="dropdown-item" role="menuitem" data-select-class="pull-right">Right</a> + <a href="#" class="dropdown-item" role="menuitem" data-select-class="float-left">Left</a> + <a href="#" class="dropdown-item" role="menuitem" data-select-class="float-right">Right</a> </div> </div> </div> diff --git a/addons/website/views/website_navbar_templates.xml b/addons/website/views/website_navbar_templates.xml index a96dcecf68f..c1b9e273427 100644 --- a/addons/website/views/website_navbar_templates.xml +++ b/addons/website/views/website_navbar_templates.xml @@ -32,7 +32,7 @@ </li> </ul> - <button type="button" class="fa fa-bars pull-right d-block d-md-none o_mobile_menu_toggle" aria-label="Menu" title="Menu"/> + <button type="button" class="fa fa-bars float-right d-block d-md-none o_mobile_menu_toggle" aria-label="Menu" title="Menu"/> <ul class="o_menu_sections" groups="website.group_website_designer"> <!-- Content --> diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 375188134ea..0ab90d44014 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -344,7 +344,7 @@ <!-- Util template --> <template id="publish_management"> - <div groups="website.group_website_publisher" t-ignore="true" class="pull-right css_editable_mode_hidden" t-att-style="style or None"> + <div groups="website.group_website_publisher" t-ignore="true" class="float-right css_editable_mode_hidden" t-att-style="style or None"> <div t-attf-class="btn-group #{btn_class} js_publish_management #{object.website_published and 'css_published' or 'css_unpublished'}" t-att-data-id="object.id" t-att-data-object="object._name" t-att-data-controller="publish_controller"> <button class="btn btn-danger js_publish_btn">Unpublished</button> <button class="btn btn-success js_publish_btn">Published</button> @@ -360,7 +360,7 @@ <template id="publish_short"> <t groups="website.group_website_publisher" t-ignore="true"> - <div t-attf-class="pull-right js_publish_management #{object.website_published and 'css_published' or 'css_unpublished'}" t-att-data-id="object.id" t-att-data-object="object._name" t-att-data-controller="publish_controller"> + <div t-attf-class="float-right js_publish_management #{object.website_published and 'css_published' or 'css_unpublished'}" t-att-data-id="object.id" t-att-data-object="object._name" t-att-data-controller="publish_controller"> <button class="btn btn-danger js_publish_btn">Unpublished</button> <button class="btn btn-success js_publish_btn">Published</button> </div> @@ -855,7 +855,7 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml <template id="index_management"> <t groups="website.group_website_publisher" t-ignore="true"> - <div t-attf-class="pull-right js_index_management #{object.website_indexed and 'css_published' or 'css_unpublished'}" t-att-data-id="object.id" t-att-data-object="object._name"> + <div t-attf-class="float-right js_index_management #{object.website_indexed and 'css_published' or 'css_unpublished'}" t-att-data-id="object.id" t-att-data-object="object._name"> <button class="btn btn-danger js_index_btn">Unindexed</button> <button class="btn btn-success js_index_btn">Indexed</button> </div> @@ -866,10 +866,10 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml <t t-call="website.layout"> <div id="wrap"> <div class="container" id="edit_website_pages"> - <form class="mt8 pull-right" role="search" t-attf-action="/website/pages" method="get"> + <form class="mt8 float-right" role="search" t-attf-action="/website/pages" method="get"> <t t-call="website.website_search_box"/> </form> - <div t-if="searchbar_sortings" class="dropdown pull-right mt8 mr8"> + <div t-if="searchbar_sortings" class="dropdown float-right mt8 mr8"> <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown"> <span class="fa fa-sort fa-lg" role="img" aria-label="Sort" title="Sort"/> <span class="d-none d-xl-inline" t-esc="searchbar_sortings[sortby].get('label', 'Newest')"/> |
