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 | |
| parent | 54aee4626bd2486ff86df490e4d2350f5702f898 (diff) | |
[REF] *: BS4, 'pull-left/right' -> 'float-left/right'
Diffstat (limited to 'addons')
146 files changed, 419 insertions, 419 deletions
diff --git a/addons/account/static/src/xml/account_dashboard_setup_bar.xml b/addons/account/static/src/xml/account_dashboard_setup_bar.xml index bedbb4f2e35..a3e8600b894 100644 --- a/addons/account/static/src/xml/account_dashboard_setup_bar.xml +++ b/addons/account/static/src/xml/account_dashboard_setup_bar.xml @@ -28,7 +28,7 @@ <h4 class="text-muted">Configuration Steps</h4> </div> - <div class="pull-right" style="padding: 7px 0;"> + <div class="float-right" style="padding: 7px 0;"> <button aria-label="Hide setup bar" data-dismiss="modal" type="company_object" name="setting_hide_setup_bar" class="account_setup_dashboard_action close">×</button> </div> </div> diff --git a/addons/account/static/src/xml/account_payment.xml b/addons/account/static/src/xml/account_payment.xml index 414d5676442..ad3758c8d59 100644 --- a/addons/account/static/src/xml/account_payment.xml +++ b/addons/account/static/src/xml/account_payment.xml @@ -6,7 +6,7 @@ <div> <t t-if="outstanding"> <div> - <strong class="pull-left" id="outstanding"><t t-esc="title"></t></strong> + <strong class="float-left" id="outstanding"><t t-esc="title"></t></strong> </div> </t> <table style="width:100%;"> @@ -78,8 +78,8 @@ </tr> </table> </div> - <button class="btn btn-xs btn-primary js_unreconcile_payment pull-left" t-att-payment-id="payment_id" style="margin-top:5px; margin-bottom:5px;">Unreconcile</button> - <button class="btn btn-xs btn-secondary js_open_payment pull-right" t-att-payment-id="account_payment_id" t-att-invoice-id="invoice_id" t-att-move-id="move_id" style="margin-top:5px; margin-bottom:5px;">View</button> + <button class="btn btn-xs btn-primary js_unreconcile_payment float-left" t-att-payment-id="payment_id" style="margin-top:5px; margin-bottom:5px;">Unreconcile</button> + <button class="btn btn-xs btn-secondary js_open_payment float-right" t-att-payment-id="account_payment_id" t-att-invoice-id="invoice_id" t-att-move-id="move_id" style="margin-top:5px; margin-bottom:5px;">View</button> </t> </templates> diff --git a/addons/account/static/src/xml/account_reconciliation.xml b/addons/account/static/src/xml/account_reconciliation.xml index 44986549a92..bccd3ebde9c 100644 --- a/addons/account/static/src/xml/account_reconciliation.xml +++ b/addons/account/static/src/xml/account_reconciliation.xml @@ -26,14 +26,14 @@ </div> <div aria-valuemin="0" t-att-aria-valuenow="widget._initialState.valuenow" class="progress-bar" role="progressbar" style="width: 0%;" t-att-aria-valuemax="widget._initialState.valuemax"></div> </div> - <button class="btn btn-secondary o_automatic_reconciliation pull-right" title="Let odoo try to reconcile entries for the user">Automatic reconciliation</button> + <button class="btn btn-secondary o_automatic_reconciliation float-right" title="Let odoo try to reconcile entries for the user">Automatic reconciliation</button> <div class="notification_area"/> </div> <div class="o_reconciliation_lines"/> <div t-if="widget._initialState.valuemax > widget._initialState.defaultDisplayQty"> <button class="btn btn-secondary js_load_more">Load more</button> </div> - <div class="pull-right text-muted">Tip: Hit CTRL-Enter to reconcile all the balanced items in the sheet.</div> + <div class="float-right text-muted">Tip: Hit CTRL-Enter to reconcile all the balanced items in the sheet.</div> </div> <div t-else="" class="o_view_noreconciliation"> <p>Nothing to do!</p> @@ -73,7 +73,7 @@ <div class="o_reconciliation_line" t-att-data-mode="state.mode"> <table class="accounting_view"> <caption> - <div class="pull-right o_buttons"> + <div class="float-right o_buttons"> <button t-attf-class="o_validate btn btn-secondary #{!state.balance.type ? '' : 'd-none'}">Validate</button> <button t-attf-class="o_reconcile btn btn-primary #{state.balance.type > 0 ? '' : 'd-none'}">Reconcile</button> <span t-attf-class="o_no_valid text-danger #{state.balance.type < 0 ? '' : 'd-none'}">Select a partner or choose a counterpart</span> @@ -106,7 +106,7 @@ <t t-name="reconciliation.manual.line" t-extend="reconciliation.line"> <t t-jquery=".o_buttons" t-operation="replace"> - <div class="pull-right o_buttons"> + <div class="float-right o_buttons"> <button t-attf-class="o_validate btn btn-secondary #{!state.balance.type ? '' : 'd-none'}">Reconcile</button> <button t-attf-class="o_reconcile btn btn-primary #{state.balance.type > 0 ? '' : 'd-none'}">Reconcile</button> <button t-attf-class="o_no_valid btn btn-secondary #{state.balance.type < 0 ? '' : 'd-none'}">Skip</button> @@ -144,8 +144,8 @@ <div t-name="reconciliation.line.match"> <div class="match_controls"> <input class="filter" placeholder="Filter..." type="text" value=""/> - <span class="pull-right fa fa-chevron-right disabled" role="img" aria-label="Previous" title="Previous"></span> - <span class="pull-right fa fa-chevron-left disabled" role="img" aria-label="Next" title="Next"></span> + <span class="float-right fa fa-chevron-right disabled" role="img" aria-label="Previous" title="Previous"></span> + <span class="float-right fa fa-chevron-left disabled" role="img" aria-label="Next" title="Next"></span> </div> <table> <tbody> @@ -162,7 +162,7 @@ </t> <p t-if="!state.reconcileModels.length" style="color: #bbb;">To speed up reconciliation, define <a style="cursor: pointer;" class="reconcile_model_create">reconciliation models</a>.</p> </div> - <div class="dropdown pull-right"> + <div class="dropdown float-right"> <a data-toggle="dropdown" href="#"><span class="fa fa-cog" role="img" aria-label="Settings"/></a> <div class="dropdown-menu dropdown-menu-right" role="menu" aria-label="Presets config"> <a role="menuitem" class="dropdown-item reconcile_model_create" href="#">Create model</a> @@ -170,7 +170,7 @@ </div> </div> </div> - <table class="pull-left"> + <table class="float-left"> <tr class="create_account_id"> <td class="o_td_label">Account</td> <td class="o_td_field"></td> @@ -188,7 +188,7 @@ <td class="o_td_field"></td> </tr> </table> - <table class="pull-right"> + <table class="float-right"> <tbody> <tr class="create_journal_id" style="display: none;"> <td class="o_td_label">Journal</td> diff --git a/addons/account/views/account_invoice_view.xml b/addons/account/views/account_invoice_view.xml index 5a4ad07f9ee..5dd758a4ef4 100644 --- a/addons/account/views/account_invoice_view.xml +++ b/addons/account/views/account_invoice_view.xml @@ -204,7 +204,7 @@ <span><t t-esc="record.number.value"/> <t t-esc="record.date_invoice.value"/></span> </div> <div class="oe_kanban_bottom_right"> - <span class="pull-right text-right"> + <span class="float-right text-right"> <field name="state" widget="label_selection" options="{'classes': {'draft': 'default', 'cancel': 'default', 'none': 'danger', 'open': 'warning', 'paid': 'success'}}"/> </span> @@ -519,7 +519,7 @@ </div> <div class="col-4"> <strong> - <span class="pull-right text-right"> + <span class="float-right text-right"> <t t-esc="record.price_subtotal.value" groups="account.group_show_line_subtotals_tax_excluded"/> <t t-esc="record.price_total.value" groups="account.group_show_line_subtotals_tax_included"/> </span> diff --git a/addons/account/views/account_payment_view.xml b/addons/account/views/account_payment_view.xml index bec2bee0a71..c39c1d3c68e 100644 --- a/addons/account/views/account_payment_view.xml +++ b/addons/account/views/account_payment_view.xml @@ -70,7 +70,7 @@ <field name="amount" widget='monetary'/> </div> <div class="col-6"> - <span class="pull-right label label-default"> + <span class="float-right label label-default"> <field name="state" widget="kanban_label_selection" options="{'classes': {'draft': 'default', 'sent': 'success'}}"/> </span> </div> diff --git a/addons/account/views/account_portal_templates.xml b/addons/account/views/account_portal_templates.xml index c89828524b3..f5501228169 100644 --- a/addons/account/views/account_portal_templates.xml +++ b/addons/account/views/account_portal_templates.xml @@ -93,8 +93,8 @@ <div class="pb8 ml16 mr16 container"> <t t-if="invoice.user_id"> <div><strong>Your Contact:</strong></div> - <img class="rounded-circle mr4 pull-left o_portal_contact_img" t-if="invoice.user_id.image" t-attf-src="data:image/png;base64,#{invoice.user_id.image}" alt="Contact"/> - <img class="rounded-circle mr4 pull-left o_portal_contact_img" t-if="not invoice.user_id.image" src="/web/static/src/img/placeholder.png" alt="Contact"/> + <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="invoice.user_id.image" t-attf-src="data:image/png;base64,#{invoice.user_id.image}" alt="Contact"/> + <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="not invoice.user_id.image" src="/web/static/src/img/placeholder.png" alt="Contact"/> <span t-field="invoice.user_id" t-field-options='{"widget": "contact", "fields": ["name", "phone"], "no_marker": True}'/> <a data-toggle="modal" href="#" data-target="#invoice_chatter">Contact us</a> </t> diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml index 966db6f4dea..2a4f0f9c12a 100644 --- a/addons/account/views/account_view.xml +++ b/addons/account/views/account_view.xml @@ -229,7 +229,7 @@ <strong><field name="name"/></strong> </div> <div class="col-6"> - <span class="pull-right"><field name="type"/></span> + <span class="float-right"><field name="type"/></span> </div> </div> </div> @@ -1030,7 +1030,7 @@ <div class="col-6"> <strong><span><t t-esc="record.name.value"/></span></strong> </div> - <div class="col-6 pull-right text-right"> + <div class="col-6 float-right text-right"> <span class="badge badge-pill"><t t-esc="record.type_tax_use.value"/></span> </div> </div> @@ -1474,7 +1474,7 @@ <span><field name="currency_id" invisible="1"/></span> </div> <div class="col-6"> - <span class="pull-right"> + <span class="float-right"> <field name="state" widget="kanban_label_selection" options="{'classes': {'draft': 'default', 'posted': 'success'}}"/> </span> </div> diff --git a/addons/account/views/report_invoice.xml b/addons/account/views/report_invoice.xml index aaa8cf25eb9..8a05a839396 100644 --- a/addons/account/views/report_invoice.xml +++ b/addons/account/views/report_invoice.xml @@ -156,7 +156,7 @@ <div class="clearfix"> <div id="total" class="row"> - <div t-attf-class="col-md-4 pull-right #{'col-4' if not type_html else ''}"> + <div t-attf-class="col-md-4 float-right #{'col-4' if not type_html else ''}"> <table class="table table-sm" style="min-width: 250px;max-width: 400px;"> <tr class="border-black" style="border-bottom:1px solid #dddddd;"> <td><strong>Subtotal</strong></td> diff --git a/addons/account/views/report_journal.xml b/addons/account/views/report_journal.xml index 2f079e8afe6..740fb4aad79 100644 --- a/addons/account/views/report_journal.xml +++ b/addons/account/views/report_journal.xml @@ -61,7 +61,7 @@ </table> <div class="row"> - <div class="col-4 pull-right"> + <div class="col-4 float-right"> <table class="table table-sm"> <tr> <td><strong>Total</strong></td> diff --git a/addons/account/wizard/multi_compose_message_views.xml b/addons/account/wizard/multi_compose_message_views.xml index 699256f9200..bed5b6939e8 100644 --- a/addons/account/wizard/multi_compose_message_views.xml +++ b/addons/account/wizard/multi_compose_message_views.xml @@ -55,7 +55,7 @@ <button string="Cancel" class="btn-secondary" special="cancel" /> <button icon="fa-lg fa-save" type="object" name="save_as_template" string="Save as new template" attrs="{'invisible': ['|', '|', '|', ('is_log', '=', True), ('printed', '=', True), ('is_email', '=', False)]}" - class="pull-right btn-secondary" help="Save as a new template" /> + class="float-right btn-secondary" help="Save as a new template" /> </footer> </form> </field> diff --git a/addons/account_analytic_default/views/account_analytic_default_view.xml b/addons/account_analytic_default/views/account_analytic_default_view.xml index e964c4e0f0a..23add773de3 100644 --- a/addons/account_analytic_default/views/account_analytic_default_view.xml +++ b/addons/account_analytic_default/views/account_analytic_default_view.xml @@ -55,7 +55,7 @@ <div t-attf-class="oe_kanban_card oe_kanban_global_click"> <div> <strong><span><field name="analytic_id"/></span></strong> - <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="24" height="24" class="oe_kanban_avatar pull-right"/> + <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="24" height="24" class="oe_kanban_avatar float-right"/> </div> <div t-if="record.date_start.value"><i class="fa fa-calendar"></i> From <field name="date_start"/> <t t-if="record.date_stop.value">to <field name="date_stop"/></t></div> <div t-if="record.product_id.value"><strong>Product</strong> <field name="product_id"/> </div> diff --git a/addons/account_asset/views/account_asset_views.xml b/addons/account_asset/views/account_asset_views.xml index 1ea79e10423..356b2b5aba4 100644 --- a/addons/account_asset/views/account_asset_views.xml +++ b/addons/account_asset/views/account_asset_views.xml @@ -252,7 +252,7 @@ <div class="col-6"> <strong><span><t t-esc="record.name.value"/></span></strong> </div> - <div class="col-6 pull-right text-right"> + <div class="col-6 float-right text-right"> <strong><t t-esc="record.date.value"/></strong> </div> </div> @@ -261,7 +261,7 @@ <span><t t-esc="record.category_id.value"/></span> </div> <div class="col-6"> - <span class="pull-right text-right"> + <span class="float-right text-right"> <field name="state" widget="kanban_label_selection" options="{'classes': {'draft': 'primary', 'open': 'success', 'close': 'default'}}"/> </span> </div> diff --git a/addons/account_budget/views/account_budget_views.xml b/addons/account_budget/views/account_budget_views.xml index b0ba9fa9312..952a069444b 100644 --- a/addons/account_budget/views/account_budget_views.xml +++ b/addons/account_budget/views/account_budget_views.xml @@ -188,7 +188,7 @@ Budgets </strong> </div> <div class="col-4"> - <span class="pull-right"> + <span class="float-right"> <field name="state" widget="kanban_label_selection" options="{'classes': {'draft': 'default', 'done': 'success'}}"/> </span> @@ -201,10 +201,10 @@ Budgets <t t-esc="record.date_to.value"/> </div> <div class="col-2"> - <span class="pull-right"> + <span class="float-right"> <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="24" height="24" - class="oe_kanban_avatar pull-right"/> + class="oe_kanban_avatar float-right"/> </span> </div> </div> diff --git a/addons/account_voucher/views/account_voucher_views.xml b/addons/account_voucher/views/account_voucher_views.xml index 075df01ee67..b5376f2e0ea 100644 --- a/addons/account_voucher/views/account_voucher_views.xml +++ b/addons/account_voucher/views/account_voucher_views.xml @@ -49,7 +49,7 @@ <strong><span><t t-esc="record.partner_id.value"/></span></strong> </div> <div class="col-6"> - <strong><span class="pull-right text-right"><t t-esc="record.amount.value"/></span></strong> + <strong><span class="float-right text-right"><t t-esc="record.amount.value"/></span></strong> </div> </div> <div class="row"> @@ -57,7 +57,7 @@ <span><t t-esc="record.number.value"/> <t t-esc="record.date.value"/></span> </div> <div class="col-6"> - <span class="pull-right text-right"> + <span class="float-right text-right"> <field name="state" widget="label_selection" options="{'classes': {'draft': 'default', 'cancel': 'default', 'none': 'danger', 'proforma': 'warning', 'posted': 'success'}}"/> </span> diff --git a/addons/analytic/views/analytic_account_views.xml b/addons/analytic/views/analytic_account_views.xml index 9f1f7a5451f..095146e3124 100644 --- a/addons/analytic/views/analytic_account_views.xml +++ b/addons/analytic/views/analytic_account_views.xml @@ -351,7 +351,7 @@ <div class="col-6"> <strong><span><t t-esc="record.name.value"/></span></strong> </div> - <div class="col-6 pull-right text-right"> + <div class="col-6 float-right text-right"> <strong><t t-esc="record.date.value"/></strong> </div> </div> @@ -360,7 +360,7 @@ <span><t t-esc="record.account_id.value"/></span> </div> <div class="col-6"> - <span class="pull-right text-right"> + <span class="float-right text-right"> <field name="amount" widget="monetary"/> </span> </div> diff --git a/addons/auth_oauth/views/auth_oauth_templates.xml b/addons/auth_oauth/views/auth_oauth_templates.xml index 1ddd715a21c..bdc5cf4f244 100644 --- a/addons/auth_oauth/views/auth_oauth_templates.xml +++ b/addons/auth_oauth/views/auth_oauth_templates.xml @@ -11,7 +11,7 @@ <template id="auth_oauth.login" inherit_id="web.login" name="OAuth Login buttons"> <xpath expr="//button[@type='submit']" position="before"> - <div class="pull-right"> + <div class="float-right"> <t t-call="auth_oauth.providers"/> </div> </xpath> @@ -19,7 +19,7 @@ <template id="auth_oauth.signup" inherit_id="auth_signup.signup" name="OAuth Signup buttons"> <xpath expr="//button[@type='submit']" position="before"> - <div class="pull-right"> + <div class="float-right"> <t t-call="auth_oauth.providers"/> </div> </xpath> @@ -27,7 +27,7 @@ <template id="auth_oauth.reset_password" inherit_id="auth_signup.reset_password" name="OAuth Reset Password buttons"> <xpath expr="//button[@type='submit']" position="before"> - <div class="pull-right"> + <div class="float-right"> <t t-call="auth_oauth.providers"/> </div> </xpath> diff --git a/addons/auth_signup/views/auth_signup_login_templates.xml b/addons/auth_signup/views/auth_signup_login_templates.xml index a043b15eaad..4a9abbd01e0 100644 --- a/addons/auth_signup/views/auth_signup_login_templates.xml +++ b/addons/auth_signup/views/auth_signup_login_templates.xml @@ -2,8 +2,8 @@ <odoo> <template id="auth_signup.login" inherit_id="web.login" name="Sign up - Reset Password"> <xpath expr="//button[@type='submit']" position="before"> - <a t-if="signup_enabled" t-attf-href="/web/signup?{{ keep_query() }}" class="btn btn-link pull-right" role="button">Don't have an account?</a> - <a t-if="reset_password_enabled" t-attf-href="/web/reset_password?{{ keep_query() }}" class="btn btn-link pull-right" role="button">Reset Password</a> + <a t-if="signup_enabled" t-attf-href="/web/signup?{{ keep_query() }}" class="btn btn-link float-right" role="button">Don't have an account?</a> + <a t-if="reset_password_enabled" t-attf-href="/web/reset_password?{{ keep_query() }}" class="btn btn-link float-right" role="button">Reset Password</a> </xpath> </template> @@ -49,8 +49,8 @@ <input type="hidden" name="redirect" t-att-value="redirect"/> <input type="hidden" name="token" t-att-value="token"/> <div class="clearfix oe_login_buttons"> - <a t-attf-href="/web/login?{{ keep_query() }}" class="btn btn-link pull-right" role="button">Already have an account?</a> - <button type="submit" class="btn btn-primary pull-left o_signup_btn"> Sign up</button> + <a t-attf-href="/web/login?{{ keep_query() }}" class="btn btn-link float-right" role="button">Already have an account?</a> + <button type="submit" class="btn btn-primary float-left o_signup_btn"> Sign up</button> </div> </form> @@ -63,7 +63,7 @@ <p class="alert alert-success" t-if="message" role="status"> <t t-esc="message"/> </p> - <a href="/web/login" class="btn btn-link pull-right" role="button">Back to Login</a> + <a href="/web/login" class="btn btn-link float-right" role="button">Back to Login</a> </div> <form class="oe_reset_password_form" role="form" method="post" t-if="not message"> @@ -89,9 +89,9 @@ <input type="hidden" name="redirect" t-att-value="redirect"/> <input type="hidden" name="token" t-att-value="token"/> <div class="clearfix oe_login_buttons"> - <a t-if="not token" t-attf-href="/web/login?{{ keep_query() }}" class="btn btn-link pull-right" role="button">Back to Login</a> - <a t-if="invalid_token" href="/web/login" class="btn btn-link pull-right" role="button">Back to Login</a> - <button type="submit" class="btn btn-primary pull-left">Confirm</button> + <a t-if="not token" t-attf-href="/web/login?{{ keep_query() }}" class="btn btn-link float-right" role="button">Back to Login</a> + <a t-if="invalid_token" href="/web/login" class="btn btn-link float-right" role="button">Back to Login</a> + <button type="submit" class="btn btn-primary float-left">Confirm</button> </div> </form> diff --git a/addons/calendar/static/src/xml/base_calendar.xml b/addons/calendar/static/src/xml/base_calendar.xml index 26b66481b6e..99de4974050 100644 --- a/addons/calendar/static/src/xml/base_calendar.xml +++ b/addons/calendar/static/src/xml/base_calendar.xml @@ -32,7 +32,7 @@ </span> <span><t t-esc="meeting.name"/></span> </span> - <span t-if="meeting.start" class="pull-right"> + <span t-if="meeting.start" class="float-right"> <t t-if="meeting.allday">All Day</t> <t t-else=''> <t t-set="is_next_meeting" t-value="false"/> diff --git a/addons/calendar/views/calendar_templates.xml b/addons/calendar/views/calendar_templates.xml index 4342144fcdd..6423c0bcd66 100644 --- a/addons/calendar/views/calendar_templates.xml +++ b/addons/calendar/views/calendar_templates.xml @@ -35,7 +35,7 @@ </div> <div class="card-body"> <div class="clearfix mb16" t-if="attendee.state != 'needsAction'"> - <span class="pull-right label label-info"> + <span class="float-right label label-info"> <t t-if="attendee.state == 'accepted'">Yes I'm going.</t> <t t-if="attendee.state == 'declined'">No I'm not going.</t> </span> diff --git a/addons/calendar/views/calendar_views.xml b/addons/calendar/views/calendar_views.xml index 26baf283093..d7c2406f630 100644 --- a/addons/calendar/views/calendar_views.xml +++ b/addons/calendar/views/calendar_views.xml @@ -88,7 +88,7 @@ <field name="arch" type="xml"> <form string="Meetings"> <sheet> - <button string="Document" class="oe_stat_button pull-right" icon="fa-bars" type="object" name="action_open_calendar_event" attrs="{'invisible': ['|', ('res_model', '=', False), ('res_id', '=', False)]}"/> + <button string="Document" class="oe_stat_button float-right" icon="fa-bars" type="object" name="action_open_calendar_event" attrs="{'invisible': ['|', ('res_model', '=', False), ('res_id', '=', False)]}"/> <field name="res_model" invisible="1" /> <field name="res_id" invisible="1" /> <field name="state" invisible="1"/> @@ -235,7 +235,7 @@ <field name="priority" eval="2"/> <field name="arch" type="xml"> <form string="Meetings"> - <button string="Document" class="oe_stat_button pull-right" icon="fa-bars" type="object" name="action_open_calendar_event" attrs="{'invisible': ['|', ('res_model', '=', False), ('res_id', '=', False)]}"/> + <button string="Document" class="oe_stat_button float-right" icon="fa-bars" type="object" name="action_open_calendar_event" attrs="{'invisible': ['|', ('res_model', '=', False), ('res_id', '=', False)]}"/> <field name="res_model" invisible="1" /> <field name="res_id" invisible="1" /> <field name="state" invisible="1"/> diff --git a/addons/crm/static/description/index.html b/addons/crm/static/description/index.html index 3191abfb168..c601205cacc 100644 --- a/addons/crm/static/description/index.html +++ b/addons/crm/static/description/index.html @@ -13,15 +13,15 @@ <h2 class="oe_slogan" style="color:#875A7B;">Get accurate forecasts</h2> <h3 class="oe_slogan">Use actionable data to make better decisions</h3> <div class="oe_span6 text-justify oe_mt32"> - <span class="fa fa-search fa-2x pull-left"/> + <span class="fa fa-search fa-2x float-left"/> <p class="oe_mb32" style="margin-left:48px;"> Get the insights you need to make smarter decisions. </p> - <span class="fa fa-sliders fa-2x pull-left"/> + <span class="fa fa-sliders fa-2x float-left"/> <p class="oe_mb32" style="margin-left:48px;"> Design custom dashboards to get a picture of your business at a glance. </p> - <span class="fa fa-bar-chart fa-2x pull-left"></span> + <span class="fa fa-bar-chart fa-2x float-left"></span> <p> Dig deeper with real-time reports and flow charts that anyone can create and share. </p> diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml index d72c2fd29c8..6a3b3b4c505 100644 --- a/addons/crm/views/crm_lead_views.xml +++ b/addons/crm/views/crm_lead_views.xml @@ -52,7 +52,7 @@ <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/> </button> </div> - <div class="label label-success pull-right" attrs="{'invisible': [('probability', '<', 100)]}">Won</div> + <div class="label label-success float-right" attrs="{'invisible': [('probability', '<', 100)]}">Won</div> <div class="oe_title"> <label for="name" class="oe_edit_only" string="Lead"/> <h1><field name="name" placeholder="Describe the lead..."/></h1> @@ -196,7 +196,7 @@ </div> </div> <div class="oe_kanban_bottom_right"> - <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="24" height="24" class="oe_kanban_avatar pull-right"/> + <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="24" height="24" class="oe_kanban_avatar float-right"/> </div> </div> </div> @@ -461,8 +461,8 @@ <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/> </button> </div> - <div class="label label-danger pull-right" attrs="{'invisible': ['|', ('probability', '>', 0), ('active', '=', True)]}">Lost</div> - <div class="label label-success pull-right" attrs="{'invisible': [('probability', '<', 100)]}">Won</div> + <div class="label label-danger float-right" attrs="{'invisible': ['|', ('probability', '>', 0), ('active', '=', True)]}">Lost</div> + <div class="label label-success float-right" attrs="{'invisible': [('probability', '<', 100)]}">Won</div> <div class="oe_title"> <label for="name" class="oe_edit_only"/> <h1><field name="name" placeholder="e.g. Product Pricing"/></h1> diff --git a/addons/fleet/views/fleet_vehicle_cost_views.xml b/addons/fleet/views/fleet_vehicle_cost_views.xml index 63499f7340a..429b1bfdfcd 100644 --- a/addons/fleet/views/fleet_vehicle_cost_views.xml +++ b/addons/fleet/views/fleet_vehicle_cost_views.xml @@ -25,12 +25,12 @@ <div> <strong> <field name="vehicle_id"/> - <span class="pull-right"><field name="date"/></span> + <span class="float-right"><field name="date"/></span> </strong> </div> <div> <field name="cost_subtype_id"/> - <span class="pull-right"><field name="amount"/></span> + <span class="float-right"><field name="amount"/></span> </div> </div> </t> @@ -297,7 +297,7 @@ <div> <strong> <field name="vehicle_id"/> - <span class="pull-right label label-default"> + <span class="float-right label label-default"> <field name="state"/> </span> </strong> @@ -307,7 +307,7 @@ </div> <div> <field name="insurer_id"/> - <span class="pull-right"><field name="cost_subtype_id"/></span> + <span class="float-right"><field name="cost_subtype_id"/></span> </div> </div> </t> @@ -446,7 +446,7 @@ <div> <strong> <field name="vehicle_id"/> - <span class="pull-right"><field name="date"/></span> + <span class="float-right"><field name="date"/></span> </strong> </div> <div> @@ -454,7 +454,7 @@ </div> <div> <span><field name="liter"/> Liter</span> - <span class="pull-right"><field name="amount"/></span> + <span class="float-right"><field name="amount"/></span> </div> </div> </t> @@ -580,7 +580,7 @@ <div> <strong> <field name="vehicle_id"/> - <span class="pull-right"><field name="date"/></span> + <span class="float-right"><field name="date"/></span> </strong> </div> <div> @@ -591,7 +591,7 @@ </div> <div> <span><field name="vendor_id"/></span> - <span class="pull-right"><field name="amount"/></span> + <span class="float-right"><field name="amount"/></span> </div> </div> </t> diff --git a/addons/fleet/views/fleet_vehicle_views.xml b/addons/fleet/views/fleet_vehicle_views.xml index 4e933f6c8d2..495d460919f 100644 --- a/addons/fleet/views/fleet_vehicle_views.xml +++ b/addons/fleet/views/fleet_vehicle_views.xml @@ -302,12 +302,12 @@ <div> <strong> <field name="vehicle_id"/> - <span class="pull-right"><field name="date"/></span> + <span class="float-right"><field name="date"/></span> </strong> </div> <div> <span><field name="driver_id"/></span> - <span class="pull-right"><field name="value"/> Km</span> + <span class="float-right"><field name="value"/> Km</span> </div> </div> </t> diff --git a/addons/gamification/views/goal.xml b/addons/gamification/views/goal.xml index b46e0e6844d..a3386496a47 100644 --- a/addons/gamification/views/goal.xml +++ b/addons/gamification/views/goal.xml @@ -149,7 +149,7 @@ <div t-attf-class="oe_kanban_card o_kanban_gamification #{record.end_date.raw_value < record.last_update.raw_value & record.state.raw_value == 'failed' ? 'oe_kanban_color_2' : ''} #{record.end_date.raw_value < record.last_update.raw_value & record.state.raw_value == 'reached' ? 'oe_kanban_color_5' : ''}"> <div class="o_kanban_content"> <p><strong><h4 class="oe_goal_name text-center" tooltip="kanban-tooltip"><field name="definition_id" /></h4></strong></p> - <div class="pull-left"> + <div class="float-left"> <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="24" height="24" /> </div> <field name="user_id" /> diff --git a/addons/hr/views/hr_views.xml b/addons/hr/views/hr_views.xml index a0be9e193eb..e462be7fcc4 100644 --- a/addons/hr/views/hr_views.xml +++ b/addons/hr/views/hr_views.xml @@ -426,7 +426,7 @@ </div> <div> <span>Vacancies : <field name="expected_employees"/></span> - <span t-att-class="'pull-right label label-success' if record.state.raw_value == 'recruit' else 'pull-right label label-danger'"> + <span t-att-class="'float-right label label-success' if record.state.raw_value == 'recruit' else 'float-right label label-danger'"> <field name="state"/> </span> </div> diff --git a/addons/hr_attendance/views/hr_employee_view.xml b/addons/hr_attendance/views/hr_employee_view.xml index e2b10192868..3dcb503b564 100644 --- a/addons/hr_attendance/views/hr_employee_view.xml +++ b/addons/hr_attendance/views/hr_employee_view.xml @@ -59,10 +59,10 @@ </div> <div class="oe_kanban_details"> <div id="textbox"> - <div class="pull-right" t-if="record.attendance_state.raw_value == 'checked_in'"> + <div class="float-right" t-if="record.attendance_state.raw_value == 'checked_in'"> <span id="oe_hr_attendance_status" class="fa fa-user oe_hr_attendance_status_green" role="img" aria-label="Available" title="Available"></span> </div> - <div class="pull-right" t-if="record.attendance_state.raw_value == 'checked_out'"> + <div class="float-right" t-if="record.attendance_state.raw_value == 'checked_out'"> <span id="oe_hr_attendance_status" class="fa fa-user oe_hr_attendance_status_red" role="img" aria-label="Not available" title="Not available"></span> </div> <strong> @@ -92,10 +92,10 @@ </templates> <field name="name" position="replace"> <div> - <div class="pull-right" t-if="record.attendance_state.raw_value == 'checked_in'"> + <div class="float-right" t-if="record.attendance_state.raw_value == 'checked_in'"> <span id="oe_hr_attendance_status" class="fa fa-user oe_hr_attendance_status_green" role="img" aria-label="Available" title="Available"></span> </div> - <div class="pull-right" t-if="record.attendance_state.raw_value == 'checked_out'"> + <div class="float-right" t-if="record.attendance_state.raw_value == 'checked_out'"> <span id="oe_hr_attendance_status" class="fa fa-user oe_hr_attendance_status_red" role="img" aria-label="Not available" title="Not available"></span> </div> <strong> diff --git a/addons/hr_contract/views/hr_contract_views.xml b/addons/hr_contract/views/hr_contract_views.xml index 9e5b234c956..fcf2e205acb 100644 --- a/addons/hr_contract/views/hr_contract_views.xml +++ b/addons/hr_contract/views/hr_contract_views.xml @@ -191,7 +191,7 @@ <field name="job_id"/> </div> <div class="oe_kanban_bottom_right"> - <img t-att-src="kanban_image('hr.employee', 'image_medium', record.employee_id.raw_value)" t-att-title="record.employee_id.value" t-att-alt="record.employee_id.value" width="24" height="24" class="oe_kanban_avatar pull-right"/> + <img t-att-src="kanban_image('hr.employee', 'image_medium', record.employee_id.raw_value)" t-att-title="record.employee_id.value" t-att-alt="record.employee_id.value" width="24" height="24" class="oe_kanban_avatar float-right"/> </div> </div> <div class="oe_clear"></div> diff --git a/addons/hr_expense/report/hr_expense_report.xml b/addons/hr_expense/report/hr_expense_report.xml index c7ffd256229..562deba76b1 100644 --- a/addons/hr_expense/report/hr_expense_report.xml +++ b/addons/hr_expense/report/hr_expense_report.xml @@ -82,7 +82,7 @@ </table> <div class="row"> - <div class="col-4 pull-right"> + <div class="col-4 float-right"> <table class="table table-sm"> <tr class="border-black"> <td><strong>Total</strong></td> diff --git a/addons/hr_expense/views/hr_expense_views.xml b/addons/hr_expense/views/hr_expense_views.xml index c719da67536..ad96e756d94 100644 --- a/addons/hr_expense/views/hr_expense_views.xml +++ b/addons/hr_expense/views/hr_expense_views.xml @@ -139,7 +139,7 @@ <div class="row"> <div class="col-12"> <strong class="o_kanban_record_title"><span><t t-esc="record.name.value"/></span></strong> - <strong class="o_kanban_record_subtitle pull-right"><span class="text-right"><t t-esc="record.total_amount.value"/></span></strong> + <strong class="o_kanban_record_subtitle float-right"><span class="text-right"><t t-esc="record.total_amount.value"/></span></strong> </div> </div> <div class="row mt8"> @@ -147,7 +147,7 @@ <span><t t-esc="record.employee_id.value"/> <t t-esc="record.date.value"/></span> </div> <div class="col-6"> - <span class="pull-right text-right"> + <span class="float-right text-right"> <field name="state" widget="label_selection" options="{'classes': {'draft': 'default', 'reported': 'primary', 'refused': 'danger', 'done': 'warning', 'approved': 'success'}}"/> </span> @@ -522,7 +522,7 @@ <div class="row"> <div class="col-12"> <strong class="o_kanban_record_title"><span><t t-esc="record.name.value"/></span></strong> - <strong class="o_kanban_record_subtitle pull-right"><span class="text-right"><t t-esc="record.total_amount.value"/></span></strong> + <strong class="o_kanban_record_subtitle float-right"><span class="text-right"><t t-esc="record.total_amount.value"/></span></strong> </div> </div> <div class="row mt8"> @@ -530,7 +530,7 @@ <span><t t-esc="record.employee_id.value"/> <t t-esc="record.accounting_date.value"/></span> </div> <div class="col-6"> - <span class="pull-right text-right"> + <span class="float-right text-right"> <field name="state" widget="label_selection" options="{'classes': {'draft': 'default', 'submit': 'default', 'cancel': 'danger', 'post': 'warning', 'done': 'success'}}"/> </span> diff --git a/addons/hr_holidays/report/hr_leave_reports.xml b/addons/hr_holidays/report/hr_leave_reports.xml index b306fcd44ef..004433a3c62 100644 --- a/addons/hr_holidays/report/hr_leave_reports.xml +++ b/addons/hr_holidays/report/hr_leave_reports.xml @@ -73,12 +73,12 @@ <div t-attf-class="oe_kanban_global_click"> <div> <span> - <img t-att-src="kanban_image('hr.employee', 'image_small', record.employee_id.raw_value)" t-att-title="record.employee_id.value" t-att-alt="record.employee_id.value" width="40" height="40" class="oe_kanban_avatar pull-left mr4"/> + <img t-att-src="kanban_image('hr.employee', 'image_small', record.employee_id.raw_value)" t-att-title="record.employee_id.value" t-att-alt="record.employee_id.value" width="40" height="40" class="oe_kanban_avatar float-left mr4"/> </span> <span> <div> <strong class="o_kanban_record_title"><t t-esc="record.employee_id.value"/></strong> - <span class="pull-right"> + <span class="float-right"> <field name="state" widget="kanban_label_selection" options="{'classes': {'draft': 'default', 'validate': 'success','confirm': 'default', 'cancel': 'danger'}}"/> </span> </div> diff --git a/addons/hr_holidays/views/hr_leave_type_views.xml b/addons/hr_holidays/views/hr_leave_type_views.xml index d1ddf3b79f6..a5cdfca4674 100644 --- a/addons/hr_holidays/views/hr_leave_type_views.xml +++ b/addons/hr_holidays/views/hr_leave_type_views.xml @@ -86,7 +86,7 @@ </div> <div> <span>Max Leaves: <field name="max_leaves"/></span> - <span class="pull-right">Leaves Taken: <field name="leaves_taken"/></span> + <span class="float-right">Leaves Taken: <field name="leaves_taken"/></span> </div> </div> </t> diff --git a/addons/hr_org_chart/static/src/xml/hr_org_chart.xml b/addons/hr_org_chart/static/src/xml/hr_org_chart.xml index 4330255285c..318be0b744c 100644 --- a/addons/hr_org_chart/static/src/xml/hr_org_chart.xml +++ b/addons/hr_org_chart/static/src/xml/hr_org_chart.xml @@ -152,7 +152,7 @@ <t t-name="hr_orgchart_emp_popover_title"> <div> <span t-att-style='"background-image:url(\"/web/image/hr.employee/" + employee.id + "/image/\")"'/> - <a href="#" class="pull-right o_employee_redirect" t-att-data-employee-id="employee.id"><i class="fa fa-external-link" role="img" aria-label='Redirect' title="Redirect"></i></a> + <a href="#" class="float-right o_employee_redirect" t-att-data-employee-id="employee.id"><i class="fa fa-external-link" role="img" aria-label='Redirect' title="Redirect"></i></a> <b><t t-esc="employee.name"/></b> </div> </t> diff --git a/addons/hr_payroll/views/hr_payslip_views.xml b/addons/hr_payroll/views/hr_payslip_views.xml index 797cd110fb0..cc90db513b6 100644 --- a/addons/hr_payroll/views/hr_payslip_views.xml +++ b/addons/hr_payroll/views/hr_payslip_views.xml @@ -96,7 +96,7 @@ <strong><field name="employee_id"/></strong> </div> <div class="col-6"> - <span class="pull-right label label-default"> + <span class="float-right label label-default"> <field name="state"/> </span> </div> @@ -341,7 +341,7 @@ <strong><field name="name"/></strong> </div> <div class="col-6"> - <span class="pull-right label label-default"> + <span class="float-right label label-default"> <field name="state"/> </span> </div> @@ -349,7 +349,7 @@ <span> <field name="date_start"/> - <field name="date_end"/> </span> - <span class="pull-right" title="Is a Blocking Reason?"> + <span class="float-right" title="Is a Blocking Reason?"> <field name="credit_note" widget="boolean"/> </span> </div> diff --git a/addons/hr_payroll/views/hr_salary_rule_views.xml b/addons/hr_payroll/views/hr_salary_rule_views.xml index d97299a04c1..be3462476c6 100644 --- a/addons/hr_payroll/views/hr_salary_rule_views.xml +++ b/addons/hr_payroll/views/hr_salary_rule_views.xml @@ -268,7 +268,7 @@ <strong><field name="name"/></strong> </div> <div class="col-4"> - <span class="pull-right"><field name="category_id"/></span> + <span class="float-right"><field name="category_id"/></span> </div> </div> <div class="row"> diff --git a/addons/hr_payroll/views/report_contributionregister_templates.xml b/addons/hr_payroll/views/report_contributionregister_templates.xml index 8fc544021a0..b7ec13cfec6 100644 --- a/addons/hr_payroll/views/report_contributionregister_templates.xml +++ b/addons/hr_payroll/views/report_contributionregister_templates.xml @@ -53,7 +53,7 @@ </table> <div class="row"> - <div class="col-4 pull-right"> + <div class="col-4 float-right"> <table class="table table-sm"> <tr class="border-black"> <td><strong>Total</strong></td> diff --git a/addons/hr_recruitment/views/hr_recruitment_views.xml b/addons/hr_recruitment/views/hr_recruitment_views.xml index 10b4ddd7b33..f7ff8ae53b0 100644 --- a/addons/hr_recruitment/views/hr_recruitment_views.xml +++ b/addons/hr_recruitment/views/hr_recruitment_views.xml @@ -316,7 +316,7 @@ <t t-if="record.partner_mobile.raw_value"><i class="fa fa-mobile mr4" role="img" aria-label="Mobile" title="Mobile"/><field name="partner_mobile"/><br/></t> <div class="o_kanban_record_bottom mt4"> <div class="oe_kanban_bottom_left"> - <div class="pull-left mr4" groups="base.group_user"> + <div class="float-left mr4" groups="base.group_user"> <field name="priority" widget="priority"/> </div> <div class="o_kanban_inline_block mr8"> diff --git a/addons/hr_timesheet/views/hr_timesheet_views.xml b/addons/hr_timesheet/views/hr_timesheet_views.xml index 7a2a7a71517..8c45e14c07c 100644 --- a/addons/hr_timesheet/views/hr_timesheet_views.xml +++ b/addons/hr_timesheet/views/hr_timesheet_views.xml @@ -165,7 +165,7 @@ <div t-attf-class="oe_kanban_global_click"> <div class="row"> <div class="col-2"> - <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="40" height="40" class="oe_kanban_avatar pull-left"/> + <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="40" height="40" class="oe_kanban_avatar float-left"/> </div> <div class="col-10"> <div> @@ -183,7 +183,7 @@ <i class="fa fa-calendar" role="img" aria-label="Date" title="Date"></i> <t t-esc="record.date.value"/> </span> - <span class="pull-right"> + <span class="float-right"> <strong>Duration: </strong><field name="unit_amount" widget="float_time"/> </span> </div> diff --git a/addons/im_livechat/static/description/index.html b/addons/im_livechat/static/description/index.html index 373c0d3ee0d..5a8f71c46cd 100644 --- a/addons/im_livechat/static/description/index.html +++ b/addons/im_livechat/static/description/index.html @@ -15,15 +15,15 @@ <h2 class="oe_slogan" style="color:#875A7B;">Do it live!</h2> <h3 class="oe_slogan">Convert more visitors into leads and customers</h3> <div class="col-lg-5 oe_mt32 text-justify"> - <span class="fa fa-eyedropper fa-2x pull-left"/> + <span class="fa fa-eyedropper fa-2x float-left"/> <div class="oe_mb32"> <p style="margin-left:45px;">Chat online with customers and website visitors in real time.</p> </div> - <span class="fa fa-font fa-2x pull-left"/> + <span class="fa fa-font fa-2x float-left"/> <div class="oe_mb32"> <p style="margin-left:45px;">No need for a special chat server, everything is done through your website.</p> </div> - <span class="fa fa-desktop fa-2x pull-left"/> + <span class="fa fa-desktop fa-2x float-left"/> <p style="margin-left:45px;"> Provide your visitors with information in a fast and simple way - direct chat with customers on your website has never been easier! </p> diff --git a/addons/im_livechat/views/im_livechat_channel_views.xml b/addons/im_livechat/views/im_livechat_channel_views.xml index bb24a19eb87..d3140bff09c 100644 --- a/addons/im_livechat/views/im_livechat_channel_views.xml +++ b/addons/im_livechat/views/im_livechat_channel_views.xml @@ -106,7 +106,7 @@ <templates> <t t-name="kanban-box"> <div> - <a t-if="!read_only_mode" type="delete" class="fa fa-times pull-right" aria-label="Delete" title="Delete"/> + <a t-if="!read_only_mode" type="delete" class="fa fa-times float-right" aria-label="Delete" title="Delete"/> <div class="o_kanban_image"> <img t-att-src="kanban_image('res.users', 'image', record.id.raw_value)" alt="User"/> </div> diff --git a/addons/l10n_de/report/din5008_report.xml b/addons/l10n_de/report/din5008_report.xml index fbdbfaf2cb6..1cc460fb5ce 100644 --- a/addons/l10n_de/report/din5008_report.xml +++ b/addons/l10n_de/report/din5008_report.xml @@ -36,10 +36,10 @@ </t> <div> <div class="header din"> - <div class="pull-right"> + <div class="float-right"> <h3 class="mt0 text-right" t-field="company.report_header"/> </div> - <img t-if="company.logo" t-att-src="'data:image/png;base64,%s' % to_text(company.logo)" class="pull-left"/> + <img t-if="company.logo" t-att-src="'data:image/png;base64,%s' % to_text(company.logo)" class="float-left"/> </div> <div class="article din"> diff --git a/addons/l10n_fr_hr_payroll/report/report_l10n_fr_fiche_paye.xml b/addons/l10n_fr_hr_payroll/report/report_l10n_fr_fiche_paye.xml index d2493457e62..0202926bb21 100644 --- a/addons/l10n_fr_hr_payroll/report/report_l10n_fr_fiche_paye.xml +++ b/addons/l10n_fr_hr_payroll/report/report_l10n_fr_fiche_paye.xml @@ -11,7 +11,7 @@ <h2>Bulletin de paie</h2> <h4>Paie du <span t-field="o.date_from"/> au <span t-field="o.date_to"/></h4> </div> - <div class="col-4 pull-right"> + <div class="col-4 float-right"> <table class="table table-bordered" stype="border: 2px solid black;"> <tr> <td> @@ -111,7 +111,7 @@ <table class="table table-round-border"> <tr> <td> - <div class="pull-right"> + <div class="float-right"> <strong>Net à payer </strong>: <span t-esc="get_total_by_rule_category(o, 'NET')"/> <strong>Total Charges Patronales</strong> : <span t-esc="get_total_by_rule_category(o, 'COMP')"/> </div> diff --git a/addons/lunch/report/lunch_order_templates.xml b/addons/lunch/report/lunch_order_templates.xml index bb38cac230c..d7ee34c837f 100644 --- a/addons/lunch/report/lunch_order_templates.xml +++ b/addons/lunch/report/lunch_order_templates.xml @@ -59,7 +59,7 @@ </table> <div class="row"> - <div class="col-4 pull-right"> + <div class="col-4 float-right"> <table class="table table-sm"> <tr class="border-black"> <td><strong>Total</strong></td> diff --git a/addons/lunch/static/src/xml/lunch.xml b/addons/lunch/static/src/xml/lunch.xml index 76d844cc258..59c9272eb4e 100644 --- a/addons/lunch/static/src/xml/lunch.xml +++ b/addons/lunch/static/src/xml/lunch.xml @@ -10,13 +10,13 @@ <div t-foreach="categories" t-as="supplier" class="col-lg-4"> <h3><t t-esc="supplier"/></h3> <div t-foreach='categories[supplier]' t-as='order' class="o_lunch_vignette"> - <button type="button" class="pull-right o_add_button oe_edit_only oe_link" t-att-data-id="order.line_id"> + <button type="button" class="float-right o_add_button oe_edit_only oe_link" t-att-data-id="order.line_id"> <span class="fa fa-plus-square"></span> <span>Add</span> </button> <div> <t t-esc="order.product_name"/> - <span class="badge badge-pill pull-right"> + <span class="badge badge-pill float-right"> <span class="o_lunch_price" t-raw="formatValue(order)"/> </span> </div> diff --git a/addons/lunch/views/lunch_views.xml b/addons/lunch/views/lunch_views.xml index 6db949deb3e..0b0d0e23f61 100644 --- a/addons/lunch/views/lunch_views.xml +++ b/addons/lunch/views/lunch_views.xml @@ -115,7 +115,7 @@ <t t-esc="record.date.value"/> </div> <div class="col-6"> - <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="24" height="24" class="oe_kanban_avatar pull-right"/> + <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="24" height="24" class="oe_kanban_avatar float-right"/> </div> </div> </div> @@ -409,7 +409,7 @@ </a> </div> <div class="col-6"> - <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="24" height="24" class="oe_kanban_avatar pull-right"/> + <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="24" height="24" class="oe_kanban_avatar float-right"/> </div> </div> </div> @@ -531,7 +531,7 @@ <div class="o_kanban_record_headings"> <strong class="o_kanban_record_title"><t t-esc="record.name.value"/></strong> </div> - <span class="badge badge-pill pull-right"> + <span class="badge badge-pill float-right"> Price: <t t-esc="record.price.value"/> </span> </div> @@ -643,7 +643,7 @@ <t t-esc="record.end_hour.value"/> </div> <div class="col-6"> - <span class="badge badge-pill pull-right"> + <span class="badge badge-pill float-right"> <t t-esc="record.alert_type.value"/> </span> </div> diff --git a/addons/mail/static/src/xml/systray.xml b/addons/mail/static/src/xml/systray.xml index afa646d0dff..85bc33d58d4 100644 --- a/addons/mail/static/src/xml/systray.xml +++ b/addons/mail/static/src/xml/systray.xml @@ -84,8 +84,8 @@ <span t-if="!activity.overdue_count" class="o_no_activity mr16">0 Late </span> <button t-if="activity.today_count" type="button" class="btn btn-link o_activity_filter_button mr16" t-att-data-res_model="activity.model" t-att-data-model_name="activity.name" data-filter='today'> <t t-esc="activity.today_count"/> Today </button> <span t-if="!activity.today_count" class="o_no_activity mr16">0 Today </span> - <button t-if="activity.planned_count" type="button" class="btn btn-link o_activity_filter_button pull-right" t-att-data-res_model="activity.model" t-att-data-model_name="activity.name" data-filter='upcoming_all'> <t t-esc="activity.planned_count"/> Future </button> - <span t-if="!activity.planned_count" class="o_no_activity pull-right">0 Future</span> + <button t-if="activity.planned_count" type="button" class="btn btn-link o_activity_filter_button float-right" t-att-data-res_model="activity.model" t-att-data-model_name="activity.name" data-filter='upcoming_all'> <t t-esc="activity.planned_count"/> Future </button> + <span t-if="!activity.planned_count" class="o_no_activity float-right">0 Future</span> </div> </div> </div> diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml index 4b7d13f8d35..b3443418c2b 100644 --- a/addons/mail/static/src/xml/thread.xml +++ b/addons/mail/static/src/xml/thread.xml @@ -42,7 +42,7 @@ <t t-esc="widget.activeAttachment.name"/> <a role="button" href="#" class="o_download_btn ml8 small" data-toggle="tooltip" data-placement="right" title="Download"><i class="fa fa-fw fa-download" role="img" aria-label="Download"/></a> </span> - <a role="button" class="o_close_btn pull-right" href="#" aria-label="Close" title="Close">×</a> + <a role="button" class="o_close_btn float-right" href="#" aria-label="Close" title="Close">×</a> </div> <div class="o_viewer_img_wrapper"> <div class="o_viewer_zoomer"> @@ -395,7 +395,7 @@ <t t-set="has_preview" t-value="type == 'image' or type == 'video' or attachment.mimetype == 'application/pdf'"/> <t t-set="ext" t-value="attachment.filename.split('.').pop()"/> - <div t-attf-class="o_image_box pull-left #{has_preview ? 'o_attachment_view' : ''}" t-att-data-id="attachment.id"> + <div t-attf-class="o_image_box float-left #{has_preview ? 'o_attachment_view' : ''}" t-att-data-id="attachment.id"> <div t-if="has_preview" class="o_image o_hover" t-att-style="type == 'image' ? 'background-image:url(/web/image/' + attachment.id + '/38x38/?crop=true' : '' " @@ -420,7 +420,7 @@ <div t-if="!editable" class="caption small"> <b t-if="has_preview" class="ml4 small text-uppercase o_attachment_view" t-att-data-id="attachment.id"><t t-esc="ext"/></b> <a t-else="" class="ml4 small text-uppercase" t-att-href="attachment.url" t-att-title="'Download ' + attachment.name"><b><t t-esc='ext'/></b></a> - <a class="ml4 o_attachment_download pull-right" t-att-title="'Download ' + attachment.name" t-att-href='attachment.url'><i t-attf-class="fa fa-download" role="img" aria-label="Download"/></a> + <a class="ml4 o_attachment_download float-right" t-att-title="'Download ' + attachment.name" t-att-href='attachment.url'><i t-attf-class="fa fa-download" role="img" aria-label="Download"/></a> </div> <div t-if="editable" class="o_attachment_uploaded"><i class="text-success fa fa-check" role="img" aria-label="Uploaded" title="Uploaded"/></div> <div t-if="editable" class="o_attachment_delete" t-att-data-id="attachment.id"><span class="text-white" role="img" aria-label="Delete" title="Delete">×</span></div> diff --git a/addons/mail/static/src/xml/web_kanban_activity.xml b/addons/mail/static/src/xml/web_kanban_activity.xml index 3e31d5c4bd5..9edac1a91fa 100644 --- a/addons/mail/static/src/xml/web_kanban_activity.xml +++ b/addons/mail/static/src/xml/web_kanban_activity.xml @@ -30,7 +30,7 @@ </strong> </li> <li t-foreach="logs" t-as="log" t-att-data-activity-id="log.id" class="nav-item o_schedule_activity" role="menuitem"> - <div class="o_activity_title pull-left"> + <div class="o_activity_title float-left"> <span t-attf-class="fa #{log.icon} fa-fw" role="img" aria-label="Log" title="Log"/> <strong> <t t-esc="log.title_action or log.activity_type_id[1]" /> @@ -44,7 +44,7 @@ </t> </div> </div> - <div class="pull-right"> + <div class="float-right"> <span class="o_mark_as_done o_activity_link o_activity_link_kanban fa fa-check-circle fa-2x mt4" t-att-data-activity-id="log.id" title="Mark as done" role="img" aria-label="Mark as done"/> </div> </li> diff --git a/addons/mail/views/mail_channel_views.xml b/addons/mail/views/mail_channel_views.xml index f73e88954ec..3d48c50e1b0 100644 --- a/addons/mail/views/mail_channel_views.xml +++ b/addons/mail/views/mail_channel_views.xml @@ -67,8 +67,8 @@ <p class="oe_module_name"> <field name="description"/> </p> - <button type="object" attrs="{'invisible':['|', ('is_subscribed','=',True), ('group_ids', '!=', [])]}" class="btn btn-primary pull-right" name="channel_join_and_get_info">Join</button> - <button type="object" attrs="{'invisible':['|', ('is_subscribed','=',False), ('group_ids', '!=', [])]}" class="btn btn-secondary pull-right" name="action_unfollow">Leave</button> + <button type="object" attrs="{'invisible':['|', ('is_subscribed','=',True), ('group_ids', '!=', [])]}" class="btn btn-primary float-right" name="channel_join_and_get_info">Join</button> + <button type="object" attrs="{'invisible':['|', ('is_subscribed','=',False), ('group_ids', '!=', [])]}" class="btn btn-secondary float-right" name="action_unfollow">Leave</button> </div> </div> </t> diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml index 5ca2a1bd494..72c39677357 100644 --- a/addons/mail/wizard/mail_compose_message_view.xml +++ b/addons/mail/wizard/mail_compose_message_view.xml @@ -79,7 +79,7 @@ <button string="Cancel" class="btn-secondary" special="cancel" /> <button icon="fa-lg fa-save" type="object" name="save_as_template" string="Save as new template" - class="pull-right btn-secondary" help="Save as a new template"/> + class="float-right btn-secondary" help="Save as a new template"/> </footer> </form> </field> diff --git a/addons/maintenance/views/maintenance_views.xml b/addons/maintenance/views/maintenance_views.xml index 58020d90526..a12bc655da8 100644 --- a/addons/maintenance/views/maintenance_views.xml +++ b/addons/maintenance/views/maintenance_views.xml @@ -62,7 +62,7 @@ </header> <sheet> <div attrs="{'invisible': [('archive', '=', False)]}"> - <span class="label label-warning pull-right">Canceled</span> + <span class="label label-warning float-right">Canceled</span> </div> <div class="oe_right"> <field name="kanban_state" class="oe_inline" widget="state_selection"/> @@ -164,7 +164,7 @@ </div> <div class="oe_kanban_bottom_right"> <field name="kanban_state" widget="state_selection"/> - <img t-att-src="kanban_image('res.users', 'image_small', record.technician_user_id.raw_value)" t-att-title="record.technician_user_id.value" t-att-alt="record.technician_user_id.value" width="24" height="24" class="oe_kanban_avatar pull-right"/> + <img t-att-src="kanban_image('res.users', 'image_small', record.technician_user_id.raw_value)" t-att-title="record.technician_user_id.value" t-att-alt="record.technician_user_id.value" width="24" height="24" class="oe_kanban_avatar float-right"/> </div> </div> </div> @@ -654,7 +654,7 @@ <div t-attf-class="oe_kanban_global_click"> <div class="mb4"> <strong><field name="name"/></strong> - <img t-att-src="kanban_image('res.users', 'image_small', record.technician_user_id.raw_value)" t-att-title="record.technician_user_id.value" t-att-alt="record.technician_user_id.value" width="24" height="24" class="oe_kanban_avatar pull-right"/> + <img t-att-src="kanban_image('res.users', 'image_small', record.technician_user_id.raw_value)" t-att-title="record.technician_user_id.value" t-att-alt="record.technician_user_id.value" width="24" height="24" class="oe_kanban_avatar float-right"/> </div> <div class="row mt4"> <div class="col-6"> diff --git a/addons/mrp/views/mrp_bom_views.xml b/addons/mrp/views/mrp_bom_views.xml index 460fa62b750..872b752d622 100644 --- a/addons/mrp/views/mrp_bom_views.xml +++ b/addons/mrp/views/mrp_bom_views.xml @@ -123,7 +123,7 @@ <div class="o_kanban_record_headings mt4"> <strong class="o_kanban_record_title"><span clatt="mt4"><field name="product_tmpl_id"/></span></strong> </div> - <span class="pull-right badge badge-pill"><t t-esc="record.product_qty.value"/> <small><t t-esc="record.product_uom_id.value"/></small></span> + <span class="float-right badge badge-pill"><t t-esc="record.product_qty.value"/> <small><t t-esc="record.product_uom_id.value"/></small></span> </div> </div> </t> diff --git a/addons/mrp/views/mrp_production_views.xml b/addons/mrp/views/mrp_production_views.xml index 15da2fae79c..592bf8f155b 100644 --- a/addons/mrp/views/mrp_production_views.xml +++ b/addons/mrp/views/mrp_production_views.xml @@ -188,7 +188,7 @@ <div class="o_kanban_record_headings mt4"> <strong class="o_kanban_record_title"><span><t t-esc="record.product_id.value"/></span></strong> </div> - <span class="pull-right text-right"><t t-esc="record.product_qty.value"/> <small><t t-esc="record.product_uom_id.value"/></small></span> + <span class="float-right text-right"><t t-esc="record.product_qty.value"/> <small><t t-esc="record.product_uom_id.value"/></small></span> </div> <div class="o_kanban_record_bottom"> <div class="oe_kanban_bottom_left text-muted"> diff --git a/addons/mrp/views/mrp_unbuild_views.xml b/addons/mrp/views/mrp_unbuild_views.xml index 6224809a45e..e811e2a6140 100644 --- a/addons/mrp/views/mrp_unbuild_views.xml +++ b/addons/mrp/views/mrp_unbuild_views.xml @@ -82,7 +82,7 @@ <span><t t-esc="record.product_id.value"/></span> </div> <div class="col-4"> - <span class="pull-right text-right"> + <span class="float-right text-right"> <field name="state" widget="kanban_label_selection" options="{'classes': {'draft': 'default', 'done': 'success'}}"/> </span> </div> diff --git a/addons/mrp/views/mrp_workcenter_views.xml b/addons/mrp/views/mrp_workcenter_views.xml index d2eb6ff081d..6d3ae464379 100644 --- a/addons/mrp/views/mrp_workcenter_views.xml +++ b/addons/mrp/views/mrp_workcenter_views.xml @@ -231,15 +231,15 @@ </div> <div class="row"> <div class="col-12 o_kanban_primary_left" style="position:absolute; bottom:10px;" name="wc_stages"> - <a name="%(act_mrp_block_workcenter)d" type="action" class="o_status pull-right" + <a name="%(act_mrp_block_workcenter)d" type="action" class="o_status float-right" title="No workorder currently in progress. Click to mark work center as blocked." aria-label="No workorder currently in progress. Click to mark work center as blocked." attrs="{'invisible': [('working_state','in',('blocked','done'))]}"/> - <a name="unblock" type="object" class=" o_status o_status_red pull-right" + <a name="unblock" type="object" class=" o_status o_status_red float-right" title="Workcenter blocked, click to unblock." aria-label="Workcenter blocked, click to unblock." attrs="{'invisible': [('working_state','in',('normal','done'))]}"/> - <a name="%(act_mrp_block_workcenter)d" type="action" class="o_status o_status_green pull-right" + <a name="%(act_mrp_block_workcenter)d" type="action" class="o_status o_status_green float-right" title="Work orders in progress. Click to block work center." aria-label="Work orders in progress. Click to block work center." attrs="{'invisible': [('working_state','in',('normal','blocked'))]}"/> @@ -491,7 +491,7 @@ </div> <div> <strong>Is a Blocking Reason? </strong> - <span class="pull-right" title="Is a Blocking Reason?"> + <span class="float-right" title="Is a Blocking Reason?"> <field name="manual" widget="boolean"/> </span> </div> diff --git a/addons/note/static/description/index.html b/addons/note/static/description/index.html index 31e54f4d1b9..d3cdcafd034 100644 --- a/addons/note/static/description/index.html +++ b/addons/note/static/description/index.html @@ -91,7 +91,7 @@ <div class="oe_row oe_spaced"> <h2 class="oe_slogan oe_mb32" style="color:#875A7B;">Integrate Odoo Notes into your workflow</h2> <div class="oe_span4"> - <span class="fa fa-lightbulb-o fa-2x pull-left"/> + <span class="fa fa-lightbulb-o fa-2x float-left"/> <h3> <b>Are you a creative?</b> </h3> @@ -105,7 +105,7 @@ </div> </div> <div class="oe_span4"> - <span class="fa fa-plane fa-2x pull-left"/> + <span class="fa fa-plane fa-2x float-left"/> <h3> <b>Are you a frequent traveler?</b> </h3> @@ -120,7 +120,7 @@ </div> </div> <div class="oe_span4"> - <span class="fa fa-suitcase fa-2x pull-left"/> + <span class="fa fa-suitcase fa-2x float-left"/> <h3> <b>Are you a manager?</b> </h3> diff --git a/addons/note/views/note_views.xml b/addons/note/views/note_views.xml index d9b5fb8f052..1eb10da652c 100644 --- a/addons/note/views/note_views.xml +++ b/addons/note/views/note_views.xml @@ -122,7 +122,7 @@ <t t-if="record.message_partner_ids.raw_value.length > 1"> <div class="clearfix"></div> <t t-foreach="record.message_partner_ids.raw_value" t-as="follower"> - <img t-att-src="kanban_image('res.partner', 'image_small', follower)" width="24" height="24" class="oe_kanban_avatar pull-right" t-att-data-member_id="follower" alt="Follower"/> + <img t-att-src="kanban_image('res.partner', 'image_small', follower)" width="24" height="24" class="oe_kanban_avatar float-right" t-att-data-member_id="follower" alt="Follower"/> </t> <div class="clearfix"></div> </t> diff --git a/addons/payment/views/payment_portal_templates.xml b/addons/payment/views/payment_portal_templates.xml index 76299f8bfc9..2bf24ed2bb1 100644 --- a/addons/payment/views/payment_portal_templates.xml +++ b/addons/payment/views/payment_portal_templates.xml @@ -98,7 +98,7 @@ </div> </div> <div> - <a role="button" t-attf-class="btn btn-#{status} pull-right" href="/my/home"><i class="fa fa-arrow-circle-right"/> Back to My Account</a> + <a role="button" t-attf-class="btn btn-#{status} float-right" href="/my/home"><i class="fa fa-arrow-circle-right"/> Back to My Account</a> </div> <div class="col-md-6 offset-md-6 text-muted mt16"><!-- FIXME should be in a row... --> <span t-field="tx.acquirer_id.image_small" t-att-title="tx.acquirer_id.name" role="img" t-att-aria-label="tx.acquirer_id.name" t-options='{"widget": "image", "style":"max-width: 60px; display: inline-block"}'/> diff --git a/addons/payment/views/payment_templates.xml b/addons/payment/views/payment_templates.xml index ff3902a8e51..65b00017810 100644 --- a/addons/payment/views/payment_templates.xml +++ b/addons/payment/views/payment_templates.xml @@ -65,7 +65,7 @@ </t> <span class="payment_option_name" t-esc="acq.name"/> </label> - <ul class="pull-right list-inline payment_icon_list"> + <ul class="float-right list-inline payment_icon_list"> <t t-set="i" t-value="0"/> <t t-foreach="acq.payment_icon_ids" t-as="pm_icon"> <li t-attf-class="list-inline-item#{'' if (i < MAX_BRAND_LINE) else ' d-none'}"> @@ -73,7 +73,7 @@ t-options='{"widget": "image", "alt-field": "name"}' /> </li> <li t-if="i==MAX_BRAND_LINE" style="display:block;" class="list-inline-item"> - <span class="pull-right more_option text-info"> + <span class="float-right more_option text-info"> <a href="#" class="o_payment_form_pay_icon_more" data-toggle="tooltip" t-att-title="', '.join([opt.name for opt in acq.payment_icon_ids[MAX_BRAND_LINE:]])">and more</a> </span> </li> @@ -102,7 +102,7 @@ name="pm_id" t-attf-value="form_{{acq.id}}"/> <span class="payment_icon_name" t-esc="acq.name"/> </label> - <ul class="pull-right list-inline payment_icon_list"> + <ul class="float-right list-inline payment_icon_list"> <t t-set="i" t-value="0"/> <t t-foreach="acq.payment_icon_ids" t-as="pm_icon"> <li t-attf-class="list-inline-item#{'' if (i < MAX_BRAND_LINE) else ' d-none'}"> @@ -110,7 +110,7 @@ t-options='{"widget": "image", "alt-field": "name"}' /> </li> <li t-if="i==MAX_BRAND_LINE" style="display:block;" class="list-inline-item"> - <span class="pull-right more_option text-info"> + <span class="float-right more_option text-info"> <a href="#" class="o_payment_form_pay_icon_more" data-toggle="tooltip" t-att-title="', '.join([opt.name for opt in acq.payment_icon_ids[MAX_BRAND_LINE:]])">and more</a> </span> </li> @@ -134,19 +134,19 @@ <i class="fa fa-close text-danger" title="This payment method has not been verified by our system." role="img" aria-label="Not verified"></i> </t> </label> - <button t-if="mode == 'manage'" name="delete_pm" t-att-value="pm.id" class="btn btn-primary btn-xs pull-right"> + <button t-if="mode == 'manage'" name="delete_pm" t-att-value="pm.id" class="btn btn-primary btn-xs float-right"> <i class="fa fa-trash"></i> Delete </button> </div> </t> </div> - <div t-if='back_button_txt' class="pull-left"> + <div t-if='back_button_txt' class="float-left"> <a role="button" t-att-href="back_button_link or '#'" t-att-class="back_button_class or 'btn btn-lg btn-secondary'"> <i t-if="back_button_icon_class" t-attf-class="fa {{back_button_icon_class}}"/> <t t-esc="back_button_txt"/> </a> </div> - <div class="pull-right"> + <div class="float-right"> <button t-if="mode == 'payment'" id="o_payment_form_pay" type="submit" t-att-class="submit_class if submit_class else 'btn btn-primary btn-lg mb8 mt8'"> <t t-if="submit_txt"> <i t-if="icon_class and not icon_right" t-attf-class="fa {{icon_class}}"/> diff --git a/addons/payment/views/payment_views.xml b/addons/payment/views/payment_views.xml index e0456fdb593..280036940e8 100644 --- a/addons/payment/views/payment_views.xml +++ b/addons/payment/views/payment_views.xml @@ -153,9 +153,9 @@ <t t-if="installed"> <field name="environment" widget="label_selection" options="{'classes': {'test': 'warning', 'production': 'success'}}"/> </t> - <button t-if="!installed" type="object" class="btn btn-secondary pull-right" name="button_immediate_install">Install</button> - <button t-if="installed and !record.website_published.raw_value" type="edit" class="btn btn-primary pull-right">Activate</button> - <button t-if="installed and record.website_published.raw_value" type="edit" class="btn btn-primary pull-right">Configure</button> + <button t-if="!installed" type="object" class="btn btn-secondary float-right" name="button_immediate_install">Install</button> + <button t-if="installed and !record.website_published.raw_value" type="edit" class="btn btn-primary float-right">Activate</button> + <button t-if="installed and record.website_published.raw_value" type="edit" class="btn btn-primary float-right">Configure</button> </div> </div> </t> @@ -304,7 +304,7 @@ <span><field name="partner_name"/></span> </div> <div class="col-6"> - <span class="pull-right"> + <span class="float-right"> <field name="amount" widget="monetary"/> </span> </div> diff --git a/addons/point_of_sale/views/pos_order_view.xml b/addons/point_of_sale/views/pos_order_view.xml index 9a120389630..99d90d9ef45 100644 --- a/addons/point_of_sale/views/pos_order_view.xml +++ b/addons/point_of_sale/views/pos_order_view.xml @@ -134,7 +134,7 @@ <span><t t-esc="record.date_order.value"/></span> </div> <div class="col-4"> - <span class="pull-right text-right"> + <span class="float-right text-right"> <field name="state" widget="kanban_label_selection" options="{'classes': {'draft': 'default', 'invoiced': 'success', 'cancel': 'danger'}}"/> </span> diff --git a/addons/point_of_sale/views/pos_session_view.xml b/addons/point_of_sale/views/pos_session_view.xml index 1175403a9a2..04766df77ca 100644 --- a/addons/point_of_sale/views/pos_session_view.xml +++ b/addons/point_of_sale/views/pos_session_view.xml @@ -172,7 +172,7 @@ <span><field name="start_at" /></span> </div> <div class="oe_kanban_bottom_right"> - <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="24" height="24" class="oe_kanban_avatar pull-right"/> + <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="24" height="24" class="oe_kanban_avatar float-right"/> </div> </div> </div> diff --git a/addons/point_of_sale/views/report_statement.xml b/addons/point_of_sale/views/report_statement.xml index 2a59d648b91..63dded422c7 100644 --- a/addons/point_of_sale/views/report_statement.xml +++ b/addons/point_of_sale/views/report_statement.xml @@ -63,7 +63,7 @@ </table> <div class="row"> - <div class="col-4 pull-right"> + <div class="col-4 float-right"> <table class="table table-sm"> <tr class="border-black"> <td><strong>Total</strong></td> diff --git a/addons/portal/static/src/scss/portal.scss b/addons/portal/static/src/scss/portal.scss index da6485d4b29..6c06675c466 100644 --- a/addons/portal/static/src/scss/portal.scss +++ b/addons/portal/static/src/scss/portal.scss @@ -50,7 +50,7 @@ header { visibility: hidden; } } - .nav.navbar-nav.pull-right { + .nav.navbar-nav.float-right { @include media-breakpoint-down(sm) { float: none!important; } @@ -130,10 +130,10 @@ hr { // Images spacing img, .media_iframe_video, .o_image { - &.pull-right { + &.float-right { margin-left: $grid-gutter-width / 2; } - &.pull-left { + &.float-left { margin-right: $grid-gutter-width / 2; } } diff --git a/addons/portal/static/src/xml/portal_chatter.xml b/addons/portal/static/src/xml/portal_chatter.xml index 683317020d2..d2e3bede900 100644 --- a/addons/portal/static/src/xml/portal_chatter.xml +++ b/addons/portal/static/src/xml/portal_chatter.xml @@ -24,7 +24,7 @@ <t t-if="widget.options['display_composer']"> <div class="media"> <div class="media-left"> - <img alt="Avatar" class="o_portal_chatter_avatar pull-left" t-attf-src="/web/image/res.partner/#{widget.options['partner_id']}/image_small/50x50"/> + <img alt="Avatar" class="o_portal_chatter_avatar float-left" t-attf-src="/web/image/res.partner/#{widget.options['partner_id']}/image_small/50x50"/> </div> <div class="media-body"> <form class="o_portal_chatter_composer_form" t-attf-action="/mail/chatter_post" method="POST"> diff --git a/addons/portal/static/src/xml/portal_signature.xml b/addons/portal/static/src/xml/portal_signature.xml index 5f99a3c2fef..e47998ac74f 100644 --- a/addons/portal/static/src/xml/portal_signature.xml +++ b/addons/portal/static/src/xml/portal_signature.xml @@ -8,7 +8,7 @@ </div> <div class="card mt16 mb0" id="o_portal_sign_draw"> <div class="card-header"> - <div class="pull-right"> + <div class="float-right"> <a role="button" id="o_portal_sign_clear" class="btn btn-xs">Clear</a> </div> <strong>Draw your signature</strong> @@ -16,7 +16,7 @@ <div id="o_portal_signature" class="card-body" style="padding: 0"/> </div> <div class="mt16 clearfix"> - <button type="submit" class="btn btn-primary o_portal_sign_submit pull-right"><t t-esc="widget.options.signLabel or 'Accept & Sign'"/></button> + <button type="submit" class="btn btn-primary o_portal_sign_submit float-right"><t t-esc="widget.options.signLabel or 'Accept & Sign'"/></button> </div> </form> </t> diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml index 0e940918847..357e53137cd 100644 --- a/addons/portal/views/portal_templates.xml +++ b/addons/portal/views/portal_templates.xml @@ -56,7 +56,7 @@ </main> <footer > <div class="container mt16 mb16" id="footer"> - <div class="pull-right" t-ignore="true" t-if="not editable"> + <div class="float-right" t-ignore="true" t-if="not editable"> Powered by <a target="_blank" href="http://www.odoo.com">Odoo</a> </div> </div> @@ -149,7 +149,7 @@ :param string filterby : name of the filter criteria :param default_url : the base url of the pages (like '/my/orders') :param boolean o_portal_search_panel : set to True to active the input search - :param html $0 : content of the t-call, <li class="pull-left">Link</li> + :param html $0 : content of the t-call, <li class="float-left">Link</li> :param title : bavbar title :param classes : navbar classes --> @@ -157,16 +157,16 @@ <nav t-attf-class="navbar o_portal_navbar {{classes if classes else 'o_portal_navbar_default'}}"> <div class="container-fluid"> <!-- Navbar title only --> - <div class="navbar-header pull-left"> + <div class="navbar-header float-left"> <t t-set="no_title">No title</t> <h3 class="navbar-brand"><t t-esc="title or no_title"/></h3> </div> <!-- Non-collapsing menu item(s) --> - <div class="navbar-header navbar-right pull-right"> - <ul class="nav pull-left"> + <div class="navbar-header navbar-right float-right"> + <ul class="nav float-left"> <t t-raw="0"/> - <li t-if="searchbar_sortings" class="dropdown pull-left ml16"> + <li t-if="searchbar_sortings" class="dropdown float-left ml16"> <button id="portal_searchbar_sortby" data-toggle="dropdown" class="btn btn-secondary dropdown-toggle navbar-btn"> <span class="fa fa-sort"/> <span class="d-none d-lg-inline"><t t-esc="searchbar_sortings[sortby].get('label', 'Newest')"/></span> @@ -180,7 +180,7 @@ </t> </div> </li> - <li t-if="searchbar_filters" class="dropdown pull-left ml4"> + <li t-if="searchbar_filters" class="dropdown float-left ml4"> <button id="portal_searchbar_filters" data-toggle="dropdown" class="btn btn-secondary dropdown-toggle navbar-btn"> <span class="fa fa-filter"/> <span class="d-none d-lg-inline"><t t-esc="searchbar_filters[filterby].get('label', 'All')"/></span> @@ -194,7 +194,7 @@ </t> </div> </li> - <li t-if="searchbar_groupby" class="dropdown pull-left ml4"> + <li t-if="searchbar_groupby" class="dropdown float-left ml4"> <button id="portal_searchbar_groupby" data-toggle="dropdown" class="btn btn-secondary dropdown-toggle navbar-btn"> <span class="fa fa-object-group"/> <span class="d-none d-lg-inline"><t t-esc="searchbar_groupby[groupby].get('label', 'None')"/></span> @@ -255,12 +255,12 @@ <t t-foreach="archive_groups" t-as="group"> <t t-if="group['date_begin'] == date"> <li class="nav-item"> - <a t-att-href="default_url" class="nav-link active" t-ignore="True"><t t-esc="group['name']"/><span class="pull-right badge badge-pill" t-esc="group['item_count']"/></a> + <a t-att-href="default_url" class="nav-link active" t-ignore="True"><t t-esc="group['name']"/><span class="float-right badge badge-pill" t-esc="group['item_count']"/></a> </li> </t> <t t-if="group['date_begin'] != date"> <li class="nav-item"> - <a t-ignore="True" t-attf-href="#{default_url}?date_begin=#{group['date_begin']}&date_end=#{group['date_end']}" class="nav-link"><t t-esc="group['name']"/><span class="pull-right badge badge-pill" t-esc="group['item_count']"/></a> + <a t-ignore="True" t-attf-href="#{default_url}?date_begin=#{group['date_begin']}&date_end=#{group['date_end']}" class="nav-link"><t t-esc="group['name']"/><span class="float-right badge badge-pill" t-esc="group['item_count']"/></a> </li> </t> </t> @@ -343,7 +343,7 @@ <input type="hidden" name="redirect" t-att-value="redirect"/> </div> <div class="clearfix"> - <button type="submit" class="btn btn-primary pull-right mb32 "> + <button type="submit" class="btn btn-primary float-right mb32 "> Confirm <span class="fa fa-long-arrow-right" /> </button> @@ -356,7 +356,7 @@ <template id="record_pager" name="Portal Record Pager"> <t t-if='prev_record or next_record'> - <div class="ml8 record_pager btn-group btn-group-xs pull-right" role="group"> + <div class="ml8 record_pager btn-group btn-group-xs float-right" role="group"> <a role="button" t-att-class="'btn btn-secondary %s' % ('disabled' if not prev_record else '')" t-att-href="prev_record or '#'" ><i class="fa fa-arrow-left" role="img" aria-label="Previous" title="Previous"></i></a> <a role="button" t-att-class="'btn btn-secondary %s' % ('disabled' if not next_record else '')" t-att-href="next_record or '#'" ><i class="fa fa-arrow-right" role="img" aria-label="Next" title="Previous"></i></a> </div> diff --git a/addons/project/views/project_portal_templates.xml b/addons/project/views/project_portal_templates.xml index 8cc18b33232..8c3f4cdfafe 100644 --- a/addons/project/views/project_portal_templates.xml +++ b/addons/project/views/project_portal_templates.xml @@ -100,7 +100,7 @@ </t> </div> <div class="col-lg-6"> - <div class="pull-right"> + <div class="float-right"> <a role="button" t-attf-href="/my/tasks?filterby=#{project.id}" class="btn btn-secondary btn-lg"> <span class="fa fa-tasks" role="img" aria-label="Tasks" title="Tasks"/> <span t-esc="project.task_count" /> @@ -169,7 +169,7 @@ <div class="col-lg-12"> <h4> Task - <span t-field="task.name"/> (#<span t-esc="task.id"/>) - <span t-field="task.stage_id.name" class="pull-right label label-info" title="Current stage of this task"/> + <span t-field="task.stage_id.name" class="float-right label label-info" title="Current stage of this task"/> <a role="button" class="btn btn-info" t-att-href="'/web#return_label=Website&model=project.task&id=%s&view_type=form' % (task.id)" groups="project.group_project_user">Edit Task</a> </h4> </div> diff --git a/addons/project/views/project_rating_templates.xml b/addons/project/views/project_rating_templates.xml index bd6a9be5c36..da741eecb2f 100644 --- a/addons/project/views/project_rating_templates.xml +++ b/addons/project/views/project_rating_templates.xml @@ -24,7 +24,7 @@ <div class="card"> <div class="card-body"> <div class="caption"> - <span class="label label-default pull-right"><t t-esc="project.privacy_visibility"/></span> + <span class="label label-default float-right"><t t-esc="project.privacy_visibility"/></span> <h4><t t-esc="project.name"/></h4> <p t-if="project.date" class="text-muted"> <i class="fa fa-calendar"/> End date : <t t-esc="project.date"/> @@ -118,7 +118,7 @@ </div> </div> <div class="col-md-3 o_smiley_no_padding_left"> - <strong class="pull-right"><t t-esc="partner_stat['percentage_happy']"/>%</strong> + <strong class="float-right"><t t-esc="partner_stat['percentage_happy']"/>%</strong> </div> </div> </t> diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml index 7334c48f41d..c900b426c6d 100644 --- a/addons/project/views/project_views.xml +++ b/addons/project/views/project_views.xml @@ -236,7 +236,7 @@ </div> <div class="col-4"> <div class="oe_kanban_bottom_right"> - <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="24" height="24" class="oe_kanban_avatar pull-right"/> + <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="24" height="24" class="oe_kanban_avatar float-right"/> </div> </div> </div> diff --git a/addons/purchase/report/purchase_order_templates.xml b/addons/purchase/report/purchase_order_templates.xml index 11e47d2dada..db633b3c474 100644 --- a/addons/purchase/report/purchase_order_templates.xml +++ b/addons/purchase/report/purchase_order_templates.xml @@ -79,7 +79,7 @@ </table> <div class="row"> - <div class="col-4 pull-right"> + <div class="col-4 float-right"> <table class="table table-sm"> <tr class="border-black"> <td><strong>Subtotal</strong></td> diff --git a/addons/purchase_requisition/views/purchase_requisition_views.xml b/addons/purchase_requisition/views/purchase_requisition_views.xml index 05227046064..d0bb39927dc 100644 --- a/addons/purchase_requisition/views/purchase_requisition_views.xml +++ b/addons/purchase_requisition/views/purchase_requisition_views.xml @@ -160,7 +160,7 @@ <field name="order_count" widget="statinfo" string="RFQs/Orders"/> </button> </div> - <div class="pull-left"> + <div class="float-left"> <label for="name" class="oe_edit_only oe_inline"/> <h1> <field name="name"/> @@ -263,7 +263,7 @@ <field name="vendor_id"/> </div> <div class="oe_kanban_bottom_right"> - <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="24" height="24" class="oe_kanban_avatar pull-right"/> + <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="24" height="24" class="oe_kanban_avatar float-right"/> </div> </div> </div> diff --git a/addons/rating/views/rating_template.xml b/addons/rating/views/rating_template.xml index 161cd8276f3..4e9bacdb0cd 100644 --- a/addons/rating/views/rating_template.xml +++ b/addons/rating/views/rating_template.xml @@ -30,7 +30,7 @@ <div clas="row"> <h1 class="text-center">Thanks! We appreciate your feedback.</h1> <h4 class="text-center text-muted" style="margin-bottom: 32px;">Your rating has been submitted.</h4> - <div class="pull-left"> + <div class="float-left"> <img t-attf-src='/rating/static/src/img/rating_#{rate}.png' t-att-alt="rate.name"/> </div> <div style="margin-left: 80px;"> diff --git a/addons/rating/views/rating_view.xml b/addons/rating/views/rating_view.xml index 66d279da911..aaca9062c6f 100644 --- a/addons/rating/views/rating_view.xml +++ b/addons/rating/views/rating_view.xml @@ -96,7 +96,7 @@ on <field name="create_date" /> </li> </ul> - <i t-if="record.feedback.raw_value" class="fa fa-comment pull-right mt4" t-attf-title="Feedback:\n#{record.feedback.raw_value}" t-attf-aria-label="Feedback:\n#{record.feedback.raw_value}" role="img"/> + <i t-if="record.feedback.raw_value" class="fa fa-comment float-right mt4" t-attf-title="Feedback:\n#{record.feedback.raw_value}" t-attf-aria-label="Feedback:\n#{record.feedback.raw_value}" role="img"/> </div> </div> </t> diff --git a/addons/repair/report/repair_templates_repair_order.xml b/addons/repair/report/repair_templates_repair_order.xml index b21a054b7f6..473bc789040 100644 --- a/addons/repair/report/repair_templates_repair_order.xml +++ b/addons/repair/report/repair_templates_repair_order.xml @@ -119,7 +119,7 @@ </table> <div class="row"> - <div class="col-4 pull-right"> + <div class="col-4 float-right"> <table class="table table-sm"> <t t-if="o.invoice_method !='none'"> <tr class="border-black"> diff --git a/addons/repair/views/repair_views.xml b/addons/repair/views/repair_views.xml index 22f7e8f9efc..7476d054b10 100644 --- a/addons/repair/views/repair_views.xml +++ b/addons/repair/views/repair_views.xml @@ -214,7 +214,7 @@ <span><t t-esc="record.product_id.value"/></span> </div> <div class="col-6"> - <span class="pull-right"> + <span class="float-right"> <field name="partner_id"/> </span> </div> diff --git a/addons/sale/report/sale_report_templates.xml b/addons/sale/report/sale_report_templates.xml index 6b0f285b5bd..13de93ff46c 100644 --- a/addons/sale/report/sale_report_templates.xml +++ b/addons/sale/report/sale_report_templates.xml @@ -166,7 +166,7 @@ <div class="clearfix"> <div class="row" name="total"> - <div class="col-4 pull-right"> + <div class="col-4 float-right"> <table class="table table-sm" style="min-width: 200px;max-width: 350px;"> <tr class="border-black" style="border-bottom:1px solid #dddddd;"> <td><strong>Subtotal</strong></td> diff --git a/addons/sale/views/sale_portal_templates.xml b/addons/sale/views/sale_portal_templates.xml index bd743596760..f1ac9d6a7dd 100644 --- a/addons/sale/views/sale_portal_templates.xml +++ b/addons/sale/views/sale_portal_templates.xml @@ -147,17 +147,17 @@ </div> <div class="col-lg-6 col-md-3 col-3 d-print-none" id="o_portal_order_actions"> <t t-if="order.state == 'sent' and portal_confirmation == 'sign'" name="portal_confirmation_sign"> - <a role="button" class="btn btn-primary ml8 pull-right" href="#portal_sign"> + <a role="button" class="btn btn-primary ml8 float-right" href="#portal_sign"> <i class="fa fa-arrow-circle-right"/> Accept & Sign </a> </t> <t t-if="order.state == 'sale' and portal_confirmation == 'sign'"> - <a role="button" class="btn btn-success ml8 pull-right" disabled="disabled" + <a role="button" class="btn btn-success ml8 float-right" disabled="disabled" t-attf-title="Order signed on #{order.confirmation_date} by #{order.partner_id.name}"> <i class="fa fa-check-circle"/> Signed </a> </t> - <a target="_blank" t-att-href="'/my/orders/pdf/%s?%s' % (order.id, keep_query())" class="ml8 pull-right mt4 mr8" title="Download"> + <a target="_blank" t-att-href="'/my/orders/pdf/%s?%s' % (order.id, keep_query())" class="ml8 float-right mt4 mr8" title="Download"> <i class="fa fa-download fa-2x" role="img" aria-label="Download"/> </a> </div> diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml index 6a384eb2f82..5c711dfe2c8 100644 --- a/addons/sale/views/sale_views.xml +++ b/addons/sale/views/sale_views.xml @@ -463,7 +463,7 @@ </div> <div class="col-4"> <strong> - <span class="pull-right text-right"> + <span class="float-right text-right"> <t t-esc="record.price_subtotal.value"/> </span> </strong> diff --git a/addons/sale_payment/views/sale_portal_templates.xml b/addons/sale_payment/views/sale_portal_templates.xml index c283b7ca722..75ed89b9145 100644 --- a/addons/sale_payment/views/sale_portal_templates.xml +++ b/addons/sale_payment/views/sale_portal_templates.xml @@ -3,12 +3,12 @@ <xpath expr="//t[@name='portal_confirmation_sign']" position="after"> <t t-set="payment_tx_id" t-value="order.get_portal_last_transaction()"/> <t t-if="order.amount_total and not invoices and order.state in ('sent', 'sale') and portal_confirmation == 'pay' and payment_tx_id.state != 'done'" name="portal_confirmation_pay"> - <a class="btn btn-primary ml8 pull-right" href="#portal_pay" role="button"> + <a class="btn btn-primary ml8 float-right" href="#portal_pay" role="button"> <i class="fa fa-arrow-circle-right"/> Pay Now </a> </t> <t t-if="invoices and order.state in ('sale', 'done') and portal_confirmation == 'pay'"> - <a role="button" class="btn btn-primary ml8 pull-right" disabled="disabled"> + <a role="button" class="btn btn-primary ml8 float-right" disabled="disabled"> <i class="fa fa-check-circle"/> Done </a> </t> diff --git a/addons/sale_stock/report/stock_report_deliveryslip.xml b/addons/sale_stock/report/stock_report_deliveryslip.xml index 179ac6c573f..9fe7da5a003 100644 --- a/addons/sale_stock/report/stock_report_deliveryslip.xml +++ b/addons/sale_stock/report/stock_report_deliveryslip.xml @@ -3,7 +3,7 @@ <template id="report_delivery_document_inherit_sale_stock" inherit_id="stock.report_delivery_document"> <xpath expr="//h2" position="before"> <div class="row" t-if="o.sale_id.client_order_ref"> - <div class="col-4 pull-right"> + <div class="col-4 float-right"> <strong>Customer Reference:</strong> <p t-field="o.sale_id.client_order_ref"/> </div> diff --git a/addons/sale_timesheet/views/hr_timesheet_templates.xml b/addons/sale_timesheet/views/hr_timesheet_templates.xml index 786f578b97e..f6a81d27b3a 100644 --- a/addons/sale_timesheet/views/hr_timesheet_templates.xml +++ b/addons/sale_timesheet/views/hr_timesheet_templates.xml @@ -159,7 +159,7 @@ <p>There is no timesheet for now.</p> </t> <t t-if="repartition_employee"> - <div class="pull-right o_timesheet_plan_badge"> + <div class="float-right o_timesheet_plan_badge"> <span class="badge badge-pill o_progress_billable_fixed"> <a type="action" t-att-domain="json.dumps(timesheet_domain + [('timesheet_invoice_type','=','billable_fixed')])">Billable fixed</a> </span> diff --git a/addons/sales_team/views/crm_team_views.xml b/addons/sales_team/views/crm_team_views.xml index 043470fddb1..d732fb992da 100644 --- a/addons/sales_team/views/crm_team_views.xml +++ b/addons/sales_team/views/crm_team_views.xml @@ -136,7 +136,7 @@ <strong><field name="name"/></strong> </div> <div class="col-6"> - <span class="pull-right"><field name="user_id"/></span> + <span class="float-right"><field name="user_id"/></span> </div> </div> </div> diff --git a/addons/sms/static/src/xml/sms_widget.xml b/addons/sms/static/src/xml/sms_widget.xml index 10bac7e04e5..62d356e3a70 100644 --- a/addons/sms/static/src/xml/sms_widget.xml +++ b/addons/sms/static/src/xml/sms_widget.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <templates> <t t-name="sms.sms_count"> - <span class="pull-right"><span class="text-muted o_sms_count"></span> <a href="https://iap-services.odoo.com/iap/sms/pricing" target="_blank" class="fa fa-lg fa-info-circle" aria-label="SMS Pricing" title="SMS Pricing"/></span> + <span class="float-right"><span class="text-muted o_sms_count"></span> <a href="https://iap-services.odoo.com/iap/sms/pricing" target="_blank" class="fa fa-lg fa-info-circle" aria-label="SMS Pricing" title="SMS Pricing"/></span> </t> </templates> diff --git a/addons/snailmail/wizard/multi_compose_message_views.xml b/addons/snailmail/wizard/multi_compose_message_views.xml index eb745dee905..47d595e0685 100644 --- a/addons/snailmail/wizard/multi_compose_message_views.xml +++ b/addons/snailmail/wizard/multi_compose_message_views.xml @@ -8,11 +8,11 @@ <field name="arch" type="xml"> <xpath expr="//div[@name='option_email']" position='before'> <div name="option_letter" class="col-md-12 mb16"> - <div name="option" class="pull-left"> + <div name="option" class="float-left"> <field name="snailmail_send_by_letter" widget="boolean_toggle"/> <b><label for="snailmail_send_by_letter"/></b> </div> - <div class="pull-right" name='cost' attrs="{'invisible': [('snailmail_send_by_letter','=',False)]}"> + <div class="float-right" name='cost' attrs="{'invisible': [('snailmail_send_by_letter','=',False)]}"> <field name="currency_id" invisible="1"/> <b><field name="snailmail_cost" widget='monetary' options="{'currency_field': 'currency_id'}"/></b> </div> diff --git a/addons/stock/report/report_package_barcode.xml b/addons/stock/report/report_package_barcode.xml index a16e4740f89..25d3bfb5cc7 100644 --- a/addons/stock/report/report_package_barcode.xml +++ b/addons/stock/report/report_package_barcode.xml @@ -8,8 +8,8 @@ <div class="page"> <div class="oe_structure"/> <img t-att-src="'/report/barcode/?type=%s&value=%s&width=%s&height=%s' % ('Code128', o.name, 600, 100)" alt="Barcode" - style="width:300px;height:50px" class="pull-right mb16"/> - <h1 t-field="o.name" class="mt0 pull-left"/> + style="width:300px;height:50px" class="float-right mb16"/> + <h1 t-field="o.name" class="mt0 float-left"/> <div class="row o_packaging_type" t-if="o.packaging_id"> <div class="col-12" style="font-weight:bold;">Package Type: <span t-field="o.packaging_id.name"/></div> </div> diff --git a/addons/stock/report/report_stockinventory.xml b/addons/stock/report/report_stockinventory.xml index bb5738a1cba..ff28a190b8b 100644 --- a/addons/stock/report/report_stockinventory.xml +++ b/addons/stock/report/report_stockinventory.xml @@ -59,7 +59,7 @@ <t t-if="o.filter == 'product' and o.product_id"> <div class="row"> - <div class="col-4 pull-right"> + <div class="col-4 float-right"> <table class="table table-sm"> <tr class="border-black"> <td><strong>Total Quantity</strong></td> diff --git a/addons/stock/report/report_stockpicking_operations.xml b/addons/stock/report/report_stockpicking_operations.xml index 5cdcd0d5c08..c4bc8297f08 100644 --- a/addons/stock/report/report_stockpicking_operations.xml +++ b/addons/stock/report/report_stockpicking_operations.xml @@ -8,7 +8,7 @@ <t t-call="web.external_layout"> <div class="page"> <div class="row mb16"> - <div class="col-4 pull-right" name="right_box"> + <div class="col-4 float-right" name="right_box"> <img t-att-src="'/report/barcode/?type=%s&value=%s&width=%s&height=%s' % ('Code128', o.name, 600, 100)" style="width:300px;height:50px;" alt="Barcode"/> </div> </div> @@ -43,7 +43,7 @@ </div> </div> <br/> - <h1 t-field="o.name" class="mt0 pull-left"/> + <h1 t-field="o.name" class="mt0 float-left"/> <div class="clearfix"/> <table class="table table-sm"> <thead> diff --git a/addons/stock/views/stock_move_views.xml b/addons/stock/views/stock_move_views.xml index 4196c3d927a..e04fed8f4c0 100644 --- a/addons/stock/views/stock_move_views.xml +++ b/addons/stock/views/stock_move_views.xml @@ -446,7 +446,7 @@ <strong><span><field name="product_id"/></span></strong> </div> <div class="col-4"> - <span class="pull-right text-right"> + <span class="float-right text-right"> <field name="state" widget="kanban_label_selection" options="{'classes': {'draft': 'default', 'cancel': 'danger', 'assigned': 'success', 'confirmed': 'default'}}"/> </span> @@ -457,7 +457,7 @@ <strong><span><field name="priority" widget="priority"/></span></strong> </div> <div class="col-8"> - <span class="pull-right"> + <span class="float-right"> <i class="fa fa-clock-o" role="img" aria-label="Date" title="Date"/> <field name="date"/> </span> </div> @@ -501,7 +501,7 @@ <div class="col-6"> <strong><field name="product_id"/></strong> </div> - <div class="col-6 pull-right text-right"> + <div class="col-6 float-right text-right"> <strong>Qty: </strong><field name="product_uom_qty"/> </div> </div> @@ -510,7 +510,7 @@ <field name="priority" widget="priority"/> </div> <div class="col-6"> - <span class="pull-right"> + <span class="float-right"> <field name="state" widget="kanban_label_selection" options="{'classes': {'draft': 'info', 'cancel': 'default', 'assigned': 'success', 'done': 'success'}}"/> </span> diff --git a/addons/stock/views/stock_scrap_views.xml b/addons/stock/views/stock_scrap_views.xml index 0fe7c67ed43..60c5ff999d9 100644 --- a/addons/stock/views/stock_scrap_views.xml +++ b/addons/stock/views/stock_scrap_views.xml @@ -95,7 +95,7 @@ <span t-esc="record.scrap_qty.value"/> </div> <div class="col-6"> - <span class="pull-right label label-default"> + <span class="float-right label label-default"> <field name="state"/> </span> </div> diff --git a/addons/stock_account/views/product_views.xml b/addons/stock_account/views/product_views.xml index 0b69dcfdc6c..faf7bee4126 100644 --- a/addons/stock_account/views/product_views.xml +++ b/addons/stock_account/views/product_views.xml @@ -41,7 +41,7 @@ <field name="standard_price" attrs="{'readonly':[('valuation','=','real_time')]}" widget='monetary' options="{'currency_field': 'currency_id', 'field_digits': True}" - class="pull-left"/> + class="float-left"/> <div name="update_cost_price" class="col-lg-2"> <button string="Update Cost" type="action" name="%(action_view_change_standard_price)d" @@ -77,7 +77,7 @@ <label for="standard_price"/> <field name="standard_price" attrs="{'readonly':[('valuation','=','real_time')]}" - widget='monetary' options="{'currency_field': 'currency_id', 'field_digits': True}" class="pull-left"/> + widget='monetary' options="{'currency_field': 'currency_id', 'field_digits': True}" class="float-left"/> <div name="update_cost_price" class="col-lg-2"> <button string="Update Cost" type="action" name="%(action_view_change_standard_price)d" diff --git a/addons/stock_landed_costs/views/stock_landed_cost_views.xml b/addons/stock_landed_costs/views/stock_landed_cost_views.xml index 8e80e62e3b2..643618c8b4f 100644 --- a/addons/stock_landed_costs/views/stock_landed_cost_views.xml +++ b/addons/stock_landed_costs/views/stock_landed_cost_views.xml @@ -130,7 +130,7 @@ <span t-esc="record.name.value"/> </strong> <div class="col-6"> - <span class="pull-right label label-default"> + <span class="float-right label label-default"> <field name="state"/> </span> </div> diff --git a/addons/survey/static/description/index.html b/addons/survey/static/description/index.html index 0f16f3ec7b8..c106f2168bb 100644 --- a/addons/survey/static/description/index.html +++ b/addons/survey/static/description/index.html @@ -18,7 +18,7 @@ One platform to manage it all: automate appraisals, satisfaction surveys, marketing campaign, feedback forms, etc. </p> <div class="oe_span6"> - <span class="fa fa-pencil fa-2x pull-left"></span> + <span class="fa fa-pencil fa-2x float-left"></span> <h3> <b>Design and test your survey</b> </h3> @@ -26,7 +26,7 @@ Create appealing and clear survey forms with no effort thanks to Odoo's intuitive building blocks where you immediately see how it looks like. Edit inline content at any time.</p> </div> <div class="oe_span6"> - <span class="fa fa-share fa-2x pull-left"></span> + <span class="fa fa-share fa-2x float-left"></span> <h3> <b>Share and collect data</b> </h3> @@ -36,7 +36,7 @@ </div> <div class="oe_row"> <div class="oe_span6"> - <span class="fa fa-search-plus fa-2x pull-left"></span> + <span class="fa fa-search-plus fa-2x float-left"></span> <h3> <b>Analyze answers</b> </h3> @@ -44,7 +44,7 @@ No need to synchronize results with your database. Odoo takes care of it automatically! Obtain results and view results charts in real time.</p> </div> <div class="oe_span6"> - <span class="fa fa-line-chart fa-2x pull-left"></span> + <span class="fa fa-line-chart fa-2x float-left"></span> <h3> <b>Immediately benefit from the results</b> </h3> diff --git a/addons/survey/views/survey_result.xml b/addons/survey/views/survey_result.xml index f3bcda59738..b4a4d0a8c0f 100644 --- a/addons/survey/views/survey_result.xml +++ b/addons/survey/views/survey_result.xml @@ -7,11 +7,11 @@ <div class="container js_surveyresult"> <t t-call="survey.back" /> <div class="jumbotron mt32"> - <h1><span t-field="survey.title" /> <span style="font-size:1.5em;" class="fa fa-bar-chart-o pull-right " role="img" aria-label="Chart" title="Chart"/></h1> + <h1><span t-field="survey.title" /> <span style="font-size:1.5em;" class="fa fa-bar-chart-o float-right " role="img" aria-label="Chart" title="Chart"/></h1> <div t-field="survey.description" class="oe_no_empty" /> </div> <div class="card d-print-none"> - <div class="card-header"><span class="fa fa-filter"></span> Filters <span t-if="filter_display_data" class="pull-right text-primary clear_survey_filter"><i class="fa fa-times"></i> Clear All Filters</span></div> + <div class="card-header"><span class="fa fa-filter"></span> Filters <span t-if="filter_display_data" class="float-right text-primary clear_survey_filter"><i class="fa fa-times"></i> Clear All Filters</span></div> <div class="card-body"> <span t-if="filter_finish == True"> <span class="label label-default only_left_radius filter-all">All surveys</span><span class="label label-primary only_right_radius filter-finished">Finished surveys</span> @@ -43,7 +43,7 @@ <t t-if="question.type in ['simple_choice', 'multiple_choice']"> <small><span t-field='question.type' class="label label-default"></span></small> </t> - <span class="pull-right"> + <span class="float-right"> <span class="label label-success"><span t-esc="input_summary['answered']"></span> Answered</span> <span class="label label-danger"><span t-esc="input_summary['skipped']"></span> Skipped</span> </span> @@ -255,7 +255,7 @@ <template id="result_number" name="Number Result"> <t t-set="number_result" t-value="prepare_result"/> <t t-set="text_result" t-value="number_result['input_lines']" /> - <span class="pull-right mt8"> + <span class="float-right mt8"> <span class="label label-default only_left_radius">Sum </span> <span class="label label-info only_right_radius" t-esc="number_result['sum']"></span> <span class="label label-default only_left_radius">Maximum </span> <span class="label label-success only_right_radius" t-esc="number_result['max']"></span> <span class="label label-default only_left_radius">Minimum </span> <span class="label label-danger only_right_radius" t-esc="number_result['min']"></span> @@ -323,7 +323,7 @@ <div class="jumbotron mt32"> <h2 class="text-muted"> <span> - <i style="font-size:1.8em" class="fa fa-users pull-right" role="img" aria-label="No answer" title="No answer"></i> + <i style="font-size:1.8em" class="fa fa-users float-right" role="img" aria-label="No answer" title="No answer"></i> </span> Sorry, No one answered this survey yet </h2> diff --git a/addons/survey/views/survey_templates.xml b/addons/survey/views/survey_templates.xml index 684031255a2..cd6c795c3f6 100644 --- a/addons/survey/views/survey_templates.xml +++ b/addons/survey/views/survey_templates.xml @@ -98,7 +98,7 @@ <!-- Back Button to redirect in form view of survey --> <template id="back" name="Back"> - <div groups="website.group_website_publisher" t-ignore="true" class="pull-right"> + <div groups="website.group_website_publisher" t-ignore="true" class="float-right"> <a role="button" t-attf-href="/web#view_type=form&model=survey.survey&id=#{survey.id}&action=survey.action_survey_form" class="btn btn-secondary">Back to Survey</a> </div> </template> @@ -124,11 +124,11 @@ </body> <xpath expr="//footer" position="replace"> <div class="container mt16 mb8"> - <div class="pull-right" t-ignore="true" t-if="not editable"> + <div class="float-right" t-ignore="true" t-if="not editable"> Create a <a target="_blank" href="https://www.odoo.com/page/website-builder">free website</a> with <a target="_blank" class="label label-danger" href="https://www.odoo.com/page/website-builder">Odoo</a> </div> - <div class="pull-left text-muted" itemscope="itemscope" itemtype="https://schema.org/Organization"> + <div class="float-left text-muted" itemscope="itemscope" itemtype="https://schema.org/Organization"> Copyright &copy; <span t-field="res_company.name" itemprop="name">Company name</span> </div> </div> @@ -173,7 +173,7 @@ <!-- A page --> <template id="page" name="Page"> <div class="page-header"> - <p class="pull-right">Page <span t-raw='page_nr + 1'/> of <span t-raw="len(survey.page_ids)"/></p> + <p class="float-right">Page <span t-raw='page_nr + 1'/> of <span t-raw="len(survey.page_ids)"/></p> <h1 t-field='page.title' /> <div t-field='page.description' class="oe_no_empty"/> </div> diff --git a/addons/web/static/src/js/views/kanban/kanban_column_quick_create.js b/addons/web/static/src/js/views/kanban/kanban_column_quick_create.js index 170b950a49d..b2a38d4e53e 100644 --- a/addons/web/static/src/js/views/kanban/kanban_column_quick_create.js +++ b/addons/web/static/src/js/views/kanban/kanban_column_quick_create.js @@ -184,7 +184,7 @@ var ColumnQuickCreate = Widget.extend({ examples: this.examples, })), buttons: [{ - classes: 'btn-primary pull-right', + classes: 'btn-primary float-right', close: true, text: _t('Got it'), }], diff --git a/addons/web/static/src/js/views/kanban/kanban_record.js b/addons/web/static/src/js/views/kanban/kanban_record.js index 09fb956e52c..627543b3422 100644 --- a/addons/web/static/src/js/views/kanban/kanban_record.js +++ b/addons/web/static/src/js/views/kanban/kanban_record.js @@ -349,7 +349,7 @@ var KanbanRecord = Widget.extend({ _setFieldDisplay: function ($el, fieldName) { // attribute display if (this.fieldsInfo[fieldName].display === 'right') { - $el.addClass('pull-right'); + $el.addClass('float-right'); } else if (this.fieldsInfo[fieldName].display === 'full') { $el.addClass('o_text_block'); } diff --git a/addons/web/static/src/js/views/search/filters_menu.js b/addons/web/static/src/js/views/search/filters_menu.js index cf79bec2640..af5425ec2d7 100644 --- a/addons/web/static/src/js/views/search/filters_menu.js +++ b/addons/web/static/src/js/views/search/filters_menu.js @@ -76,7 +76,7 @@ var FiltersMenu = DropdownMenu.extend({ category: 'filterCategory', title: 'Filters', icon: 'fa fa-filter', - symbol: this.isMobile ? 'fa fa-chevron-right pull-right mt4' : false, + symbol: this.isMobile ? 'fa fa-chevron-right float-right mt4' : false, }; this._super(parent, dropdownHeader, filters, this.fields); }, diff --git a/addons/web/static/src/js/views/search/groupby_menu.js b/addons/web/static/src/js/views/search/groupby_menu.js index 8540e702589..d686a4d55cb 100644 --- a/addons/web/static/src/js/views/search/groupby_menu.js +++ b/addons/web/static/src/js/views/search/groupby_menu.js @@ -85,7 +85,7 @@ var GroupByMenu = DropdownMenu.extend({ category: 'groupByCategory', title: 'Group By', icon: 'fa fa-bars', - symbol: this.isMobile ? 'fa fa-chevron-right pull-right mt4' : false, + symbol: this.isMobile ? 'fa fa-chevron-right float-right mt4' : false, style: style, }; this._super(parent, dropdownHeader, groupbys, options); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index f5a0f08f408..78b9d1480b5 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -143,7 +143,7 @@ </div> <div t-name="CrashManager.error" class="o_dialog_error"> <div class="alert alert-warning clearfix" role="alert"> - <button class="btn btn-primary pull-right ml8 o_clipboard_button"> + <button class="btn btn-primary float-right ml8 o_clipboard_button"> <i class="fa fa-clipboard mr8"/>Copy the full error to clipboard </button> <p><b>An error occurred</b></p> @@ -926,8 +926,8 @@ <div class="o_field_image" aria-atomic="true"> <t t-if="widget.mode !== 'readonly'"> <div class="o_form_image_controls"> - <button class="fa fa-pencil fa-lg pull-left o_select_file_button" title="Edit" aria-label="Edit"/> - <button class="fa fa-trash-o fa-lg pull-right o_clear_file_button" title="Clear" aria-label="Clear"/> + <button class="fa fa-pencil fa-lg float-left o_select_file_button" title="Edit" aria-label="Edit"/> + <button class="fa fa-trash-o fa-lg float-right o_clear_file_button" title="Clear" aria-label="Clear"/> <span class="o_form_binary_progress">Uploading...</span> <t t-call="HiddenInputFile"> @@ -1040,7 +1040,7 @@ <div t-foreach="widget.value.data" t-as="file" class="oe_attachment"> <t t-if="!file.data.upload"> <div> - <a href="#" class="fa fa-times pull-right oe_delete" title="Delete this file" aria-label="Delete this file" t-att-data-id="file.data.id"/> + <a href="#" class="fa fa-times float-right oe_delete" title="Delete this file" aria-label="Delete this file" t-att-data-id="file.data.id"/> <t t-raw="file.data.name || file.data.filename"/> </div> <a class="o_image" target="_blank" t-att-href="widget.metadata[file.id] ? widget.metadata[file.id].url : false" @@ -1138,11 +1138,11 @@ <button class="o_enable_searchview btn fa fa-search"/> <div class="o_mobile_search o_hidden"> <div class="o_mobile_search_header"> - <span class="o_mobile_search_close pull-left mt16 mb16 mr8 ml16"> + <span class="o_mobile_search_close float-left mt16 mb16 mr8 ml16"> <i class="fa fa-arrow-left"/> - <strong class="pull-right ml8">FILTER</strong> + <strong class="float-right ml8">FILTER</strong> </span> - <span class="pull-right o_mobile_search_clear_facets mt16 mr16">CLEAR</span> + <span class="float-right o_mobile_search_clear_facets mt16 mr16">CLEAR</span> </div> <div class="o_searchview_input_container"/> <div class="o_mobile_search_filter o_search_options mb8 mt8 ml16 mr16"/> @@ -1273,7 +1273,7 @@ <div t-name="SearchView.FavoriteMenu" class="btn-group o_dropdown"> <button t-attf-class="o_dropdown_toggler_btn btn btn-secondary dropdown-toggle#{widget.isMobile ? ' o-no-caret' : ''}" data-toggle="dropdown" aria-expanded="false" tabindex="-1" aria-label="Favorites" title="Favorites"> - <span class="fa fa-star"/> Favorites <span t-if="widget.isMobile" class="fa fa-chevron-right pull-right mt4"/> + <span class="fa fa-star"/> Favorites <span t-if="widget.isMobile" class="fa fa-chevron-right float-right mt4"/> </button> <div class="dropdown-menu o_favorites_menu" role="menu"> <div class="dropdown-divider user_filter"/> @@ -1339,7 +1339,7 @@ </div> <div class="o_right_panel"> <h4> - <a href="#" class="pull-right o_toggle_save_list">Save fields list</a> + <a href="#" class="float-right o_toggle_save_list">Save fields list</a> Fields to export </h4> <div class="o_save_list"/> diff --git a/addons/web/static/src/xml/kanban.xml b/addons/web/static/src/xml/kanban.xml index d3a6e8d7a3f..11a47263c3c 100644 --- a/addons/web/static/src/xml/kanban.xml +++ b/addons/web/static/src/xml/kanban.xml @@ -59,7 +59,7 @@ <t t-if="widget.examples"> <a href="#" role="button" class="btn-link o_kanban_examples">Examples</a> </t> - <span class="o_discard_msg text-muted pull-right">Esc to discard</span> + <span class="o_discard_msg text-muted float-right">Esc to discard</span> </div> <div class="o_kanban_muted_record"/> <div class="o_kanban_muted_record"/> @@ -158,7 +158,7 @@ <div class="o_kanban_examples_ghost"> <div class="o_ghost_content"/> <div class="o_ghost_content o_ghost_tag"/> - <img class="pull-right o_ghost_avatar" src="/base/static/img/avatar.png" alt="Avatar"/> + <img class="float-right o_ghost_avatar" src="/base/static/img/avatar.png" alt="Avatar"/> </div> </t> diff --git a/addons/web/static/src/xml/web_calendar.xml b/addons/web/static/src/xml/web_calendar.xml index 85b7a168e49..3f32dcbd173 100644 --- a/addons/web/static/src/xml/web_calendar.xml +++ b/addons/web/static/src/xml/web_calendar.xml @@ -21,7 +21,7 @@ <div t-attf-class="o_field_#{name} o_field_type_#{fields[name].type}"> <t t-if="widget.displayFields[name].avatar_field"> <t t-if="!isMobile"><t t-esc="fields[name].string"/>:</t> - <div class="o_calendar_avatars pull-right"> + <div class="o_calendar_avatars float-right"> <t t-foreach="widget.getAvatars(record, name, widget.displayFields[name].avatar_field).slice(0,3)" t-as="image"><t t-raw="image"/></t> <span t-if="record[name].length - 3 > 0">+<t t-esc="record[name].length - 3"/></span> </div> diff --git a/addons/web/static/tests/fields/relational_fields_tests.js b/addons/web/static/tests/fields/relational_fields_tests.js index f55a8cb48c1..0910df88766 100644 --- a/addons/web/static/tests/fields/relational_fields_tests.js +++ b/addons/web/static/tests/fields/relational_fields_tests.js @@ -4335,7 +4335,7 @@ QUnit.module('relational_fields', { '<templates>' + '<t t-name="kanban-box">' + '<div class="oe_kanban_global_click">' + - '<a t-if="!read_only_mode" type="delete" class="fa fa-times pull-right delete_icon"/>' + + '<a t-if="!read_only_mode" type="delete" class="fa fa-times float-right delete_icon"/>' + '<span><t t-esc="record.display_name.value"/></span>' + '</div>' + '</t>' + @@ -4766,7 +4766,7 @@ QUnit.module('relational_fields', { '<templates>' + '<t t-name="kanban-box">' + '<div class="oe_kanban_global_click">' + - '<a t-if="!read_only_mode" type="delete" class="fa fa-times pull-right delete_icon"/>' + + '<a t-if="!read_only_mode" type="delete" class="fa fa-times float-right delete_icon"/>' + '<span><t t-esc="record.display_name.value"/></span>' + '<span><t t-esc="record.color.value"/></span>' + '</div>' + @@ -4890,7 +4890,7 @@ QUnit.module('relational_fields', { '<templates>' + '<t t-name="kanban-box">' + '<div class="oe_kanban_global_click">' + - '<a t-if="!read_only_mode" type="delete" class="fa fa-times pull-right delete_icon"/>' + + '<a t-if="!read_only_mode" type="delete" class="fa fa-times float-right delete_icon"/>' + '<span><t t-esc="record.display_name.value"/></span>' + '</div>' + '</t>' + @@ -10154,7 +10154,7 @@ QUnit.module('relational_fields', { '<templates>' + '<t t-name="kanban-box">' + '<div class="oe_kanban_global_click">' + - '<a t-if="!read_only_mode" type="delete" class="fa fa-times pull-right delete_icon"/>' + + '<a t-if="!read_only_mode" type="delete" class="fa fa-times float-right delete_icon"/>' + '<span><t t-esc="record.display_name.value"/></span>' + '</div>' + '</t>' + @@ -10325,7 +10325,7 @@ QUnit.module('relational_fields', { '<templates>' + '<t t-name="kanban-box">' + '<div class="oe_kanban_global_click">' + - '<a t-if="!read_only_mode" type="delete" class="fa fa-times pull-right delete_icon"/>' + + '<a t-if="!read_only_mode" type="delete" class="fa fa-times float-right delete_icon"/>' + '<span><t t-esc="record.display_name.value"/></span>' + '</div>' + '</t>' + diff --git a/addons/web/static/tests/views/kanban_tests.js b/addons/web/static/tests/views/kanban_tests.js index c80e0916d21..6df7fe94ea9 100644 --- a/addons/web/static/tests/views/kanban_tests.js +++ b/addons/web/static/tests/views/kanban_tests.js @@ -2760,7 +2760,7 @@ QUnit.module('Views', { '<t t-name="kanban-box">' + '<div>' + '<field name="foo"/>' + - '<button type="object" attrs="{\'invisible\':[\'|\', (\'bar\',\'=\',True), (\'category_ids\', \'!=\', [])]}" class="btn btn-primary pull-right" name="channel_join_and_get_info">Join</button>' + + '<button type="object" attrs="{\'invisible\':[\'|\', (\'bar\',\'=\',True), (\'category_ids\', \'!=\', [])]}" class="btn btn-primary float-right" name="channel_join_and_get_info">Join</button>' + '</div>' + '</t>' + '</templates>' + diff --git a/addons/web/views/database_manager.html b/addons/web/views/database_manager.html index c7462a3c1b5..dda8a2c59f2 100644 --- a/addons/web/views/database_manager.html +++ b/addons/web/views/database_manager.html @@ -101,7 +101,7 @@ <div class="form-group"> <div class="checkbox"> <label> - <input name="demo" type="checkbox" class="pull-right" value="1"> + <input name="demo" type="checkbox" class="float-right" value="1"> <span>Load demonstration data</span> <span class="text-muted"> (Check this box to evaluate Odoo)</span> </label> @@ -135,11 +135,11 @@ {% for db in databases %} <a href="/web?db={{ db }}" class="list-group-item" > {% if db in incompatible_databases %} - <i class="icon fa fa-warning pull-right text-warning" title="This database may not be compatible"></i> + <i class="icon fa fa-warning float-right text-warning" title="This database may not be compatible"></i> {% endif %} {{ db }} {% if manage %} - <div class="text-right pull-right"> + <div class="text-right float-right"> <span data-db="{{ db }}" data-target=".o_database_backup" class="o_database_action btn-link"><i class="fa fa-floppy-o fa-fw"></i> Backup</span> <span data-db="{{ db }}" data-target=".o_database_duplicate" class="o_database_action btn-link"><i class="fa fa-files-o fa-fw"></i> Duplicate</span> <span data-db="{{ db }}" data-target=".o_database_delete" class="o_database_action btn-link"><i class="fa fa-trash-o fa-fw"></i> Delete</span> @@ -168,7 +168,7 @@ {% elif list_db %} <form role="form" action="/web/database/create" method="post"> {{ create_form() }} - <input type="submit" value="Create database" class="btn btn-primary pull-left"/> + <input type="submit" value="Create database" class="btn btn-primary float-left"/> </form> <a role="button" data-toggle="modal" data-target=".o_database_restore" class="btn btn-link"> or restore a database @@ -190,7 +190,7 @@ {{ create_form() }} </div> <div class="modal-footer"> - <input type="submit" value="Continue" class="btn btn-primary pull-right"/> + <input type="submit" value="Continue" class="btn btn-primary float-right"/> </div> </form> </div> @@ -222,20 +222,20 @@ If you don't know, answer "This database is a copy".</p> <div class="radio"> <label> - <input name="copy" type="radio" class="pull-right" value="true" checked="1"> + <input name="copy" type="radio" class="float-right" value="true" checked="1"> This database is a copy </label> </div> <div class="radio"> <label> - <input name="copy" type="radio" class="pull-right" value="false"> + <input name="copy" type="radio" class="float-right" value="false"> This database was moved </label> </div> </div> </div> <div class="modal-footer"> - <input type="submit" value="Continue" class="btn btn-primary pull-right"/> + <input type="submit" value="Continue" class="btn btn-primary float-right"/> </div> </form> </div> @@ -262,7 +262,7 @@ </div> </div> <div class="modal-footer"> - <input type="submit" value="Continue" class="btn btn-primary pull-right"/> + <input type="submit" value="Continue" class="btn btn-primary float-right"/> </div> </form> </div> @@ -291,7 +291,7 @@ </div> </div> <div class="modal-footer"> - <input type="submit" value="Continue" class="btn btn-primary pull-right"/> + <input type="submit" value="Continue" class="btn btn-primary float-right"/> </div> </form> </div> @@ -315,7 +315,7 @@ </div> </div> <div class="modal-footer"> - <input type="submit" value="Delete" class="btn btn-primary pull-right"/> + <input type="submit" value="Delete" class="btn btn-primary float-right"/> </div> </form> </div> @@ -346,7 +346,7 @@ </div> </div> <div class="modal-footer"> - <input type="submit" value="Backup" class="btn btn-primary pull-right"/> + <input type="submit" value="Backup" class="btn btn-primary float-right"/> </div> </form> </div> diff --git a/addons/web/views/report_templates.xml b/addons/web/views/report_templates.xml index d633c8363b4..6acea265082 100644 --- a/addons/web/views/report_templates.xml +++ b/addons/web/views/report_templates.xml @@ -163,11 +163,11 @@ <template id="external_layout_background"> <div class="header o_background_header"> - <div class="pull-right"> + <div class="float-right"> <h3 class="mt0 text-right" t-field="company.report_header"/> </div> - <img t-if="company.logo" t-att-src="'data:image/png;base64,%s' % to_text(company.logo)" class="pull-left" alt="Logo"/> - <div class="pull-left company_address"> + <img t-if="company.logo" t-att-src="'data:image/png;base64,%s' % to_text(company.logo)" class="float-left" alt="Logo"/> + <div class="float-left company_address"> <div> <strong t-field="company.partner_id.name"/> </div> @@ -274,7 +274,7 @@ <h4 class="mt0 mb0 text-uppercase" t-field="company.report_header"/> </div> <div class="col-1"> - <ul t-if="not type_html" class="list-inline pagenumber pull-right text-center"> + <ul t-if="not type_html" class="list-inline pagenumber float-right text-center"> <li class="list-inline-item"><strong><span class="page"/></strong></li> </ul> </div> diff --git a/addons/web_editor/static/lib/summernote/src/js/Renderer.js b/addons/web_editor/static/lib/summernote/src/js/Renderer.js index ce39a7d3db2..6f5af317bfa 100644 --- a/addons/web_editor/static/lib/summernote/src/js/Renderer.js +++ b/addons/web_editor/static/lib/summernote/src/js/Renderer.js @@ -681,7 +681,7 @@ define([ }, help: function (lang, options) { - var body = '<a class="modal-close pull-right" aria-hidden="true" tabindex="-1">' + lang.shortcut.close + '</a>' + + var body = '<a class="modal-close float-right" aria-hidden="true" tabindex="-1">' + lang.shortcut.close + '</a>' + '<div class="title">' + lang.shortcut.shortcuts + '</div>' + (agent.isMac ? tplShortcutTable(lang, options) : replaceMacKeys(tplShortcutTable(lang, options))) + '<p class="text-center">' + diff --git a/addons/web_editor/static/lib/summernote/src/js/module/Editor.js b/addons/web_editor/static/lib/summernote/src/js/module/Editor.js index 50bb9857fdf..0b63f315cf9 100644 --- a/addons/web_editor/static/lib/summernote/src/js/module/Editor.js +++ b/addons/web_editor/static/lib/summernote/src/js/module/Editor.js @@ -740,7 +740,7 @@ define([ this.floatMe = function ($editable, value, $target) { beforeCommand($editable); // bootstrap - $target.removeClass('pull-left pull-right'); + $target.removeClass('float-left float-right'); if (value && value !== 'none') { $target.addClass('pull-' + value); } diff --git a/addons/web_editor/static/src/js/editor/rte.summernote.js b/addons/web_editor/static/src/js/editor/rte.summernote.js index 79b70dd7bed..e66ff98c21e 100644 --- a/addons/web_editor/static/src/js/editor/rte.summernote.js +++ b/addons/web_editor/static/src/js/editor/rte.summernote.js @@ -266,9 +266,9 @@ eventHandler.modules.popover.button.update = function ($container, oStyle) { $container.find('.note-color').addClass('d-none'); } - $container.find('button[data-event="floatMe"][data-value="left"]').toggleClass("active", $(oStyle.image).hasClass("pull-left")); + $container.find('button[data-event="floatMe"][data-value="left"]').toggleClass("active", $(oStyle.image).hasClass("float-left")); $container.find('button[data-event="floatMe"][data-value="center"]').toggleClass("active", $(oStyle.image).hasClass("center-block")); - $container.find('button[data-event="floatMe"][data-value="right"]').toggleClass("active", $(oStyle.image).hasClass("pull-right")); + $container.find('button[data-event="floatMe"][data-value="right"]').toggleClass("active", $(oStyle.image).hasClass("float-right")); $(oStyle.image).trigger('attributes_change'); } @@ -360,9 +360,9 @@ eventHandler.modules.editor.floatMe = function ($editable, sValue) { var $target = $(getImgTarget($editable)); $editable.data('NoteHistory').recordUndo(); switch (sValue) { - case 'center': $target.toggleClass('center-block').removeClass('pull-right pull-left'); break; - case 'left': $target.toggleClass('pull-left').removeClass('pull-right center-block'); break; - case 'right': $target.toggleClass('pull-right').removeClass('pull-left center-block'); break; + case 'center': $target.toggleClass('center-block').removeClass('float-right float-left'); break; + case 'left': $target.toggleClass('float-left').removeClass('float-right center-block'); break; + case 'right': $target.toggleClass('float-right').removeClass('float-left center-block'); break; } }; eventHandler.modules.editor.imageShape = function ($editable, sValue) { diff --git a/addons/web_editor/static/src/js/tours/rte.js b/addons/web_editor/static/src/js/tours/rte.js index db7d98d20fc..54736b4a290 100644 --- a/addons/web_editor/static/src/js/tours/rte.js +++ b/addons/web_editor/static/src/js/tours/rte.js @@ -169,7 +169,7 @@ tour.register('rte', { }, { content: "click on create link", trigger: '.note-image-popover:visible button[data-event="showLinkDialog"]', - extra_trigger: '#editable_area > section .row > div:first span.fa.pull-right', + extra_trigger: '#editable_area > section .row > div:first span.fa.float-right', }, { content: "insert a link url", trigger: 'input[name="url"]', @@ -177,19 +177,19 @@ tour.register('rte', { }, { content: "click on color style", trigger: '.o_link_dialog_color > .o_link_dialog_color_item.btn-success', - extra_trigger: 'a#link-preview:containsRegex(/^<span [^>]+><\\/span>$/) > span.fa.fa-3x.pull-right', + extra_trigger: 'a#link-preview:containsRegex(/^<span [^>]+><\\/span>$/) > span.fa.fa-3x.float-right', }, { content: "save link", trigger: '.modal-footer > .btn-primary', - extra_trigger: 'a#link-preview.btn.btn-success span.fa.fa-3x.pull-right', + extra_trigger: 'a#link-preview.btn.btn-success span.fa.fa-3x.float-right', }, { content: "click on other picture", trigger: '#editable_area > section .row > div:last img', - extra_trigger: 'body:not(:has(#link-preview)) a.btn[href^="http://"]:has(span.fa.fa-3x.pull-right)', + extra_trigger: 'body:not(:has(#link-preview)) a.btn[href^="http://"]:has(span.fa.fa-3x.float-right)', }, { content: "click on create link again", trigger: '.note-image-popover:visible button[data-event="showLinkDialog"]', - extra_trigger: '#editable_area > section .row > div:first span.fa.pull-right', + extra_trigger: '#editable_area > section .row > div:first span.fa.float-right', }, { content: "insert an email", trigger: 'input[name="url"]', @@ -292,7 +292,7 @@ tour.register('rte_inline', { ' </td>\n'+ ' <td valign="center" width="270">\n'+ ' <a href="https://www.facebook.com/Odoo"><span class="fa fa-facebook-square fa-2x text-primary"></span></a>\n'+ - ' <span style="color: rgb(255, 0, 0);" class="fa fa-4x fa-google-plus-square pull-right"></span>\n'+ + ' <span style="color: rgb(255, 0, 0);" class="fa fa-4x fa-google-plus-square float-right"></span>\n'+ ' </td>\n'+ ' </tr>\n'+ ' </tbody>\n'+ diff --git a/addons/web_editor/static/src/xml/ace.xml b/addons/web_editor/static/src/xml/ace.xml index c78ce8a4d4a..09fb99f52f8 100644 --- a/addons/web_editor/static/src/xml/ace.xml +++ b/addons/web_editor/static/src/xml/ace.xml @@ -38,7 +38,7 @@ </div> <div id="ace-view-id"> <span/> - <div class="pull-right"> + <div class="float-right"> <button data-action="reset" type="button" class="btn btn-xs btn-danger"><i class="fa fa-undo"/> Reset</button> <button data-action="format" type="button" class="btn btn-xs btn-link">Format</button> </div> diff --git a/addons/web_editor/static/src/xml/backend.xml b/addons/web_editor/static/src/xml/backend.xml index c4666a1aa96..146d96fe1e5 100644 --- a/addons/web_editor/static/src/xml/backend.xml +++ b/addons/web_editor/static/src/xml/backend.xml @@ -8,7 +8,7 @@ </t> <t t-name="web_editor.FieldTextHtml.button.translate"> - <div class="btn-group pull-right"> + <div class="btn-group float-right"> <button t-if="widget.field.translate" class="o_field_translate btn btn-secondary" style="height: 24px; padding: 1px 17px 0px 5px" aria-label="Translate" title="Translate"> <span class="fa fa-language fa-lg oe_input_icon"/> </button> diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml index b5f4dff8a3f..8659f354aee 100644 --- a/addons/web_editor/static/src/xml/editor.xml +++ b/addons/web_editor/static/src/xml/editor.xml @@ -51,7 +51,7 @@ <li class="nav-item"><a role="tab" href="#editor-media-document" aria-controls="editor-media-document" data-toggle="tab" t-attf-class="nav-link#{widget.noDocuments ? ' d-none' : ''}">Document</a></li> <li class="nav-item"><a role="tab" href="#editor-media-icon" aria-controls="editor-media-icon" data-toggle="tab" t-attf-class="nav-link#{widget.noIcons ? ' d-none' : ''}">Pictogram</a></li> <li class="nav-item"><a role="tab" href="#editor-media-video" aria-controls="editor-media-video" data-toggle="tab" t-attf-class="nav-link#{widget.noVideos ? ' d-none' : ''}">Video</a></li> - <li class="nav-item search pull-right"> + <li class="nav-item search float-right"> <ul class="pager mb0 mt0"> <li class="previous"> <a role="button" class="btn btn-secondary disabled" href="#"><i class="fa fa-angle-left"/> Previous</a> @@ -61,7 +61,7 @@ </li> </ul> </li> - <li class="nav-item search pull-right"> + <li class="nav-item search float-right"> <div class="form-group"> <input class="form-control" id="icon-search" type="search"/> <span class="fa fa-search" title="Search" role="img" aria-label="Search"/> @@ -90,7 +90,7 @@ <input t-if="widget.options.res_model" type="hidden" name="res_model" t-att-value="widget.options.res_model"/> <div class="card"> <div class="card-body"> - <div class="form-group pull-left"> + <div class="form-group float-left"> <input type="file" class="d-none" name="upload" t-att-accept="widget.accept" multiple="multiple"/> <input type="hidden" name="disable_optimization" value=""/> <div class="btn-group"> @@ -108,7 +108,7 @@ <span class="text-muted">— or —</span> <label for="imageurl">Add an image URL</label> <div class="form-group btn-group"> - <input type="text" class="form-control url pull-left" id="imageurl" name="url" placeholder="https://www.odoo.com/logo.png" style="width: 250px;"/> + <input type="text" class="form-control url float-left" id="imageurl" name="url" placeholder="https://www.odoo.com/logo.png" style="width: 250px;"/> <button type="button" class="btn btn-secondary o_upload_image_url_button" disabled="disabled">Add</button> </div> </div> diff --git a/addons/web_settings_dashboard/static/src/xml/dashboard.xml b/addons/web_settings_dashboard/static/src/xml/dashboard.xml index d718b314d67..205aa73e253 100644 --- a/addons/web_settings_dashboard/static/src/xml/dashboard.xml +++ b/addons/web_settings_dashboard/static/src/xml/dashboard.xml @@ -40,8 +40,8 @@ <a class="btn btn-primary btn-block o_browse_apps" role="button"><strong>Browse Apps</strong></a> </div> <div class="o_web_settings_dashboard_pills"> - <a href="https://www.odoo.com/apps/modules" target="_blank" class="pull-left"><i class="fa fa-rocket fa-2x text-muted"/> App store</a> - <a href="https://www.odoo.com/apps/themes" target="_blank" class="pull-right"><i class="fa fa-picture-o fa-2x text-muted"/> Theme store</a> + <a href="https://www.odoo.com/apps/modules" target="_blank" class="float-left"><i class="fa fa-rocket fa-2x text-muted"/> App store</a> + <a href="https://www.odoo.com/apps/themes" target="_blank" class="float-right"><i class="fa fa-picture-o fa-2x text-muted"/> Theme store</a> </div> <div class="clearfix"/> </div> @@ -130,13 +130,13 @@ <hr/> <div class="row"> <div class="col-lg-12"> - <a t-if="debug != true" class="oe_activate_debug_mode pull-right" href="?debug" >Activate the developer mode</a> + <a t-if="debug != true" class="oe_activate_debug_mode float-right" href="?debug" >Activate the developer mode</a> <br t-if="debug != true"/> - <a t-if="debug != 'assets'" class="oe_activate_debug_mode pull-right" href="?debug=assets" >Activate the developer mode (with assets)</a> + <a t-if="debug != 'assets'" class="oe_activate_debug_mode float-right" href="?debug=assets" >Activate the developer mode (with assets)</a> <br t-if="debug != 'assets'"/> - <a t-if="debug != false" class="oe_activate_debug_mode pull-right" href="/web" >Deactivate the developer mode</a> + <a t-if="debug != false" class="oe_activate_debug_mode float-right" href="/web" >Deactivate the developer mode</a> <br t-if="debug != false"/> - <a t-if="(debug) and !(demo_active)" class="oe_activate_debug_mode pull-right o_web_settings_dashboard_force_demo" href="#">Load demo data</a> + <a t-if="(debug) and !(demo_active)" class="oe_activate_debug_mode float-right o_web_settings_dashboard_force_demo" href="#">Load demo data</a> </div> </div> </div> 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')"/> diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml index eb1807a4398..1bb88263a11 100644 --- a/addons/website_blog/views/website_blog_templates.xml +++ b/addons/website_blog/views/website_blog_templates.xml @@ -34,7 +34,7 @@ </p> </div> <t t-call="website.pager" > - <t t-set="classname">pull-right</t> + <t t-set="classname">float-right</t> </t> </section> <section class="container"> @@ -99,7 +99,7 @@ <div class="oe_structure"/> <div class="container"> <t t-call="website.pager" > - <t t-set="classname">pull-right</t> + <t t-set="classname">float-right</t> </t> </div> <div class="oe_structure"> @@ -444,10 +444,10 @@ <ul t-attf-class="blog_post_year collapse nav nav-pills flex-column #{not date and year_index == 0 and 'in'}" t-att-id="year" role="menu"> <t t-foreach="nav_list[year]" t-as="months"> <li t-if="months['date_begin'] == date" class="nav-item"> - <a role="menuitem" t-ignore="True" t-attf-href="#{blog_url(date_begin=False, date_end=False)}" class="nav-link active"><t t-esc="months['month']"/><span class="pull-right badge badge-pill" t-esc="months['post_date_count']"/></a> + <a role="menuitem" t-ignore="True" t-attf-href="#{blog_url(date_begin=False, date_end=False)}" class="nav-link active"><t t-esc="months['month']"/><span class="float-right badge badge-pill" t-esc="months['post_date_count']"/></a> </li> <li t-else="1" class="nav-item"> - <a role="menuitem" t-ignore="True" t-attf-href="#{blog_url(date_begin=months['date_begin'], date_end=months['date_end'])}" class="nav-link"><t t-esc="months['month']"/><span class="pull-right badge badge-pill" t-esc="months['post_date_count']"/></a> + <a role="menuitem" t-ignore="True" t-attf-href="#{blog_url(date_begin=months['date_begin'], date_end=months['date_end'])}" class="nav-link"><t t-esc="months['month']"/><span class="float-right badge badge-pill" t-esc="months['post_date_count']"/></a> </li> </t> </ul> @@ -517,10 +517,10 @@ <ul class="nav nav-pills flex-column"> <t t-set="state" t-value="state_info['state']"/> <li class="nav-item"> - <a t-attf-href="#{state == 'published' and blog_url(state='') or blog_url(state='published')}" t-attf-class="nav-link#{state == 'published' and ' active' or ''}">Published <span class="pull-right badge badge-pill" t-esc="state_info['published']" /></a> + <a t-attf-href="#{state == 'published' and blog_url(state='') or blog_url(state='published')}" t-attf-class="nav-link#{state == 'published' and ' active' or ''}">Published <span class="float-right badge badge-pill" t-esc="state_info['published']" /></a> </li> <li class="nav-item"> - <a t-attf-href="#{state == 'unpublished' and blog_url(state='') or blog_url(state='unpublished')}" t-attf-class="nav-link#{state == 'unpublished' and ' active' or ''}">Unpublished <span class="pull-right badge badge-pill" t-esc="state_info['unpublished']" /></a> + <a t-attf-href="#{state == 'unpublished' and blog_url(state='') or blog_url(state='unpublished')}" t-attf-class="nav-link#{state == 'unpublished' and ' active' or ''}">Unpublished <span class="float-right badge badge-pill" t-esc="state_info['unpublished']" /></a> </li> </ul> </section> diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml index d58028e47b1..b8482595980 100644 --- a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml +++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml @@ -36,7 +36,7 @@ <li class="nav-item"> <a t-attf-href="/partners#{ grade['grade_id'][0] and '/grade/%s' % grade['grade_id'][0] or '' }#{ current_country and '/country/%s' % slug(current_country) or '' }#{ '?' + (search_path or '') }" t-attf-class="nav-link#{grade['active'] and ' active' or ''}"> - <span class="badge badge-pill pull-right" t-esc="grade['grade_id_count'] or ''"/> + <span class="badge badge-pill float-right" t-esc="grade['grade_id_count'] or ''"/> <t t-esc="grade['grade_id'][1]"/> </a> </li> @@ -49,7 +49,7 @@ <li t-if="country['country_id']" class="nav-item"> <a t-attf-href="/partners#{ current_grade and '/grade/%s' % slug(current_grade) or ''}#{country['country_id'][0] and '/country/%s' % country['country_id'][0] or '' }#{ '?' + (search_path or '') + (country['country_id'][0] == 0 and '&country_all=True' or '')}" t-attf-class="nav-link#{country['active'] and ' active' or ''}"> - <span class="badge badge-pill pull-right" t-esc="country['country_id_count'] or ''"/> + <span class="badge badge-pill float-right" t-esc="country['country_id_count'] or ''"/> <t t-esc="country['country_id'][1]"/> </a> </li> @@ -62,8 +62,8 @@ <div class='navbar'> <div> <t t-call="website.pager"/> - <form action="" method="get" class="navbar-search pull-right pagination form-inline"><!-- FIXME --> - <div class="form-group pull-right"> + <form action="" method="get" class="navbar-search float-right pagination form-inline"><!-- FIXME --> + <div class="form-group float-right"> <input type="text" name="search" class="search-query col-lg-2 mt4 form-control" placeholder="Search" t-att-value="searches.get('search', '')"/> </div> </form> @@ -83,7 +83,7 @@ <t t-set="last_grade" t-value="partner.grade_id.id"/> </t> <div class="media"> - <a class="pull-left" t-attf-href="/partners/#{slug(partner)}?#{current_grade and 'grade_id=%s&' % current_grade.id}#{current_country and 'country_id=%s' % current_country.id}" + <a class="float-left" t-attf-href="/partners/#{slug(partner)}?#{current_grade and 'grade_id=%s&' % current_grade.id}#{current_country and 'country_id=%s' % current_country.id}" t-field="partner.image_medium" t-options='{"widget": "image", "class": "media-object"}' ></a> @@ -103,7 +103,7 @@ </div> <div class='navbar'> <t t-call="website.pager"> - <t t-set="classname">pull-left</t> + <t t-set="classname">float-left</t> </t> </div> </div> @@ -167,7 +167,7 @@ <h3 id="references">References</h3> <div t-foreach="partner.implemented_partner_ids" t-as="reference" class="media"> <t t-if="reference.website_published"> - <a class="pull-left" t-attf-href="/customers/#{slug(reference)}"> + <a class="float-left" t-attf-href="/customers/#{slug(reference)}"> <span t-field="reference.image_small" t-options='{"widget": "image", "class": "center-block"}'/> </a> <div class="media-body" style="min-height: 64px;"> @@ -265,7 +265,7 @@ <t t-call="portal.portal_layout"> <t t-call="portal.portal_searchbar"> <t t-set="title">My Opportunities</t> - <li class="pull-left"><button t-if="request.env.user.partner_id.grade_id or request.env.user.commercial_partner_id.grade_id" name='new_opp' data-toggle="modal" data-target=".modal_new_opp" class="btn btn-secondary navbar-btn ml16" title="Add an opportunity" aria-label="Add an opportunity"><i class="fa fa-plus"/></button></li> + <li class="float-left"><button t-if="request.env.user.partner_id.grade_id or request.env.user.commercial_partner_id.grade_id" name='new_opp' data-toggle="modal" data-target=".modal_new_opp" class="btn btn-secondary navbar-btn ml16" title="Add an opportunity" aria-label="Add an opportunity"><i class="fa fa-plus"/></button></li> </t> <div class="modal fade modal_new_opp" role="form"> <div class="modal-dialog"> @@ -341,7 +341,7 @@ <div class="card-header"> <div class="row"> <div class="col-lg-12"> - <span class="pull-right" title="Rating" role="img" t-attf-aria-label="Rating: #{lead.priority} on 3"> + <span class="float-right" title="Rating" role="img" t-attf-aria-label="Rating: #{lead.priority} on 3"> <t t-foreach="range(1, 4)" t-as="i"> <span t-attf-class="fa fa-lg fa-star#{'' if i <= int(lead.priority) else '-o'}"/> </t> @@ -510,9 +510,9 @@ <h4 style="display:inline-block"> Opportunity - <span t-field="opportunity.name"/> </h4> - <span class="btn-group pull-right" role="group"> + <span class="btn-group float-right" role="group"> <t t-foreach="stages" t-as="stage"> - <button type="button" t-att-data="stage.id" t-att-opp="opportunity.id" t-attf-class="pull-right btn opp-stage-button #{'btn-secondary' if opportunity.stage_id.name != stage.name else 'disabled btn-primary'}"> + <button type="button" t-att-data="stage.id" t-att-opp="opportunity.id" t-attf-class="float-right btn opp-stage-button #{'btn-secondary' if opportunity.stage_id.name != stage.name else 'disabled btn-primary'}"> <span t-field="stage.name"/> </button> </t> @@ -527,7 +527,7 @@ <strong>Expected Closing: <span t-field="opportunity.date_deadline" /></strong> </div> <div class="col-lg-4"> - <span class="pull-right" title="Rating" role="img" t-attf-aria-label="Rating: #{opportunity.priority} on 4"> + <span class="float-right" title="Rating" role="img" t-attf-aria-label="Rating: #{opportunity.priority} on 4"> <t t-foreach="range(1, 4)" t-as="i"> <span t-attf-class="fa fa-lg fa-star#{'' if i <= int(opportunity.priority) else '-o'}" role="img" t-att-aria-label="'Star %d of 3' % i"/> </t> diff --git a/addons/website_customer/views/website_customer_templates.xml b/addons/website_customer/views/website_customer_templates.xml index 80e3ecda3ce..a0c02c88c48 100644 --- a/addons/website_customer/views/website_customer_templates.xml +++ b/addons/website_customer/views/website_customer_templates.xml @@ -20,9 +20,9 @@ <div class="col-lg-8 offset-lg-1" id="ref_content"> <div class='navbar mb0'> <t t-call="website.pager"> - <t t-set="classname" t-value="'pull-left'"/> + <t t-set="classname" t-value="'float-left'"/> </t> - <form action="" method="get" class="navbar-search pull-right pagination form-inline"><!-- FIXME --> + <form action="" method="get" class="navbar-search float-right pagination form-inline"><!-- FIXME --> <div class="form-group"> <input type="text" name="search" class="search-query form-control" placeholder="Search" t-att-value="post.get('search', '')"/> @@ -35,7 +35,7 @@ <p t-if="not partners">No result found</p> <t t-foreach="partners" t-as="partner"> <div class="media"> - <a class="pull-left" t-attf-href="/customers/#{slug(partner)}" + <a class="float-left" t-attf-href="/customers/#{slug(partner)}" t-field="partner.image_small" t-options='{"widget": "image", "class": "media-object"}' ></a> @@ -96,7 +96,7 @@ <li class="nav-item"> <a t-attf-href="/customers/#{ industry_dict['industry_id'][0] and 'industry/%s/' % slug(industry_dict['industry_id']) or '' }#{ current_country_id and 'country/%s' % current_country_id or '' }#{ search_path }" t-attf-class="nav-link#{industry_dict['industry_id'][0] == current_industry_id and ' active' or ''}"> - <span class="badge badge-pill pull-right" t-esc="industry_dict['industry_id_count'] or '0'"/> + <span class="badge badge-pill float-right" t-esc="industry_dict['industry_id_count'] or '0'"/> <t t-esc="industry_dict['industry_id'][1]"/> </a> </li> @@ -115,7 +115,7 @@ <li class="nav-item"> <a t-attf-href="/customers/#{ current_industry_id and 'industry/%s/' % slug(current_industry) or '' }#{ country_dict['country_id'][0] and 'country/%s' % slug(country_dict['country_id']) or '' }#{ search_path }" t-attf-class="nav-link#{country_dict['country_id'][0] == current_country_id and ' active' or ''}"> - <span class="badge badge-pill pull-right" t-esc="country_dict['country_id_count'] or '0'"/> + <span class="badge badge-pill float-right" t-esc="country_dict['country_id_count'] or '0'"/> <t t-esc="country_dict['country_id'][1]"/> </a> </li> @@ -217,7 +217,7 @@ <h3 id="references">References</h3> <div t-foreach="partner.implemented_partner_ids" t-as="reference" class="media"> <t t-if="reference.website_published"> - <a class="pull-left" t-attf-href="/customers/#{slug(reference)}"> + <a class="float-left" t-attf-href="/customers/#{slug(reference)}"> <span t-field="reference.image_small" t-options='{"widget": "image", "class": "center-block"}'/> </a> <div class="media-body" style="min-height: 64px;"> diff --git a/addons/website_event/views/event_templates.xml b/addons/website_event/views/event_templates.xml index 5fb504ced94..ef5d285dd1c 100644 --- a/addons/website_event/views/event_templates.xml +++ b/addons/website_event/views/event_templates.xml @@ -150,7 +150,7 @@ <t t-foreach="dates" t-as="date"> <li class="nav-item" t-if="date[3] or (date[0] in ('old','all'))"> <a t-attf-href="/event?{{ keep_query('country', 'type', date=date[0]) }}" t-attf-class="nav-link#{searches.get('date') == date[0] and ' active' or ''}"><t t-esc="date[1]"/> - <span t-if="date[3]" class="badge badge-pill pull-right"><t t-esc="date[3]"/></span> + <span t-if="date[3]" class="badge badge-pill float-right"><t t-esc="date[3]"/></span> </a> </li> </t> @@ -166,7 +166,7 @@ <li t-if="type['event_type_id']" class="nav-item"> <a t-attf-href="/event?{{ keep_query('country', 'date', type=type['event_type_id'][0]) }}" t-attf-class="nav-link#{searches.get('type') == str(type['event_type_id'] and type['event_type_id'][0]) and ' active' or ''}"><t t-esc="type['event_type_id'][1]"/> - <span class="badge badge-pill pull-right"><t t-esc="type['event_type_id_count']"/></span> + <span class="badge badge-pill float-right"><t t-esc="type['event_type_id_count']"/></span> </a> </li> </t> @@ -180,13 +180,13 @@ <t t-foreach="countries" t-as="country"> <li t-if="country['country_id']" class="nav-item"> <a t-attf-href="/event?{{ keep_query('type', 'date', country=country['country_id'][0]) }}" t-attf-class="nav-link#{searches.get('country') == str(country['country_id'] and country['country_id'][0]) and ' active' or ''}"><t t-esc="country['country_id'][1]"/> - <span class="badge badge-pill pull-right"><t t-esc="country['country_id_count']"/></span> + <span class="badge badge-pill float-right"><t t-esc="country['country_id_count']"/></span> </a> </li> <li t-if="not country['country_id']" class="nav-item"> <a t-attf-href="/event?{{ keep_query('type', 'date', country='online') }}" t-attf-class="nav-link#{searches.get('country') == 'online' and ' active' or ''}"> <span>Online Events</span> - <span class="badge badge-pill pull-right"><t t-esc="country['country_id_count']"/></span> + <span class="badge badge-pill float-right"><t t-esc="country['country_id_count']"/></span> </a> </li> </t> @@ -319,7 +319,7 @@ <t t-set="publish_edit" t-value="True"/> </t> <t t-raw="comment.body"/> - <small class="pull-right muted text-right"> + <small class="float-right muted text-right"> <div t-field="comment.author_id"/> <div t-field="comment.date" t-options='{"hide_seconds":"True"}'/> </small> @@ -558,7 +558,7 @@ </div> </main> <footer class="modal-footer"> - <div class="pull-left"> + <div class="float-left"> <button type="submit" class="btn btn-primary">Continue</button> <button type="button" class="btn btn-secondary js_goto_event" data-dismiss="modal">Cancel Registration</button> </div> diff --git a/addons/website_event_sale/views/event_templates.xml b/addons/website_event_sale/views/event_templates.xml index d874f337c52..f2847c2c9a9 100644 --- a/addons/website_event_sale/views/event_templates.xml +++ b/addons/website_event_sale/views/event_templates.xml @@ -10,8 +10,8 @@ <template id="index" inherit_id="website_event.index" name="Event's Ticket"> <xpath expr="//li[@t-foreach='event_ids']/div/h4" position="before"> <t t-if="event.state in ['draft', 'confirm'] and event.event_ticket_ids"> - <span t-if="event.seats_availability == 'limited' and not event.seats_available" class="label label-danger pull-right">Sold Out</span> - <span t-if="event.seats_availability == 'limited' and event.seats_available and event.seats_available <= ((event.seats_max or 0) / 4)" class="label pull-right label-info"> + <span t-if="event.seats_availability == 'limited' and not event.seats_available" class="label label-danger float-right">Sold Out</span> + <span t-if="event.seats_availability == 'limited' and event.seats_available and event.seats_available <= ((event.seats_max or 0) / 4)" class="label float-right label-info"> Only <t t-esc="event.seats_available"/> Remaining </span> </t> diff --git a/addons/website_event_track/views/event_track_templates.xml b/addons/website_event_track/views/event_track_templates.xml index dad9c99d0c7..8eb4745dc42 100644 --- a/addons/website_event_track/views/event_track_templates.xml +++ b/addons/website_event_track/views/event_track_templates.xml @@ -45,7 +45,7 @@ <div class="oe_structure"/> <section class="container"> <h1 class="text-center" t-field="event.name"/> - <div class="form-inline pull-right"> + <div class="form-inline float-right"> <label class="invisible text-muted" id="search_summary"><span id="search_number">0</span> Found </label> <input type="text" class="form-control" placeholder="Filter Tracks..." id="event_track_search"/> </div> diff --git a/addons/website_forum/static/src/js/website_forum.js b/addons/website_forum/static/src/js/website_forum.js index d0bc94c4889..0da47e1ba1f 100644 --- a/addons/website_forum/static/src/js/website_forum.js +++ b/addons/website_forum/static/src/js/website_forum.js @@ -13,8 +13,8 @@ odoo.define('website_forum.website_forum', function (require) { return $.Deferred().reject("DOM doesn't contain '.website_forum'"); } - // pull-left class messes up the post layout OPW 769721 - $('span[data-oe-model="forum.post"][data-oe-field="content"]').find('img.pull-left').removeClass('pull-left'); + // float-left class messes up the post layout OPW 769721 + $('span[data-oe-model="forum.post"][data-oe-field="content"]').find('img.float-left').removeClass('float-left'); $("[data-toggle='popover']").popover(); $('.karma_required').on('click', function (ev) { @@ -415,8 +415,8 @@ odoo.define('website_forum.website_forum', function (require) { styleWithSpan: false }); - // pull-left class messes up the post layout OPW 769721 - $form.find('.note-editable').find('img.pull-left').removeClass('pull-left'); + // float-left class messes up the post layout OPW 769721 + $form.find('.note-editable').find('img.float-left').removeClass('float-left'); $form.on('click', 'button, .a-submit', function () { $textarea.html($form.find('.note-editable').code()); }); diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml index 24d2dc2b56e..007d1a7ef6b 100644 --- a/addons/website_forum/views/website_forum.xml +++ b/addons/website_forum/views/website_forum.xml @@ -233,7 +233,7 @@ <div><t t-raw="post_content"/></div> <t t-foreach="question.tag_ids" t-as="question_tag"> <a t-attf-href="/forum/#{ slug(forum) }/tag/#{slug(question_tag)}/questions"> - <span t-attf-class="pull-right label #{tag and tag.name == question_tag.name and 'label-primary' or 'label-default'}" t-field="question_tag.name" + <span t-attf-class="float-right label #{tag and tag.name == question_tag.name and 'label-primary' or 'label-default'}" t-field="question_tag.name" style="margin-right: 4px;"/> </a> </t> @@ -266,7 +266,7 @@ <template id="display_post"> <div class="question"> - <div class="pull-left"> + <div class="float-left"> <t t-call="website_forum.vote"> <t t-set="post" t-value="question"/> </t> @@ -278,7 +278,7 @@ <!-- Display a post as an answer --> <template id="display_post_answer"> <div class="clearfix"> - <div t-attf-class="pull-left text-center mb16 #{len(answer.vote_ids) and 'oe_green' or 'oe_grey'}"> + <div t-attf-class="float-left text-center mb16 #{len(answer.vote_ids) and 'oe_green' or 'oe_grey'}"> <div t-esc="len(answer.vote_ids)"/> </div> <div class="question-name" style="margin-left: 32px;"> @@ -741,7 +741,7 @@ Waiting for validation </div> <div t-attf-class="question #{can_bump and 'oe_js_bump' or ''}" t-att-data-type="question.post_type" t-att-data-last-update="question.write_date" t-att-data-id="question.id"> - <div class="pull-left"> + <div class="float-left"> <t t-call="website_forum.vote"> <t t-set="post" t-value="question"/> <div class="mt4"> @@ -766,7 +766,7 @@ <span t-if="not question.active and question.state=='offensive'"><b> [Offensive]</b></span> <span t-if="question.state == 'close'"><b> [Closed]</b></span> </h1> - <div class="pull-right"> + <div class="float-right"> <div class="text-right"> <t t-foreach="question.tag_ids" t-as="tag"> <a t-attf-href="/forum/#{ slug(forum) }/tag/#{ tag.id }/questions" class="label label-default" t-field="tag.name"/> @@ -810,7 +810,7 @@ <div t-if="question.post_type != 'link'"><span t-field="question.content" class="oe_no_empty"/></div> <div class="clearfix"> - <ul class="pull-right list-inline mb0" id="options"> + <ul class="float-right list-inline mb0" id="options"> <li t-if="question.state == 'close'" class="list-inline-item"> <t t-call="website_forum.link_button"> <t t-set="url" t-value="'/forum/' + slug(forum) +'/question/' + slug(question) + '/reopen'"/> @@ -926,7 +926,7 @@ <template id="post_answers"> <a t-attf-id="answer-#{str(answer.id)}"/> <div t-attf-class="forum_answer" t-attf-id="answer_#{answer.id}" > - <div class="pull-left"> + <div class="float-left"> <t t-call="website_forum.vote"> <t t-set="post" t-value="answer"/> <div t-if="question.post_type == 'question'" class="mt4"> @@ -938,7 +938,7 @@ </t> </div> <div class="question-block"> - <div class="pull-right author-box"> + <div class="float-right author-box"> <t t-set="user_profile_url" t-attf-value="#"/> <t t-if="answer.create_uid.id == request.session.uid or answer.create_uid.sudo().website_published"> <t t-set="user_profile_url" t-value="'/forum/%s/user/%s' % (slug(forum), answer.create_uid.id)"/> @@ -947,7 +947,7 @@ <t t-call="website_forum.forum_user_tooltip"/> </div> <a t-att-href="user_profile_url" class="o_forum_user_info"> - <img class="pull-left img rounded o_forum_avatar" t-attf-src="/forum/user/#{answer.create_uid.id}/avatar" alt="Avatar"/> + <img class="float-left img rounded o_forum_avatar" t-attf-src="/forum/user/#{answer.create_uid.id}/avatar" alt="Avatar"/> </a> <a t-att-href="user_profile_url" t-field="answer.create_uid" @@ -960,7 +960,7 @@ </div> <div class="clearfix"><span t-field="answer.content" class="oe_no_empty"/></div> <div class="clearfix"> - <ul class="list-inline pull-right mb0"> + <ul class="list-inline float-right mb0"> <li t-if="question.post_type == 'question' and not (len(answer.website_message_ids))" class="list-inline-item"> <a t-attf-class="fa fa-comment-o #{not answer.can_comment and 'karma_required text-muted' or ''}" @@ -1049,7 +1049,7 @@ <div class="o_forum_user_bio text-left card"> <div class="card-body"> <a t-att-href="user_profile_url"> - <img class="pull-left img rounded o_forum_avatar_big" t-attf-src="/forum/user/#{answer.create_uid.id}/avatar" alt="Avatar"/> + <img class="float-left img rounded o_forum_avatar_big" t-attf-src="/forum/user/#{answer.create_uid.id}/avatar" alt="Avatar"/> </a> <div class="o_forum_tooltip_header"> <h4 class="o_forum_tooltip_heading"><a t-att-href="user_profile_url" @@ -1078,7 +1078,7 @@ <t t-set="title">Delete</t> <t t-set="karma" t-value="user.karma<required_karma and required_karma or 0"/> <t t-set="classes" t-value="'close comment_delete fa-times'"/> - <t t-set="form_classes" t-value="'pull-right'"/> + <t t-set="form_classes" t-value="'float-right'"/> </t> <div><span t-field="message.body" class="oe_no_empty"/></div> <t t-set="required_karma" t-value="message.author_id.id == user.partner_id.id and object.forum_id.karma_comment_convert_own or object.forum_id.karma_comment_convert_all"/> @@ -1091,7 +1091,7 @@ <t t-set="label">Convert as an answer</t> <t t-set="karma" t-value="user.karma<required_karma and required_karma or 0"/> <t t-set="classes" t-value="'fa-magic'"/> - <t t-set="form_classes" t-value="'pull-right'"/> + <t t-set="form_classes" t-value="'float-right'"/> </t> </t> <a t-attf-href="/forum/#{slug(forum)}/partner/#{message.author_id.id}" @@ -1166,7 +1166,7 @@ <table class="table mt32 mb64"> <tr t-foreach="badges" t-as="badge"> <td> - <span class="badge badge-pill pull-left"> + <span class="badge badge-pill float-left"> <span t-if="badge.level == 'gold'" class="fa fa-circle badge-gold" title="Gold badge" role="img" aria-label="Gold badge"/> <span t-if="badge.level == 'silver'" class="fa fa-circle badge-silver" title="Silver badge" role="img" aria-label="Silver badge"/> <span t-if="badge.level == 'bronze'" class="fa fa-circle badge-bronze" title="Bronze badge" role="img" aria-label="Bronwe badge"/> @@ -1233,7 +1233,7 @@ <t t-call="website_forum.header"> <div t-foreach="users" t-as="row_users" class="row mt16"> <div t-foreach="row_users" t-as="user" class="col-md-4"> - <img class="pull-left img rounded-circle o_forum_avatar" t-attf-src="/forum/user/#{user.id}/avatar" alt="Avatar"/> + <img class="float-left img rounded-circle o_forum_avatar" t-attf-src="/forum/user/#{user.id}/avatar" alt="Avatar"/> <div> <a t-attf-href="/forum/#{slug(forum)}/user/#{user.id}" t-field="user.name"/> <t t-if="user.country_id"> @@ -1256,7 +1256,7 @@ </div> </div> </div> - <div class="pull-left"> + <div class="float-left"> <t t-call="website.pager"/> </div> </t> @@ -1285,10 +1285,10 @@ <input type="file" class="d-none o_forum_file_upload" name="ufile" accept="image/*"/> <div class="col-lg-2"> <a href="#" class="o_forum_profile_pic_edit" aria-label="Edit"> - <i class="fa fa-pencil fa-1g pull-left" title="Edit"></i> + <i class="fa fa-pencil fa-1g float-left" title="Edit"></i> </a> <a href="#" title="Clear" aria-label="Clear"> - <i class="fa fa-trash-o fa-1g pull-right o_forum_profile_pic_clear"></i> + <i class="fa fa-trash-o fa-1g float-right o_forum_profile_pic_clear"></i> </a> <img class="img img-fluid rounded-circle o_forum_avatar_img" t-attf-src="/forum/user/#{user.id}/avatar" alt="Avatar"/> </div> @@ -1498,7 +1498,7 @@ <table class="table mt32 mb64"> <tr t-foreach="user.badge_ids" t-as="badge"> <td> - <span class="badge badge-pill pull-left"> + <span class="badge badge-pill float-left"> <span t-if="badge.badge_id.level == 'gold'" class="fa fa-circle badge-gold" role="img" aria-label="Gold badge" title="Gold badge"/> <span t-if="badge.badge_id.level == 'silver'" class="fa fa-circle badge-silver" role="img" aria-label="Silver badge" title="Silver badge"/> <span t-if="badge.badge_id.level == 'bronze'" class="fa fa-circle badge-bronze" role="img" aria-label="Bronze badge" title="Bronze badge"/> diff --git a/addons/website_gengo/static/src/xml/website.gengo.xml b/addons/website_gengo/static/src/xml/website.gengo.xml index 81859518730..5efaf47c31a 100644 --- a/addons/website_gengo/static/src/xml/website.gengo.xml +++ b/addons/website_gengo/static/src/xml/website.gengo.xml @@ -91,7 +91,7 @@ <main class="modal-body"> <b> <div class="text-muted mb16"> <i class="fa fa-search-plus"></i> <t t-esc="widget.new_words"></t> new words found on this page.</div> - <h4><i class="fa fa-tachometer"></i> Gengo Statistics <a href="https://gengo.com/c/dashboard" class="pull-right" target="new">Gengo Dashboard</a></h4> + <h4><i class="fa fa-tachometer"></i> Gengo Statistics <a href="https://gengo.com/c/dashboard" class="float-right" target="new">Gengo Dashboard</a></h4> <hr class="mt8"/> <div class="text-info mb8"> <i class="fa fa-align-left"></i> Words posted for translate <t t-esc="widget.total"></t></div> <div class="text-warning mb8"> <i class="fa fa-cogs"></i> Words in progress <t t-esc="widget.inprogess"></t></div> diff --git a/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml b/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml index 18e5b0515f6..4e351a31242 100644 --- a/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml +++ b/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml @@ -78,8 +78,8 @@ <!-- Breadcrumb --> <section class="mb16 bg-white"> <div class="container"> - <div class="pull-right"> - <a role="button" t-attf-href="/jobs/apply/#{job.id}" class="btn btn-primary btn-lg pull-right mt32 mb4">Apply Now!</a> + <div class="float-right"> + <a role="button" t-attf-href="/jobs/apply/#{job.id}" class="btn btn-primary btn-lg float-right mt32 mb4">Apply Now!</a> </div> <label class="mb0 mt16"><a href="/jobs">Jobs</a></label> / <h1 class="mb0 mt0" t-field="job.name"/> diff --git a/addons/website_links/views/website_links_graphs.xml b/addons/website_links/views/website_links_graphs.xml index 772d6787e39..aefc02a7b48 100644 --- a/addons/website_links/views/website_links_graphs.xml +++ b/addons/website_links/views/website_links_graphs.xml @@ -105,7 +105,7 @@ </div> <h1 class="page-header">Statistics - <small class="pull-right d-none d-md-block mt16" id="filters"> + <small class="float-right d-none d-md-block mt16" id="filters"> <ul class="nav nav-tabs nav-tabs-inline graph-tabs" role="tablist"> <li class="nav-item"><a aria-controls="all_time_charts" href="#all_time_charts" class="nav-link active" role="tab" data-toggle="tab">All Time</a></li> <li class="nav-item"><a aria-controls="last_month_charts" href="#last_month_charts" class="nav-link" role="tab" data-toggle="tab">Last Month</a></li> diff --git a/addons/website_links/views/website_links_template.xml b/addons/website_links/views/website_links_template.xml index 09f7ffc23e5..5d0fbc223ad 100644 --- a/addons/website_links/views/website_links_template.xml +++ b/addons/website_links/views/website_links_template.xml @@ -86,7 +86,7 @@ </div> <h2 class="page-header">Your tracked links - <small class="pull-right d-none d-md-block mt16" id="filters"> + <small class="float-right d-none d-md-block mt16" id="filters"> <ul class="nav nav-tabs nav-tabs-inline graph-tabs" role="tablist"> <li class="nav-item"><a aria-controls="filter-newest-links" href="#" class="nav-link active" id="filter-newest-links" role="tab" data-toggle="tab">Newest</a></li> <li class="nav-item"><a aria-controls="filter-most-clicked-links" href="#" class="nav-link" id="filter-most-clicked-links" role="tab" data-toggle="tab">Most Clicked</a></li> diff --git a/addons/website_livechat/views/website_livechat.xml b/addons/website_livechat/views/website_livechat.xml index c14d1562b97..0e8a671fb2b 100644 --- a/addons/website_livechat/views/website_livechat.xml +++ b/addons/website_livechat/views/website_livechat.xml @@ -128,7 +128,7 @@ <h3>The Team</h3> <t t-foreach="team" t-as="user" class="media"> <div class="media"> - <div class="pull-left" t-if='user.image_small'> + <div class="float-left" t-if='user.image_small'> <img t-att-src="user.image_small and ('data:image/png;base64,' + to_text(user.image_small)) or '/web/static/src/img/placeholder.png'" class="rounded" t-att-alt="user.name"/> </div> @@ -161,7 +161,7 @@ <div class="col-lg-6 offset-lg-3"> <t t-foreach="channels" t-as="channel"> <div class="media"> - <a class="pull-left" t-attf-href="/livechat/channel/#{ slug(channel)}"> + <a class="float-left" t-attf-href="/livechat/channel/#{ slug(channel)}"> <img t-att-src="channel.image_small and ('data:image/png;base64,' + to_text(channel.image_small)) or '/web/static/src/img/placeholder.png'" t-att-alt="channel.name" /> </a> <div class="media-body"> diff --git a/addons/website_mail/static/src/xml/website_mail.xml b/addons/website_mail/static/src/xml/website_mail.xml index b80e2eb8af8..70f51435c3b 100644 --- a/addons/website_mail/static/src/xml/website_mail.xml +++ b/addons/website_mail/static/src/xml/website_mail.xml @@ -2,7 +2,7 @@ <t t-name="website_mail.publish_short"> <t t-if="is_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="res_id" t-att-data-object="res_model" 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="res_id" t-att-data-object="res_model" 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> diff --git a/addons/website_mail_channel/views/website_mail_channel_templates.xml b/addons/website_mail_channel/views/website_mail_channel_templates.xml index 7dc09b1979d..0f72f3df2e9 100644 --- a/addons/website_mail_channel/views/website_mail_channel_templates.xml +++ b/addons/website_mail_channel/views/website_mail_channel_templates.xml @@ -29,11 +29,11 @@ </div> <div class="container mt32"> <div t-if="'unsubscribe' in request.params" class="offset-lg-9 col-lg-3 alert alert-info" role="status"> - <h3>Need to unsubscribe? It's right here! <span class="fa fa-2x fa-arrow-down pull-right" role="img" aria-label="" title="Read this !"></span></h3> + <h3>Need to unsubscribe? It's right here! <span class="fa fa-2x fa-arrow-down float-right" role="img" aria-label="" title="Read this !"></span></h3> </div> <div class="row mt8" t-foreach="groups" t-as="group"> <div class="col-lg-3"> - <img t-att-src="website.image_url(group, 'image_small')" class="pull-left" alt="Group"/> + <img t-att-src="website.image_url(group, 'image_small')" class="float-left" alt="Group"/> <strong><a t-attf-href="/groups/#{ slug(group) }" t-esc="group.name"/></strong><br /> <t t-if="group.alias_id and group.alias_id.alias_name and group.alias_id.alias_domain"> <i class='fa fa-envelope-o' role="img" aria-label="Alias" title="Alias"/> @@ -85,7 +85,7 @@ <t t-call="website.layout"> <section class="container"> <div class="mt8"> - <ol class="breadcrumb pull-left"> + <ol class="breadcrumb float-left"> <li class="breadcrumb-item"><a href="/groups">Mailing Lists</a></li> <li class="breadcrumb-item"> <a t-attf-href="/groups/#{slug(group)}?#{mode and 'mode=%s' % mode or ''}#{date_begin and '&date_begin=%s' % date_begin or ''}#{date_end and '&date_end=%s' % date_end or ''}"><t t-esc="group.name"/></a> @@ -115,7 +115,7 @@ <a t-ignore="True" t-attf-href="/groups/#{ slug(group) }?mode=date&date_begin=#{ month_archive['date_begin'] }&date_end=#{month_archive['date_end']}" t-attf-class="nav-link#{month_archive['date_begin'] == date_begin and ' active' or ''}"> <t t-esc="month_archive['date']"/> - <span class="pull-right badge badge-pill" t-esc="month_archive['date_count']"/> + <span class="float-right badge badge-pill" t-esc="month_archive['date_count']"/> </a> </li> </t> @@ -146,7 +146,7 @@ <t t-set="additional_title"><t t-esc="message.description"/></t> <section class="container"> <div class="row mt8"> - <ol class="breadcrumb pull-left"> + <ol class="breadcrumb float-left"> <li class="breadcrumb-item"><a href="/groups">Mailing Lists</a></li> <li class="breadcrumb-item"> <a t-attf-href="/groups/#{slug(group)}?#{mode and 'mode=%s' % mode or ''}#{date_begin and '&date_begin=%s' % date_begin or ''}#{date_end and '&date_end=%s' % date_end or ''}"><t t-esc="group.name"/></a> @@ -177,7 +177,7 @@ <a t-ignore="True" t-attf-href="/groups/#{ slug(group) }?mode=date&date_begin=#{ month_archive['date_begin'] }&date_end=#{month_archive['date_end']}" t-attf-class="nav-link#{month_archive['date_begin'] == date_begin and ' active' or ''}"> <t t-esc="month_archive['date']"/> - <span class="pull-right badge badge-pill" t-esc="month_archive['date_count']"/> + <span class="float-right badge badge-pill" t-esc="month_archive['date_count']"/> </a> </li> </t> @@ -193,13 +193,13 @@ </a></t> </h4> <h4 class="col-lg-6"> - <t t-if="next_message"><a class="pull-right" t-attf-href='/groups/#{slug(group)}/#{slug(next_message)}?#{mode and "mode=%s" % mode or ""}'> + <t t-if="next_message"><a class="float-right" t-attf-href='/groups/#{slug(group)}/#{slug(next_message)}?#{mode and "mode=%s" % mode or ""}'> <t t-esc="next_message.description"/> <i class="fa fa-arrow-right" role="img" aria-label="Next message" title="Next message"/> </a></t> </h4> </div> <div class="media"> - <img class="rounded pull-left mt0 media-object o_mg_avatar" alt="Avatar" + <img class="rounded float-left mt0 media-object o_mg_avatar" alt="Avatar" t-att-src="website.image_url(message, 'author_avatar')"/> <div class="media-body"> <h4 class="media-heading" t-esc="message.description"/> @@ -260,7 +260,7 @@ <div> <ul class="media-list"> <li t-foreach="messages" t-as="thread" class="media"> - <img class="rounded pull-left mt0 media-object o_mg_avatar" alt="Avatar" + <img class="rounded float-left mt0 media-object o_mg_avatar" alt="Avatar" t-att-src="website.image_url(thread, 'author_avatar')"/> <div class="media-body"> <h4 class="media-heading"> diff --git a/addons/website_membership/views/website_membership_templates.xml b/addons/website_membership/views/website_membership_templates.xml index fc5d17c6652..e637f56b825 100644 --- a/addons/website_membership/views/website_membership_templates.xml +++ b/addons/website_membership/views/website_membership_templates.xml @@ -35,9 +35,9 @@ <div class="col-lg-8" id="ref_content"> <div class='navbar'> <t t-call="website.pager"> - <t t-set="classname">pull-left</t> + <t t-set="classname">float-left</t> </t> - <form action="" method="get" class="navbar-search pull-right pagination form-inline"> + <form action="" method="get" class="navbar-search float-right pagination form-inline"> <t t-call="website.website_search_box"> <t t-set="search" t-value="post.get('search', '')"/> </t> @@ -53,7 +53,7 @@ <t t-foreach="memberships_partner_ids[membership_data['id']]" t-as="partner_id"> <t t-set="partner" t-value="partners[partner_id]"/> <div class="media"> - <a class="pull-left" t-attf-href="/members/#{slug(partner)}" + <a class="float-left" t-attf-href="/members/#{slug(partner)}" t-field="partner.image_small" t-options='{"widget": "image", "class": "media-object"}' ></a> @@ -86,7 +86,7 @@ <li t-if="country['country_id']" class="nav-item"> <a t-attf-href="/members#{ membership_id and '/association/%s' % membership_id or '' }#{ country['country_id'][0] and '/country/%s' % slug(country['country_id']) or '' }#{ search }" t-attf-class="nav-link#{country['country_id'] and country['country_id'][0] == current_country_id and ' active' or ''}"><t t-esc="country['country_id'][1]"/> - <span class="badge badge-pill pull-right"><t t-esc="country['country_id_count'] or '0'"/></span> + <span class="badge badge-pill float-right"><t t-esc="country['country_id_count'] or '0'"/></span> </a> </li> </t> diff --git a/addons/website_quote/views/website_quote_templates.xml b/addons/website_quote/views/website_quote_templates.xml index 16eba0a0b51..b90a060960b 100644 --- a/addons/website_quote/views/website_quote_templates.xml +++ b/addons/website_quote/views/website_quote_templates.xml @@ -128,7 +128,7 @@ <div class="clearfix"> <div id="total" class="row" name="total"> - <div t-attf-class="col-md-4 pull-right #{'col-4' if not type_html else ''}"> + <div t-attf-class="col-md-4 float-right #{'col-4' if not type_html else ''}"> <table class="table table-sm" style="min-width: 250px;max-width: 400px;"> <tr class="border-black" style="border-bottom:1px solid #dddddd;"> <td><strong>Subtotal</strong></td> @@ -495,7 +495,7 @@ <t t-if="quotation.state not in ('draft','sent','cancel')">Your Order</t> <em t-esc="quotation.name"/> <small t-field="quotation.state"/> - <div t-ignore="true" class="pull-right css_editable_mode_hidden d-print-none"> + <div t-ignore="true" class="float-right css_editable_mode_hidden d-print-none"> <ul class="list-inline"> <li groups="sales_team.group_sale_salesman" class="list-inline-item"> <a role="button" t-if="quotation.state not in ('manual')" class="btn btn-info" t-att-href="'/web#return_label=Website&model=%s&id=%s&action=%s&view_type=form' % (quotation._name, quotation.id, action)">Edit Quote</a> diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml index 42777238bc8..a8e63dc8447 100644 --- a/addons/website_sale/views/templates.xml +++ b/addons/website_sale/views/templates.xml @@ -780,8 +780,8 @@ <div class="col-lg-3 col-md-4"> </div> <div class="col-lg-9 col-md-8"> - <a role="button" href="/shop/checkout" class="btn btn-secondary mb32 pull-left"><span class="fa fa-chevron-left" /> Previous</a> - <a role="button" class="btn btn-primary pull-right mb32 o_website_form_send" href="/shop/confirm_order">Next <span class="fa fa-chevron-right" /></a> + <a role="button" href="/shop/checkout" class="btn btn-secondary mb32 float-left"><span class="fa fa-chevron-left" /> Previous</a> + <a role="button" class="btn btn-primary float-right mb32 o_website_form_send" href="/shop/confirm_order">Next <span class="fa fa-chevron-right" /></a> </div> </div> </form> @@ -909,7 +909,7 @@ <span class="fa fa-chevron-left" /> <span class="">Continue Shopping</span> </a> - <a role="button" t-if="website_sale_order and website_sale_order.website_order_line" class="btn btn-primary pull-right mb32 mr8 d-none d-xl-inline-block" href="/shop/checkout?express=1"> + <a role="button" t-if="website_sale_order and website_sale_order.website_order_line" class="btn btn-primary float-right mb32 mr8 d-none d-xl-inline-block" href="/shop/checkout?express=1"> <span class="">Process Checkout</span> <span class="fa fa-chevron-right" /> </a> @@ -924,7 +924,7 @@ <span class="fa fa-chevron-left" /> Continue<span class="d-none d-md-inline"> Shopping</span> </a> - <a role="button" t-if="website_sale_order and website_sale_order.website_order_line" class="btn btn-primary pull-right mb32 mr8" href="/shop/checkout?express=1"> + <a role="button" t-if="website_sale_order and website_sale_order.website_order_line" class="btn btn-primary float-right mb32 mr8" href="/shop/checkout?express=1"> <span class="">Process Checkout</span> <span class="fa fa-chevron-right" /> </a> @@ -1087,7 +1087,7 @@ <div> <a role="button" href="/shop/cart" class="btn btn-secondary mb32"> <span class="fa fa-chevron-left" /> Return to Cart</a> - <a role="button" class="btn btn-primary pull-right mb32 " href="/shop/confirm_order">Confirm <span class="fa fa-chevron-right" /></a> + <a role="button" class="btn btn-primary float-right mb32 " href="/shop/confirm_order">Confirm <span class="fa fa-chevron-right" /></a> </div> </div> </div> @@ -1105,7 +1105,7 @@ </t> <input type='submit'/> </form> - <a t-if="not actual_partner or (ship.id in actual_partner.ids + actual_partner.child_ids.ids)" class='btn btn-link pull-right js_edit_address no-decoration' role="button" title="Edit this address" aria-label="Edit this address"><i class='fa fa-edit'/></a> + <a t-if="not actual_partner or (ship.id in actual_partner.ids + actual_partner.child_ids.ids)" class='btn btn-link float-right js_edit_address no-decoration' role="button" title="Edit this address" aria-label="Edit this address"><i class='fa fa-edit'/></a> <div t-attf-class="card #{selected and 'border_primary' or 'js_change_shipping'}"> <div class='card-body' style='min-height: 130px;'> <t t-esc="contact" t-options="dict(widget='contact', fields=['name', 'address'], no_marker=True)"/> @@ -1260,7 +1260,7 @@ <a role="button" t-att-href="mode == ('new', 'billing') and '/shop/cart' or '/shop/checkout'" class="btn btn-secondary mb32"> <span class="fa fa-chevron-left" /> Back </a> - <a role="button" class="btn btn-primary pull-right mb32 a-submit a-submit-disable a-submit-loading"> + <a role="button" class="btn btn-primary float-right mb32 a-submit a-submit-disable a-submit-loading"> <span>Next </span><span class="fa fa-chevron-right" /> </a> </div> @@ -1306,7 +1306,7 @@ <div class="card"> <div class="card-header"></div> <div class="card-body"> - <a class='pull-right no-decoration' href='/shop/checkout'><i class="fa fa-edit"/> Edit</a> + <a class='float-right no-decoration' href='/shop/checkout'><i class="fa fa-edit"/> Edit</a> <t t-set="same_shipping" t-value="bool(order.partner_shipping_id==order.partner_id or only_services)" /> <div><b>Billing<t t-if="same_shipping and not only_services"> & Shipping</t>: </b><span t-esc='order.partner_id' t-options="dict(widget='contact', fields=['address'], no_marker=True, separator=', ')" class="address-inline"/></div> <div t-if="not same_shipping and not only_services" groups="sale.group_delivery_invoice_address"><b>Shipping: </b><span t-esc='order.partner_shipping_id' t-options="dict(widget='contact', fields=['address'], no_marker=True, separator=', ')" class="address-inline"/></div> @@ -1345,7 +1345,7 @@ </div> <div class="js_payment mb64 row" t-if="not website_sale_order.amount_total" id="payment_method"> <div class="col-md-12"> - <form target="_self" action="/shop/payment/validate" method="post" class="pull-right"> + <form target="_self" action="/shop/payment/validate" method="post" class="float-right"> <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()" /> <a role="button" class="btn btn-primary a-submit"> <span t-if="order.amount_total > 0">Pay Now <span class="fa fa-chevron-right"></span></span> @@ -1373,7 +1373,7 @@ <t t-call="website_sale.total"> <t t-set='no_rowspan'>1</t> </t> - <a role="button" t-if="website_sale_order and website_sale_order.website_order_line" class="btn btn-secondary pull-right mr8 d-none d-xl-inline-block" href="/shop/checkout?express=1"> + <a role="button" t-if="website_sale_order and website_sale_order.website_order_line" class="btn btn-secondary float-right mr8 d-none d-xl-inline-block" href="/shop/checkout?express=1"> <span>Process Checkout</span> </a> </div> @@ -1386,7 +1386,7 @@ <div class="card-body row"> <div class='toggle_summary col-lg-12 d-xl-none'> <b>Your order: </b> <span t-field="website_sale_order.amount_total" t-options='{"widget": "monetary", "display_currency": website_sale_order.pricelist_id.currency_id}'/> - <span class='fa fa-chevron-down fa-border pull-right' role="img" aria-label="Details" title="Details"></span> + <span class='fa fa-chevron-down fa-border float-right' role="img" aria-label="Details" title="Details"></span> </div> <div t-if="not website_sale_order or not website_sale_order.website_order_line" class="alert alert-info"> @@ -1572,7 +1572,7 @@ (payment_tx_id.state == 'done' and 'bg-success text-white') or (payment_tx_id.state == 'authorized' and 'bg-success text-white') or 'bg-danger text-white')"> - <a role="button" groups="base.group_system" class="btn pull-right" target="_blank" aria-label="Edit" title="Edit" + <a role="button" groups="base.group_system" class="btn float-right" target="_blank" aria-label="Edit" title="Edit" t-att-href="'/web#model=%s&id=%s&action=%s&view_type=form' % ('payment.acquirer', payment_tx_id.acquirer_id.id, 'payment.action_payment_acquirer')"> <i class="fa fa-pencil"></i> </a> @@ -1648,7 +1648,7 @@ <li>If your website or mobile apps allows users to create content and make that content public to other users, a <b>Content</b> section will inform users that they own the rights to the content they have created.<br/>The “Content” clause usually mentions that users must give you (the website or mobile app developer) a license so that you can share this content on your website/mobile app and to make it available to other users.<br/>Because the content created by users is public to other users, a DMCA notice clause (or Copyright Infringement ) section is helpful to inform users and copyright authors that, if any content is found to be a copyright infringement, you will respond to any DMCA take down notices received and you will take down the content.</li> <li>A <b>Limit What Users Can Do</b> clause can inform users that by agreeing to use your service, they’re also agreeing to not do certain things. This can be part of a very long and thorough list in your Terms and Conditions agreements so as to encompass the most amount of negative uses.</li> </ul> - <small class="text-muted pull-right">Source: https://termsfeed.com/blog/sample-terms-and-conditions-template</small> + <small class="text-muted float-right">Source: https://termsfeed.com/blog/sample-terms-and-conditions-template</small> </div> </div> </div> diff --git a/addons/website_sale_comparison/views/website_sale_comparison_template.xml b/addons/website_sale_comparison/views/website_sale_comparison_template.xml index 0358f716e49..477e91d5388 100644 --- a/addons/website_sale_comparison/views/website_sale_comparison_template.xml +++ b/addons/website_sale_comparison/views/website_sale_comparison_template.xml @@ -75,7 +75,7 @@ <td class='td-top-left'></td> <td t-foreach="products" t-as="product"> <a href="#" t-att-data-product_product_id="product.id" class="o_comparelist_remove" t-if="len(products) > 2"> - <strong class='pull-right'>x</strong> + <strong class='float-right'>x</strong> </a> <a t-att-href="'/shop/product/%s' % slug(product.product_tmpl_id)"> <img t-attf-src="/web/image/product.product/#{product.id}/image/200x150" class="img img-fluid" style="margin:auto;" alt="Product image"/> diff --git a/addons/website_sale_link_tracker/static/src/xml/website_sale_dashboard_utm_chart.xml b/addons/website_sale_link_tracker/static/src/xml/website_sale_dashboard_utm_chart.xml index ed47f027e99..34c77201c4e 100644 --- a/addons/website_sale_link_tracker/static/src/xml/website_sale_dashboard_utm_chart.xml +++ b/addons/website_sale_link_tracker/static/src/xml/website_sale_dashboard_utm_chart.xml @@ -7,7 +7,7 @@ <t t-jquery=".o_top_margin .row" t-operation="append"> <div class="col-lg-6 col-12 o_dashboard_utms"> <div> - <h4 class="pull-left">REVENUE BY</h4> + <h4 class="float-left">REVENUE BY</h4> <t t-call="website_sale.LinkTrackersDropDown"/> </div> <div class="o_utm_no_data_img"> diff --git a/addons/website_sale_options/views/website_sale_options_templates.xml b/addons/website_sale_options/views/website_sale_options_templates.xml index 24c44649576..cd4a4f09148 100644 --- a/addons/website_sale_options/views/website_sale_options_templates.xml +++ b/addons/website_sale_options/views/website_sale_options_templates.xml @@ -97,13 +97,13 @@ <span t-field="product.image_small" t-options='{"widget": "image"}'/> </td> <td class='td-product_name'> - <div class="pull-left"> + <div class="float-left"> <strong class="media-heading" t-field="product.name"/> <div class="text-muted small" t-field="product.description_sale"/> </div> </td> <td class="td-qty"> - <div class="pull-right"> + <div class="float-right"> <t t-call="website_sale.variants"/> </div> </td> @@ -139,7 +139,7 @@ </main> <footer class="modal-footer"> <a role="button" class="btn btn-secondary a-submit js_goto_shop" aria-label="Continue shopping" title="Continue shopping"><i class="fa fa-chevron-left"></i> <span class="d-none d-md-inline">Continue Shopping</span><span class="d-inline d-md-none">Continue</span></a> - <a role="button" class="btn btn-primary pull-right a-submit" aria-label="Proceed to checkout" title="Proceed to checkout"><i class="fa fa-shopping-cart fa-fw"></i> <span class="d-none d-md-inline">Proceed to Checkout</span><span class="d-inline d-md-none">Checkout</span></a> + <a role="button" class="btn btn-primary float-right a-submit" aria-label="Proceed to checkout" title="Proceed to checkout"><i class="fa fa-shopping-cart fa-fw"></i> <span class="d-none d-md-inline">Proceed to Checkout</span><span class="d-inline d-md-none">Checkout</span></a> </footer> </div> </div> diff --git a/addons/website_slides/views/website_slides.xml b/addons/website_slides/views/website_slides.xml index f34ca15d69b..760777cb2b2 100644 --- a/addons/website_slides/views/website_slides.xml +++ b/addons/website_slides/views/website_slides.xml @@ -39,7 +39,7 @@ </a> </div> <div> - <div class="mt4 pull-right"> + <div class="mt4 float-right"> <t t-call="website.publish_management"> <t t-set="object" t-value="channel"/> <t t-set="publish_edit" t-value="True"/> @@ -91,7 +91,7 @@ <div class="container"> <div class="row"> <!-- Name and breadcrumb --> - <div class="pull-left col-lg-8 col-md-12 col-12 mt16 mb8"> + <div class="float-left col-lg-8 col-md-12 col-12 mt16 mb8"> <h3 class="mt0"> <a t-attf-href="/slides/#{slug(channel)}" t-esc="channel.name"/> <t t-if="category"> @@ -155,7 +155,7 @@ </div> <!-- Sort options --> <div class="col-lg-4 col-md-12 col-12"> - <span class="pull-right"> + <span class="float-right"> <span class="text-muted">Sort by:</span> <a href="?sorting=date"> <span t-attf-style="#{sorting and sorting == 'date' and 'font-weight:bold;' ''}">Newest</span> @@ -276,7 +276,7 @@ <span t-if="not category['id']" title="Uncategorized presentation" class="h3 mt0 mb0"> <t t-esc="category['name']"/> </span> - <a t-attf-href="/slides/#{slug(channel)}/category/#{category['id']}" class="pull-right" t-if="category['total'] - 4 > 0 and category['id']"> + <a t-attf-href="/slides/#{slug(channel)}/category/#{category['id']}" class="float-right" t-if="category['total'] - 4 > 0 and category['id']"> <i class="fa fa-arrow-right"/> See all </a> </div> @@ -346,8 +346,8 @@ <a t-att-title="slide.name" t-attf-href="/slides/slide/#{slug(slide)}" t-esc="slide.name"/> </h4> <div class="text-muted clearfix"> - <small class="pull-left"><t t-esc="slide.total_views"/> Views</small> - <small class="pull-right"><timeago class="timeago" t-att-datetime="slide.create_date"></timeago></small> + <small class="float-left"><t t-esc="slide.total_views"/> Views</small> + <small class="float-right"><timeago class="timeago" t-att-datetime="slide.create_date"></timeago></small> </div> <p t-if="slide.tag_ids" style="padding-top: 5px;"> <t t-foreach="slide.tag_ids" t-as="att_tag"> @@ -405,7 +405,7 @@ <div clas="row"> <div class="col-lg-8" t-if="slide.tag_ids"> <t t-foreach="slide.tag_ids" t-as="slide_tag"> - <a t-attf-href="/slides/#{slug(slide.channel_id)}/tag/#{slug(slide_tag)}" t-attf-class="label label-default ml4 mb4 pull-right #{tag and tag.id == slide_tag.id and 'label-primary' ''}" t-field="slide_tag.name"/> + <a t-attf-href="/slides/#{slug(slide.channel_id)}/tag/#{slug(slide_tag)}" t-attf-class="label label-default ml4 mb4 float-right #{tag and tag.id == slide_tag.id and 'label-primary' ''}" t-field="slide_tag.name"/> </t> </div> </div> @@ -413,7 +413,7 @@ </div> <div class="row"> <div class="col-md-8 col-12"> - <div class="pull-left"> + <div class="float-left"> <a t-attf-href="/slides/#{slug(slide.channel_id)}" t-attf-title="Channel #{slide.channel_id.name}" t-attf-aria-label="Channel #{slide.channel_id.name}"> <i class="fa fa-circle-o fa-5x" style="color: #875A7B;font-weight: bold;"></i> </a> @@ -453,7 +453,7 @@ </div> <!-- LikeButton widget --> <div class="text-muted mt4"> - <div class="pull-right mb16 text-right"> + <div class="float-right mb16 text-right"> <span class="oe_slide_js_like" data-href="/slides/slide/like" @@ -609,7 +609,7 @@ <div class="row" t-if="not slide.document_id and slide.embedcount_ids"> <div class="col-lg-12"> <h4 class="mt0"> Embeds - <span class="badge badge-pill pull-right"> + <span class="badge badge-pill float-right"> <t t-esc="len(slide.embedcount_ids)"/> </span> </h4> @@ -672,7 +672,7 @@ <!-- Slide sub-template: display an item in a list of related slides (Related, Most Viewed, ...) --> <template id="related_slides" name="Related Slide"> <li class="media"> - <a class="media-left pull-left" t-attf-href="/slides/slide/#{slug(slide)}"> + <a class="media-left float-left" t-attf-href="/slides/slide/#{slug(slide)}"> <img class="media-object oe_slides_apart_small" t-attf-src="/web/image/slide.slide/#{slide.id}/image_thumb" alt="slide.name"/> </a> <div class="media-body"> diff --git a/addons/website_slides/views/website_slides_embed.xml b/addons/website_slides/views/website_slides_embed.xml index d25b598295d..e55d1a06a8f 100644 --- a/addons/website_slides/views/website_slides_embed.xml +++ b/addons/website_slides/views/website_slides_embed.xml @@ -132,7 +132,7 @@ </div> <div class="col-xl-4 col-lg-4 col-md-4 col-4 text-center"></div> </div> - <div class="col-xl-2 col-lg-2 col-md-2 col-2 pull-right text-right"> + <div class="col-xl-2 col-lg-2 col-md-2 col-2 float-right text-right"> <a t-if="slide.download_security and not is_embedded" target="_top" t-attf-href="/slides/slide/#{slug(slide)}/download" title="Download" id="download"> <i class="fa fa-download fa-2x" role="img" aria-label="Download"></i> </a> diff --git a/addons/website_theme_install/views/views.xml b/addons/website_theme_install/views/views.xml index 8880d774e3f..4ccb733a4e0 100644 --- a/addons/website_theme_install/views/views.xml +++ b/addons/website_theme_install/views/views.xml @@ -30,11 +30,11 @@ </div> </div> <div class="o_theme_preview_bottom clearfix"> - <h5 t-if="record.display_name.value" class="text-uppercase pull-left"> - <img class="pull-left mr4" t-att-src="record.icon.value" height="16" width="16" alt="Theme preview"/> + <h5 t-if="record.display_name.value" class="text-uppercase float-left"> + <img class="float-left mr4" t-att-src="record.icon.value" height="16" width="16" alt="Theme preview"/> <b><t t-esc="record.display_name.value.replace(('Theme'), '').replace(('theme'), '')"/></b> </h5> - <h6 t-if="record.category_id.value" class="text-muted pull-right"> + <h6 t-if="record.category_id.value" class="text-muted float-right"> <b><t t-esc="record.category_id.value"/></b> </h6> </div> |
