diff options
| author | qsm-odoo <qsm@odoo.com> | 2018-07-16 16:48:59 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2018-07-27 12:36:54 +0200 |
| commit | c59380bac5bbd47bc7dcd92b38049af29a62c3d1 (patch) | |
| tree | d7d2597657a11138e243f228ebef98cd4ffc4cf6 /addons | |
| parent | 81f359c81c69af2a5ec0645602e2bb43b2e16721 (diff) | |
[REF] *: BS4, rename btn-default to btn-secondary
BS4 "btn-default" class was replaced with "btn-secondary", which makes
more sense.
Diffstat (limited to 'addons')
169 files changed, 336 insertions, 337 deletions
diff --git a/addons/account/static/src/scss/account_dashboard.scss b/addons/account/static/src/scss/account_dashboard.scss index 50f6f1169a1..531c1cbf06d 100644 --- a/addons/account/static/src/scss/account_dashboard.scss +++ b/addons/account/static/src/scss/account_dashboard.scss @@ -29,7 +29,7 @@ } } - .o_arrow_button.btn-default { + .o_arrow_button.btn-secondary { color: $text-muted; text-transform: none; font-weight: 500; 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 44317822c92..bedbb4f2e35 100644 --- a/addons/account/static/src/xml/account_dashboard_setup_bar.xml +++ b/addons/account/static/src/xml/account_dashboard_setup_bar.xml @@ -5,22 +5,22 @@ <div class="o_account_dashboard_header d-none d-md-block o_form_view" t-if="values['show_setup_bar']"> <div class="o_form_statusbar"> <div class="o_statusbar_status" data-original-title="" title="" > - <button name="setting_chart_of_accounts_action" type="company_object" t-attf-class="btn o_arrow_button btn-default account_setup_dashboard_action #{values['chart_of_accounts'] and 'o_action_done' or ''}" > + <button name="setting_chart_of_accounts_action" type="company_object" t-attf-class="btn o_arrow_button btn-secondary account_setup_dashboard_action #{values['chart_of_accounts'] and 'o_action_done' or ''}" > <i class="fa fa-check" t-if="values['chart_of_accounts']" role="img" aria-label="Current state" title="Current state" aria-current="step"/> <b class="o_account_dashboard_index">4</b> Chart of Accounts </button> - <button name="setting_init_fiscal_year_action" type="company_object" t-attf-class="btn o_arrow_button btn-default account_setup_dashboard_action #{values['fiscal_year'] and 'o_action_done' or ''}"> + <button name="setting_init_fiscal_year_action" type="company_object" t-attf-class="btn o_arrow_button btn-secondary account_setup_dashboard_action #{values['fiscal_year'] and 'o_action_done' or ''}"> <i class="fa fa-check" t-if="values['fiscal_year']" role="img" aria-label="Current state" title="Current state" aria-current="step"/> <b class="o_account_dashboard_index">3</b> Fiscal Year </button> - <button name="setting_init_bank_account_action" type="company_object" t-attf-class="btn o_arrow_button btn-default account_setup_dashboard_action #{values['bank'] and 'o_action_done' or ''}"> + <button name="setting_init_bank_account_action" type="company_object" t-attf-class="btn o_arrow_button btn-secondary account_setup_dashboard_action #{values['bank'] and 'o_action_done' or ''}"> <i class="fa fa-check" t-if="values['bank']" role="img" aria-label="Current state" title="Current state" aria-current="step"/> <b class="o_account_dashboard_index">2</b> Add a Bank Account </button> - <button name="setting_init_company_action" type="company_object" t-attf-class="btn o_arrow_button btn-default account_setup_dashboard_action #{values['company'] and 'o_action_done' or ''}"> + <button name="setting_init_company_action" type="company_object" t-attf-class="btn o_arrow_button btn-secondary account_setup_dashboard_action #{values['company'] and 'o_action_done' or ''}"> <i class="fa fa-check" t-if="values['company']" role="img" aria-label="Current state" title="Current state" aria-current="step"/> <b class="o_account_dashboard_index">1</b> Company Data diff --git a/addons/account/static/src/xml/account_payment.xml b/addons/account/static/src/xml/account_payment.xml index 27fc4044f24..414d5676442 100644 --- a/addons/account/static/src/xml/account_payment.xml +++ b/addons/account/static/src/xml/account_payment.xml @@ -79,7 +79,7 @@ </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-default 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-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> </t> </templates> diff --git a/addons/account/static/src/xml/account_reconciliation.xml b/addons/account/static/src/xml/account_reconciliation.xml index 76ad700c0af..1c0d535e5bc 100644 --- a/addons/account/static/src/xml/account_reconciliation.xml +++ b/addons/account/static/src/xml/account_reconciliation.xml @@ -26,12 +26,12 @@ </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-default 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 pull-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-default js_load_more">Load more</button> + <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> @@ -59,7 +59,7 @@ <t t-if="context && context.active_model"> <p t-if="context['active_model'] === 'account.journal' || context['active_model'] === 'account.bank.statement'" class="actions_buttons"> <t t-if="context.journal_id"> - <button class="button_back_to_statement btn btn-default" t-att-data_journal_id='context.journal_id'>Go to bank statement(s)</button> + <button class="button_back_to_statement btn btn-secondary" t-att-data_journal_id='context.journal_id'>Go to bank statement(s)</button> </t> <t t-if="context['active_model'] === 'account.bank.statement'"> <button class="button_close_statement btn btn-primary" style="display: inline-block;">Close statement</button> @@ -74,7 +74,7 @@ <table class="accounting_view"> <caption> <div class="pull-right o_buttons"> - <button t-attf-class="o_validate btn btn-default #{!state.balance.type ? '' : 'd-none'}">Validate</button> + <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> </div> @@ -107,9 +107,9 @@ <t t-name="reconciliation.manual.line" t-extend="reconciliation.line"> <t t-jquery=".o_buttons" t-operation="replace"> <div class="pull-right o_buttons"> - <button t-attf-class="o_validate btn btn-default #{!state.balance.type ? '' : 'd-none'}">Reconcile</button> + <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-default #{state.balance.type < 0 ? '' : 'd-none'}">Skip</button> + <button t-attf-class="o_no_valid btn btn-secondary #{state.balance.type < 0 ? '' : 'd-none'}">Skip</button> </div> </t> <t t-jquery=".accounting_view tbody" t-operation="append"> diff --git a/addons/account/static/tests/reconciliation_tests.js b/addons/account/static/tests/reconciliation_tests.js index 206c00ea7d4..e217d381642 100644 --- a/addons/account/static/tests/reconciliation_tests.js +++ b/addons/account/static/tests/reconciliation_tests.js @@ -661,7 +661,7 @@ QUnit.module('account', { " 101200 2017-02-28 Camptocamp: INV/2017/0001 $ 4,610.00 111100 2017-02-28 Camptocamp: BILL/2017/0001 $ 10,000.00 111100 2017-02-28 ASUSTeK: BILL/2017/0002 $ 5,749.99 ", "should display the next 5 account move lines"); - assert.ok(clientAction.widgets[0].$('caption button.btn-default:visible').length, "should display the 'validate' button"); + assert.ok(clientAction.widgets[0].$('caption button.btn-secondary:visible').length, "should display the 'validate' button"); assert.ok(clientAction.widgets[1].$('caption .text-danger:visible').length, "should display the 'Select a partner or choose a counterpart' message"); assert.ok(clientAction.widgets[2].$('caption button.btn-primary:visible').length, "should display the 'Reconcile' button"); @@ -1029,7 +1029,7 @@ QUnit.module('account', { assert.strictEqual(widget.$('.accounting_view tbody tr').length, 1, "should have ever only the created reconcile line"); assert.strictEqual(widget.$('.accounting_view tbody tr').text().replace(/[\n\r\s$,]+/g, ' '), " 101200 SAJ/2014/002 and SAJ/2014/003 1100.00 ", "the new line should be update the amout"); - assert.ok(widget.$('caption button.btn-default:visible').length, "should display the 'validate' button"); + assert.ok(widget.$('caption button.btn-secondary:visible').length, "should display the 'validate' button"); widget.$('.create .add_line').trigger('click').trigger('click'); widget.$('.create .create_amount input').val('-100').trigger('input'); diff --git a/addons/account/views/account_payment_view.xml b/addons/account/views/account_payment_view.xml index 09e3de5942f..91bde7b508c 100644 --- a/addons/account/views/account_payment_view.xml +++ b/addons/account/views/account_payment_view.xml @@ -287,7 +287,7 @@ </sheet> <footer> <button string='Validate' name="action_validate_invoice_payment" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </form> </field> @@ -355,7 +355,7 @@ </group> <footer> <button string='Validate' name="create_payments" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/account/views/account_portal_templates.xml b/addons/account/views/account_portal_templates.xml index 1d6640c7dba..0a1cd2ac10a 100644 --- a/addons/account/views/account_portal_templates.xml +++ b/addons/account/views/account_portal_templates.xml @@ -85,8 +85,8 @@ </div> <div class="o_payment_button"> <div class="text-center mb8 ml16 mr16 o_download_pdf"> - <a class="btn btn-default btn-block o_download_btn" t-att-href="'/my/invoices/pdf/%s?%s' % (invoice.id, keep_query())" title="Download"><i class="fa fa-download"/> Download</a> - <a class="btn btn-default btn-block d-none d-lg-inline-block o_print_btn o_portal_invoice_print" t-att-href="'/my/invoices/pdf/%s?%s&print=true' % (invoice.id, keep_query())" id="print_invoice_report" title="Print"><i class="fa fa-print"/> Print</a> + <a class="btn btn-secondary btn-block o_download_btn" t-att-href="'/my/invoices/pdf/%s?%s' % (invoice.id, keep_query())" title="Download"><i class="fa fa-download"/> Download</a> + <a class="btn btn-secondary btn-block d-none d-lg-inline-block o_print_btn o_portal_invoice_print" t-att-href="'/my/invoices/pdf/%s?%s&print=true' % (invoice.id, keep_query())" id="print_invoice_report" title="Print"><i class="fa fa-print"/> Print</a> </div> </div> <hr t-if="invoice.user_id" class="mt0 mb0"/> diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml index 96a4a3b3d44..2fad4d5c6b0 100644 --- a/addons/account/views/account_view.xml +++ b/addons/account/views/account_view.xml @@ -531,7 +531,7 @@ </group> <footer> <button string="Confirm" name="validate" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </form> </field> @@ -556,7 +556,7 @@ <p>Confirming this will create automatically a journal entry with the difference in the profit/loss account set on the cash journal.</p> <footer> <button string="Confirm" name="validate" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </div> </form> diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml index 1bfcc5e2552..d1c856020ea 100644 --- a/addons/account/wizard/account_invoice_refund_view.xml +++ b/addons/account/wizard/account_invoice_refund_view.xml @@ -41,7 +41,7 @@ </group> <footer> <button string='Add Credit Note' name="invoice_refund" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml index 068f2ac6557..db2ad3ad6bb 100644 --- a/addons/account/wizard/account_invoice_state_view.xml +++ b/addons/account/wizard/account_invoice_state_view.xml @@ -14,7 +14,7 @@ </p> <footer> <button string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/account/wizard/account_move_reversal_view.xml b/addons/account/wizard/account_move_reversal_view.xml index dbe59d4ae3a..a3c0161c7b6 100644 --- a/addons/account/wizard/account_move_reversal_view.xml +++ b/addons/account/wizard/account_move_reversal_view.xml @@ -13,7 +13,7 @@ </group> <footer> <button string="Reverse Moves" name="reverse_moves" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml index 47fd1c9026e..1837655073b 100644 --- a/addons/account/wizard/account_reconcile_view.xml +++ b/addons/account/wizard/account_reconcile_view.xml @@ -20,7 +20,7 @@ <button string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}" class="btn-primary"/> <button string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','=',0)]}" class="btn-primary"/> <button string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':['|',('writeoff','=',0),('trans_nbr','<',2)]}" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </form> </field> @@ -47,7 +47,7 @@ </group> <footer> <button string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml index fc0fab2f3ea..c801bfebcd1 100644 --- a/addons/account/wizard/account_report_aged_partner_balance_view.xml +++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml @@ -19,7 +19,7 @@ <field name="journal_ids" required="0" invisible="1"/> <footer> <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/> - <button string="Cancel" class="btn btn-default" special="cancel"/> + <button string="Cancel" class="btn btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml index be111dba194..d7339fa91a5 100644 --- a/addons/account/wizard/account_report_common_view.xml +++ b/addons/account/wizard/account_report_common_view.xml @@ -17,7 +17,7 @@ </group> <footer> <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/> - <button string="Cancel" class="btn btn-default" special="cancel" /> + <button string="Cancel" class="btn btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/account/wizard/account_unreconcile_view.xml b/addons/account/wizard/account_unreconcile_view.xml index 374a7f85f33..27604a931b3 100644 --- a/addons/account/wizard/account_unreconcile_view.xml +++ b/addons/account/wizard/account_unreconcile_view.xml @@ -11,7 +11,7 @@ <form class="o_form_label">If you unreconcile transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled</form> <footer> <button string="Unreconcile" name="trans_unrec" type="object" default_focus="1" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml index 7ffe823afc9..0dcf74e41dd 100644 --- a/addons/account/wizard/account_validate_move_view.xml +++ b/addons/account/wizard/account_validate_move_view.xml @@ -11,7 +11,7 @@ <span class="o_form_label">All selected journal entries will be validated and posted. You won't be able to modify them afterwards.</span> <footer> <button string="Post Journal Entries" name="validate_move" type="object" default_focus="1" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/account/wizard/multi_compose_message_views.xml b/addons/account/wizard/multi_compose_message_views.xml index 7a294573863..699256f9200 100644 --- a/addons/account/wizard/multi_compose_message_views.xml +++ b/addons/account/wizard/multi_compose_message_views.xml @@ -52,10 +52,10 @@ attrs="{'invisible': ['|', '|', '|', ('is_log', '=', True), ('printed', '=', True), ('is_print', '=', False), ('is_email', '=', True)]}" name="print_action" type="object" class="btn-primary o_mail_send"/> <button string="Done" attrs="{'invisible': [('printed', '=', False)]}" special="cancel" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel" /> + <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-default" help="Save as a new template" /> + class="pull-right btn-secondary" help="Save as a new template" /> </footer> </form> </field> diff --git a/addons/account/wizard/pos_box.xml b/addons/account/wizard/pos_box.xml index f325c39a33c..67be6485cac 100644 --- a/addons/account/wizard/pos_box.xml +++ b/addons/account/wizard/pos_box.xml @@ -13,7 +13,7 @@ </group> <footer> <button name="run" string="Put Money In" type="object" class="btn-primary"/> - <button special="cancel" string="Cancel" class="btn-default"/> + <button special="cancel" string="Cancel" class="btn-secondary"/> </footer> </form> </field> @@ -41,7 +41,7 @@ <footer> <button name="run" string="Take Money Out" type="object" class="btn-primary"/> - <button class="btn-default" special="cancel" string="Cancel" /> + <button class="btn-secondary" special="cancel" string="Cancel" /> </footer> </form> </field> diff --git a/addons/account/wizard/wizard_tax_adjustments_view.xml b/addons/account/wizard/wizard_tax_adjustments_view.xml index dba164388b9..20ef298914d 100644 --- a/addons/account/wizard/wizard_tax_adjustments_view.xml +++ b/addons/account/wizard/wizard_tax_adjustments_view.xml @@ -29,11 +29,11 @@ <footer> <div attrs="{'invisible': [('adjustment_type', '=', 'credit')]}"> <button name="create_move_debit" string="Create and post move" type="object" default_focus="1" class="oe_highlight"/> - <button string="Cancel" class="btn btn-default" special="cancel" /> + <button string="Cancel" class="btn btn-secondary" special="cancel" /> </div> <div attrs="{'invisible': [('adjustment_type', '!=', 'credit')]}"> <button name="create_move_credit" string="Create and post move" type="object" default_focus="1" class="oe_highlight"/> - <button string="Cancel" class="btn btn-default" special="cancel" /> + <button string="Cancel" class="btn btn-secondary" special="cancel" /> </div> </footer> </form> diff --git a/addons/account_asset/wizard/asset_depreciation_confirmation_wizard_views.xml b/addons/account_asset/wizard/asset_depreciation_confirmation_wizard_views.xml index ee12b167246..6eafdd5ee2b 100644 --- a/addons/account_asset/wizard/asset_depreciation_confirmation_wizard_views.xml +++ b/addons/account_asset/wizard/asset_depreciation_confirmation_wizard_views.xml @@ -16,7 +16,7 @@ </group> <footer> <button string="Generate Entries" name="asset_compute" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/account_asset/wizard/asset_modify_views.xml b/addons/account_asset/wizard/asset_modify_views.xml index 6e0335376e0..4388deda14e 100644 --- a/addons/account_asset/wizard/asset_modify_views.xml +++ b/addons/account_asset/wizard/asset_modify_views.xml @@ -22,7 +22,7 @@ </group> <footer> <button name="modify" string="Modify" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/account_bank_statement_import/account_bank_statement_import_view.xml b/addons/account_bank_statement_import/account_bank_statement_import_view.xml index 3c55bf51ce0..bcfee4573d1 100644 --- a/addons/account_bank_statement_import/account_bank_statement_import_view.xml +++ b/addons/account_bank_statement_import/account_bank_statement_import_view.xml @@ -17,7 +17,7 @@ <field name="filename" invisible="1"/> <footer> <button name="import_file" string="_Import" type="object" class="btn-primary" /> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/account_bank_statement_import/wizard/journal_creation.xml b/addons/account_bank_statement_import/wizard/journal_creation.xml index 666c70d9f6e..5c34e869155 100644 --- a/addons/account_bank_statement_import/wizard/journal_creation.xml +++ b/addons/account_bank_statement_import/wizard/journal_creation.xml @@ -22,7 +22,7 @@ </group> <footer> <button name="create_journal" string="OK" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/account_check_printing/wizard/print_prenumbered_checks_views.xml b/addons/account_check_printing/wizard/print_prenumbered_checks_views.xml index 428ff9c2de3..b593440c5aa 100644 --- a/addons/account_check_printing/wizard/print_prenumbered_checks_views.xml +++ b/addons/account_check_printing/wizard/print_prenumbered_checks_views.xml @@ -13,7 +13,7 @@ </group> <footer> <button name="print_checks" string="Print" type="object" class="oe_highlight"/> - <button string="Cancel" class="btn btn-default" special="cancel"/> + <button string="Cancel" class="btn btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/base_gengo/wizard/base_gengo_translations_view.xml b/addons/base_gengo/wizard/base_gengo_translations_view.xml index 1d5ef223f1d..224e4c47d44 100644 --- a/addons/base_gengo/wizard/base_gengo_translations_view.xml +++ b/addons/base_gengo/wizard/base_gengo_translations_view.xml @@ -23,7 +23,7 @@ </group> <footer> <button name="act_update" string="Send" type="object" class="btn-primary"/> - <button name="act_cancel" special="cancel" string="Cancel" type="object" class="btn-default"/> + <button name="act_cancel" special="cancel" string="Cancel" type="object" class="btn-secondary"/> </footer> </form> </field> diff --git a/addons/base_import/static/src/js/import_action.js b/addons/base_import/static/src/js/import_action.js index 44db3151e32..7d91f2f1207 100644 --- a/addons/base_import/static/src/js/import_action.js +++ b/addons/base_import/static/src/js/import_action.js @@ -298,7 +298,7 @@ var DataImport = AbstractAction.extend(ControlPanelMixin, { var self = this; this.$buttons.filter('.oe_import_file') .text(_t('Load New File')) - .removeClass('btn-primary').addClass('btn-default') + .removeClass('btn-primary').addClass('btn-secondary') .blur(); this.$buttons.filter('.o_import_import, .o_import_validate, .o_import_file_reload').removeClass('d-none'); this.$el.find('.oe_import_box, .oe_import_with_file').removeClass('d-none'); diff --git a/addons/base_import/static/src/xml/base_import.xml b/addons/base_import/static/src/xml/base_import.xml index d84800eca01..da83361db0f 100644 --- a/addons/base_import/static/src/xml/base_import.xml +++ b/addons/base_import/static/src/xml/base_import.xml @@ -94,10 +94,10 @@ <t t-name="ImportView.buttons"> <button type="button" class="btn btn-primary o_import_import d-none">Import</button> - <button type="button" class="btn btn-default o_import_validate d-none">Test Import</button> + <button type="button" class="btn btn-secondary o_import_validate d-none">Test Import</button> <button type="button" class="btn btn-primary oe_import_file">Load File</button> - <button type="button" class="btn btn-default o_import_file_reload d-none">Reload File</button> - <button type="button" class="btn btn-default o_import_cancel">Cancel</button> + <button type="button" class="btn btn-secondary o_import_file_reload d-none">Reload File</button> + <button type="button" class="btn btn-secondary o_import_cancel">Cancel</button> </t> <t t-name="ImportView.preview"> @@ -155,7 +155,7 @@ <t t-if="error.moreinfo" t-raw="info(error.moreinfo)"/> </t> <t t-name="ImportView.import_button"> - <button t-if='widget and widget.importEnabled' type="button" class="btn btn-default o_button_import"> + <button t-if='widget and widget.importEnabled' type="button" class="btn btn-secondary o_button_import"> Import </button> </t> diff --git a/addons/base_import_module/views/base_import_module_view.xml b/addons/base_import_module/views/base_import_module_view.xml index 7c46391f116..fb18fdfbf49 100644 --- a/addons/base_import_module/views/base_import_module_view.xml +++ b/addons/base_import_module/views/base_import_module_view.xml @@ -20,11 +20,11 @@ <footer> <div states="init"> <button name="import_module" string="Import App" type="object" class="btn-primary"/> - <button special="cancel" string="Cancel" class="btn-default"/> + <button special="cancel" string="Cancel" class="btn-secondary"/> </div> <div states="done"> <button name="action_module_open" string="Open Modules" type="object" class="btn-primary"/> - <button special="cancel" string="Close" class="btn-default"/> + <button special="cancel" string="Close" class="btn-secondary"/> </div> </footer> </form> diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml index 88c171ba8e7..dbf50c5d896 100644 --- a/addons/crm/views/crm_lead_views.xml +++ b/addons/crm/views/crm_lead_views.xml @@ -248,7 +248,7 @@ <footer> <button string="Create" name="close_dialog" type="object" class="btn-primary"/> <button string="Create & Edit" name="edit_dialog" type="object" class="btn-primary"/> - <button string="Discard" class="btn-default" special="cancel"/> + <button string="Discard" class="btn-secondary" special="cancel"/> </footer> <field name="partner_name" invisible="1"/> <field name="contact_name" invisible="1"/> diff --git a/addons/crm/wizard/crm_lead_lost_views.xml b/addons/crm/wizard/crm_lead_lost_views.xml index 9886c030829..2e0ed225c37 100644 --- a/addons/crm/wizard/crm_lead_lost_views.xml +++ b/addons/crm/wizard/crm_lead_lost_views.xml @@ -10,7 +10,7 @@ </group> <footer> <button name="action_lost_reason_apply" string="Submit" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/crm/wizard/crm_lead_to_opportunity_views.xml b/addons/crm/wizard/crm_lead_to_opportunity_views.xml index 5b29d25b934..c12587a5fb0 100644 --- a/addons/crm/wizard/crm_lead_to_opportunity_views.xml +++ b/addons/crm/wizard/crm_lead_to_opportunity_views.xml @@ -37,7 +37,7 @@ </group> <footer> <button name="action_apply" string="Create Opportunity" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </form> </field> @@ -85,7 +85,7 @@ </group> <footer> <button name="mass_convert" string="Convert to Opportunities" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/crm/wizard/crm_merge_opportunities_views.xml b/addons/crm/wizard/crm_merge_opportunities_views.xml index 0637b4b5571..3841ffaa159 100644 --- a/addons/crm/wizard/crm_merge_opportunities_views.xml +++ b/addons/crm/wizard/crm_merge_opportunities_views.xml @@ -27,7 +27,7 @@ </group> <footer> <button name="action_merge" type="object" string="Merge" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/crm_project/wizard/crm_lead_convert2task_views.xml b/addons/crm_project/wizard/crm_lead_convert2task_views.xml index 1984f8d4d79..41921863be2 100644 --- a/addons/crm_project/wizard/crm_lead_convert2task_views.xml +++ b/addons/crm_project/wizard/crm_lead_convert2task_views.xml @@ -12,7 +12,7 @@ </group> <footer> <button type="object" name="action_lead_to_project_task" string="Create Task" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/delivery/wizard/choose_delivery_package_views.xml b/addons/delivery/wizard/choose_delivery_package_views.xml index e7c2c975ad1..c37231ed38d 100644 --- a/addons/delivery/wizard/choose_delivery_package_views.xml +++ b/addons/delivery/wizard/choose_delivery_package_views.xml @@ -16,7 +16,7 @@ </group> <footer> <button name="put_in_pack" type="object" string="Save" class="btn-primary"/> - <button string="Discard" special="cancel" class="btn-default"/> + <button string="Discard" special="cancel" class="btn-secondary"/> </footer> </form> </field> diff --git a/addons/event/wizard/event_confirm_view.xml b/addons/event/wizard/event_confirm_view.xml index 1cd67ac8da8..32ccde4980a 100644 --- a/addons/event/wizard/event_confirm_view.xml +++ b/addons/event/wizard/event_confirm_view.xml @@ -10,7 +10,7 @@ <span class="o_form_label">Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?</span> <footer> <button name="confirm" string="Confirm Anyway" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/event_sale/wizard/event_edit_registration.xml b/addons/event_sale/wizard/event_edit_registration.xml index 5adc5d50bae..92a69107ba7 100644 --- a/addons/event_sale/wizard/event_edit_registration.xml +++ b/addons/event_sale/wizard/event_edit_registration.xml @@ -20,7 +20,7 @@ </field> <footer> <button string="Apply" name="action_make_registration" type="object" class="btn-primary"/> - <button string="Skip" class="btn-default" special="cancel"/> + <button string="Skip" class="btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/gamification/wizard/grant_badge.xml b/addons/gamification/wizard/grant_badge.xml index 06b8ff122ce..dde5b011b1a 100644 --- a/addons/gamification/wizard/grant_badge.xml +++ b/addons/gamification/wizard/grant_badge.xml @@ -12,7 +12,7 @@ </group> <footer> <button string="Grant Badge" type="object" name="action_grant_badge" class="btn-primary" /> - <button string="Cancel" special="cancel" class="btn-default"/> + <button string="Cancel" special="cancel" class="btn-secondary"/> </footer> </form> </field> diff --git a/addons/gamification/wizard/update_goal.xml b/addons/gamification/wizard/update_goal.xml index a3d03d9a861..532750778d6 100644 --- a/addons/gamification/wizard/update_goal.xml +++ b/addons/gamification/wizard/update_goal.xml @@ -11,7 +11,7 @@ </group> <footer> <button string="Update" type="object" name="action_update_current" class="btn-primary" /> - <button string="Cancel" special="cancel" class="btn-default"/> + <button string="Cancel" special="cancel" class="btn-secondary"/> </footer> </form> </field> diff --git a/addons/google_calendar/static/src/js/google_calendar.js b/addons/google_calendar/static/src/js/google_calendar.js index 91d3c6709b0..2759d44f985 100644 --- a/addons/google_calendar/static/src/js/google_calendar.js +++ b/addons/google_calendar/static/src/js/google_calendar.js @@ -115,7 +115,7 @@ CalendarRenderer.include({ this.$googleButton = $(); if (this.model === "calendar.event") { this.$googleButton = $('<button/>', {type: 'button', html: _t("Sync with <b>Google</b>")}) - .addClass('o_google_sync_button oe_button btn btn-default') + .addClass('o_google_sync_button oe_button btn btn-secondary') .prepend($('<img/>', { src: "/google_calendar/static/src/img/calendar_32.png", })) diff --git a/addons/hr_attendance/static/src/scss/hr_attendance.scss b/addons/hr_attendance/static/src/scss/hr_attendance.scss index a129850cc8c..308829b152f 100644 --- a/addons/hr_attendance/static/src/scss/hr_attendance.scss +++ b/addons/hr_attendance/static/src/scss/hr_attendance.scss @@ -94,7 +94,7 @@ border-radius: .1em; box-shadow: inset 0 -3px 0 fade-out(black, 0.7); - &.btn-default:hover { + &.btn-secondary:hover { color: $o-brand-optional; } } @@ -109,7 +109,7 @@ } } - .d-none.d-md-inline-block.btn-default { + .d-none.d-md-inline-block.btn-secondary { transform: translate(-50%, -50%); @include o-position-absolute(0, $left:0); width: 2em; @@ -125,7 +125,7 @@ } } - .btn-default{ + .btn-secondary{ box-shadow: inset 0 0 0 1px fade-out(black, 0.9); color: $headings-color; } diff --git a/addons/hr_attendance/static/src/xml/attendance.xml b/addons/hr_attendance/static/src/xml/attendance.xml index 87916d62795..7da29413eeb 100644 --- a/addons/hr_attendance/static/src/xml/attendance.xml +++ b/addons/hr_attendance/static/src/xml/attendance.xml @@ -43,7 +43,7 @@ <h1 class="mb8"><t t-esc="widget.employee.name"/></h1> <h3 class="mt8 mb24"><t t-if="!checked_in">Welcome!</t><t t-else="">Want to check out?</t></h3> <a class="fa fa-7x o_hr_attendance_sign_in_out_icon fa-sign-out btn-warning" t-if="checked_in" aria-label="Sign out" title="Sign out"/> - <a class="fa fa-7x o_hr_attendance_sign_in_out_icon fa-sign-in btn-default" t-if="!checked_in" aria-label="Sign in" title="Sign in"/> + <a class="fa fa-7x o_hr_attendance_sign_in_out_icon fa-sign-in btn-secondary" t-if="!checked_in" aria-label="Sign in" title="Sign in"/> <h3 class="mt0 mb0 text-muted">Click to <b t-if="checked_in">check out</b><b t-if="!checked_in">check in</b></h3> </t> <t t-else=""> @@ -60,8 +60,8 @@ <div class="o_hr_attendance_kiosk_mode"> <t t-set="checked_in" t-value="widget.employee_state=='checked_in'"/> <div class="o_hr_attendance_back_button"> - <span class="btn btn-default btn-lg d-block d-md-none"><i class="fa fa-chevron-left mr8"/> Go back</span> - <span class="btn btn-default d-none d-md-inline-block"><i class="fa fa-chevron-left" role="img" aria-label="Go back" title="Go back"/></span> + <span class="btn btn-secondary btn-lg d-block d-md-none"><i class="fa fa-chevron-left mr8"/> Go back</span> + <span class="btn btn-secondary d-none d-md-inline-block"><i class="fa fa-chevron-left" role="img" aria-label="Go back" title="Go back"/></span> </div> <t t-if="widget.employee_id"> <div class="o_hr_attendance_user_badge o_home_menu_background"> @@ -71,7 +71,7 @@ <h3 class="mt8 mb24"><t t-if="!checked_in">Welcome!</t><t t-else="">Want to check out?</t></h3> <t t-if="!widget.use_pin"> <a class="fa fa-7x o_hr_attendance_sign_in_out_icon fa-sign-out btn-warning" t-if="checked_in" aria-label="Sign out" title="Sign out"/> - <a class="fa fa-7x o_hr_attendance_sign_in_out_icon fa-sign-in btn-default" t-if="!checked_in" aria-label="Sign in" title="Sign in"/> + <a class="fa fa-7x o_hr_attendance_sign_in_out_icon fa-sign-in btn-secondary" t-if="!checked_in" aria-label="Sign in" title="Sign in"/> <h3 class="mt0 mb0 text-muted">Click to <b t-if="checked_in">check out</b><b t-else="">check in</b></h3> </t> <t t-else=""> @@ -84,7 +84,7 @@ <div class="row"> <t t-foreach="['1', '2', '3', '4', '5', '6', '7', '8', '9', ['C', 'btn-warning'], '0', ['ok', 'btn-primary']]" t-as="btn_name"> <div class="col-xs-4 mb4"> - <a t-attf-class="btn {{btn_name[1]? btn_name[1] : 'btn-default'}} btn-block btn-lg {{ 'o_hr_attendance_pin_pad_button_' + btn_name[0] }}"><t t-esc="btn_name[0]"/></a> + <a t-attf-class="btn {{btn_name[1]? btn_name[1] : 'btn-secondary'}} btn-block btn-lg {{ 'o_hr_attendance_pin_pad_button_' + btn_name[0] }}"><t t-esc="btn_name[0]"/></a> </div> </t> </div> @@ -134,7 +134,7 @@ </t> <t t-else=""> <div class="alert alert-warning" role="alert">Invalid request, please return to the main menu.</div> - <button class="o_hr_attendance_button_dismiss btn btn-default btn-lg">Go back</button> + <button class="o_hr_attendance_button_dismiss btn btn-secondary btn-lg">Go back</button> </t> </div> </div> diff --git a/addons/hr_expense/wizard/hr_expense_sheet_register_payment.xml b/addons/hr_expense/wizard/hr_expense_sheet_register_payment.xml index 77f1d1e3eeb..2f0c668767a 100644 --- a/addons/hr_expense/wizard/hr_expense_sheet_register_payment.xml +++ b/addons/hr_expense/wizard/hr_expense_sheet_register_payment.xml @@ -32,7 +32,7 @@ </sheet> <footer> <button string='Validate' name="expense_post_payment" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/hr_gamification/wizard/gamification_badge_user_wizard_views.xml b/addons/hr_gamification/wizard/gamification_badge_user_wizard_views.xml index b2d20bd219e..198cfeb2d20 100644 --- a/addons/hr_gamification/wizard/gamification_badge_user_wizard_views.xml +++ b/addons/hr_gamification/wizard/gamification_badge_user_wizard_views.xml @@ -31,7 +31,7 @@ </group> <footer> <button string="Reward Employee" type="object" name="action_grant_badge" class="btn-primary" /> - <button string="Cancel" special="cancel" class="btn-default"/> + <button string="Cancel" special="cancel" class="btn-secondary"/> </footer> </form> </field> diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_views.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_views.xml index 9643b3f2103..9e22163fbf6 100644 --- a/addons/hr_holidays/wizard/hr_holidays_summary_department_views.xml +++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_views.xml @@ -13,7 +13,7 @@ </group> <footer> <button name="print_report" string="Print" type="object" class="btn-primary"/> - <button string="Cancel" special="cancel" class="btn-default"/> + <button string="Cancel" special="cancel" class="btn-secondary"/> </footer> </form> </field> diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees_views.xml b/addons/hr_holidays/wizard/hr_holidays_summary_employees_views.xml index 7ea33bf3e01..c1e9b32a0d4 100644 --- a/addons/hr_holidays/wizard/hr_holidays_summary_employees_views.xml +++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees_views.xml @@ -15,7 +15,7 @@ </group> <footer> <button name="print_report" string="Print" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/hr_payroll/wizard/hr_payroll_contribution_register_report_views.xml b/addons/hr_payroll/wizard/hr_payroll_contribution_register_report_views.xml index e1f7db1735f..fd67a95ebac 100644 --- a/addons/hr_payroll/wizard/hr_payroll_contribution_register_report_views.xml +++ b/addons/hr_payroll/wizard/hr_payroll_contribution_register_report_views.xml @@ -13,7 +13,7 @@ </group> <footer> <button name="print_report" string="Print" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/hr_recruitment/views/hr_recruitment_views.xml b/addons/hr_recruitment/views/hr_recruitment_views.xml index 388120b0b6d..2569e5a59a4 100644 --- a/addons/hr_recruitment/views/hr_recruitment_views.xml +++ b/addons/hr_recruitment/views/hr_recruitment_views.xml @@ -451,7 +451,7 @@ </group> <footer> <button string="Create" name="close_dialog" type="object" class="btn-primary"/> - <button string="Discard" class="btn-default" special="cancel"/> + <button string="Discard" class="btn-secondary" special="cancel"/> </footer> </sheet> </form> diff --git a/addons/l10n_eu_service/wizard/wizard.xml b/addons/l10n_eu_service/wizard/wizard.xml index 917ad1df67a..f37da524bbc 100644 --- a/addons/l10n_eu_service/wizard/wizard.xml +++ b/addons/l10n_eu_service/wizard/wizard.xml @@ -36,7 +36,7 @@ <footer> <button string="Create Fiscal Positions and Taxes" name="generate_eu_service" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/l10n_fr_fec/wizard/account_fr_fec_view.xml b/addons/l10n_fr_fec/wizard/account_fr_fec_view.xml index f32db2a96b8..e4a5cd75b83 100644 --- a/addons/l10n_fr_fec/wizard/account_fr_fec_view.xml +++ b/addons/l10n_fr_fec/wizard/account_fr_fec_view.xml @@ -108,7 +108,7 @@ <footer> <button string="Generate" name="generate_fec" type="object" class="oe_highlight"/> - <button string="Cancel" class="btn btn-default" special="cancel"/> + <button string="Cancel" class="btn btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml index 1533a5c6e98..cb05f282174 100644 --- a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml +++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml @@ -8,7 +8,7 @@ <span class="o_form_label">This wizard will print report which displays employees break-up of Net Head for a specified dates.</span> <footer> <button name="print_report" string="Print" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> </footer> <group> <field name="start_date"/> diff --git a/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml index fab60113887..0de770b2229 100644 --- a/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml +++ b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml @@ -8,7 +8,7 @@ <span class="o_form_label">This wizard will print report which display a pay head employee breakup for a specified dates.</span> <footer> <button name="print_report" string="Print" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> </footer> <group> <field name="date_from"/> diff --git a/addons/lunch/wizard/lucky_order_view.xml b/addons/lunch/wizard/lucky_order_view.xml index f6ae254f8c6..2aafbb762b9 100644 --- a/addons/lunch/wizard/lucky_order_view.xml +++ b/addons/lunch/wizard/lucky_order_view.xml @@ -14,7 +14,7 @@ </group> <footer> <button name="random_pick" string="I'm feeling lucky" type="object" class="oe_highlight"/> - <button string="Cancel" class="btn btn-default" special="cancel" /> + <button string="Cancel" class="btn btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/mail/static/src/js/discuss_mobile.js b/addons/mail/static/src/js/discuss_mobile.js index 867af05152c..8e3f0f86c22 100644 --- a/addons/mail/static/src/js/discuss_mobile.js +++ b/addons/mail/static/src/js/discuss_mobile.js @@ -207,9 +207,9 @@ Discuss.include({ .removeClass('o_hidden'); self.$('.o_mailbox_inbox_item') .removeClass('btn-primary') - .addClass('btn-default'); + .addClass('btn-secondary'); self.$('.o_mailbox_inbox_item[data-type=' + type + ']') - .removeClass('btn-default') + .removeClass('btn-secondary') .addClass('btn-primary'); } else { self.$('.o_mail_discuss_mobile_mailboxes_buttons') diff --git a/addons/mail/static/src/scss/discuss.scss b/addons/mail/static/src/scss/discuss.scss index e2d5d8eb2f9..5995cab52e2 100644 --- a/addons/mail/static/src/scss/discuss.scss +++ b/addons/mail/static/src/scss/discuss.scss @@ -277,7 +277,7 @@ width: 50%; padding: 2%; - &.btn-default { + &.btn-secondary { border-bottom: 1px solid $gray-lighter-darker } } diff --git a/addons/mail/static/src/xml/activity.xml b/addons/mail/static/src/xml/activity.xml index 1ca80f46fcd..abad7e51a4f 100644 --- a/addons/mail/static/src/xml/activity.xml +++ b/addons/mail/static/src/xml/activity.xml @@ -65,7 +65,7 @@ <a role="button" href="#" class="btn btn-link btn-success text-muted o_activity_done o_activity_link mr8" t-att-data-activity-id="activity.id" t-att-data-previous-activity-type-id="activity.activity_type_id[0]" data-toggle="popover"> <i class="fa fa-check"/> Mark Done </a> - <a role="button" href="#" class="btn btn-link btn-default text-muted o_activity_edit o_activity_link" t-att-data-activity-id="activity.id"> + <a role="button" href="#" class="btn btn-link btn-secondary text-muted o_activity_edit o_activity_link" t-att-data-activity-id="activity.id"> <i class="fa fa-pencil"/> Edit </a> <a role="button" href="#" class="btn btn-link btn-danger text-muted o_activity_unlink o_activity_link" t-att-data-activity-id="activity.id"> diff --git a/addons/mail/static/src/xml/discuss.xml b/addons/mail/static/src/xml/discuss.xml index f46c5a12300..b11ccd5ce93 100644 --- a/addons/mail/static/src/xml/discuss.xml +++ b/addons/mail/static/src/xml/discuss.xml @@ -182,15 +182,15 @@ <t t-name="mail.discuss.ControlButtons"> <div> <button type="button" class="btn btn-primary o_mail_discuss_button_invite d-none d-md-inline-block" title="Invite people">Invite</button> - <button type="button" class="btn btn-default o_mail_discuss_button_mark_all_read d-none d-md-inline-block" title="Mark all as read">Mark all read</button> - <button type="button" class="btn btn-default o_mail_discuss_button_unstar_all" title="Unstar all messages">Unstar all</button> - <button type="button" class="btn btn-default o_mail_discuss_button_dm d-block d-md-none" title="New Message">New Message</button> - <button t-if="!disableAddThread" type="button" class="btn btn-default o_mail_discuss_button_public o_mail_discuss_button_private d-block d-md-none" title="New Channel">New Channel</button> - <button type="button" class="btn btn-default o_hidden o_mail_discuss_button_select_all" title="Select all messages to moderate">Select All</button> - <button type="button" class="btn btn-default o_hidden o_mail_discuss_button_unselect_all" title="Unselect all messages to moderate">Unselect All</button> - <button type="button" data-decision="accept" class="btn btn-default o_mail_discuss_button_moderate_all" title="Accept selected messages">Accept</button> - <button type="button" data-decision="reject" class="btn btn-default o_mail_discuss_button_moderate_all" title="Reject selected messages">Reject</button> - <button type="button" data-decision="discard" class="btn btn-default o_mail_discuss_button_moderate_all" title="Discard selected messages">Discard</button> + <button type="button" class="btn btn-secondary o_mail_discuss_button_mark_all_read d-none d-md-inline-block" title="Mark all as read">Mark all read</button> + <button type="button" class="btn btn-secondary o_mail_discuss_button_unstar_all" title="Unstar all messages">Unstar all</button> + <button type="button" class="btn btn-secondary o_mail_discuss_button_dm d-block d-md-none" title="New Message">New Message</button> + <button t-if="!disableAddThread" type="button" class="btn btn-secondary o_mail_discuss_button_public o_mail_discuss_button_private d-block d-md-none" title="New Channel">New Channel</button> + <button type="button" class="btn btn-secondary o_hidden o_mail_discuss_button_select_all" title="Select all messages to moderate">Select All</button> + <button type="button" class="btn btn-secondary o_hidden o_mail_discuss_button_unselect_all" title="Unselect all messages to moderate">Unselect All</button> + <button type="button" data-decision="accept" class="btn btn-secondary o_mail_discuss_button_moderate_all" title="Accept selected messages">Accept</button> + <button type="button" data-decision="reject" class="btn btn-secondary o_mail_discuss_button_moderate_all" title="Reject selected messages">Reject</button> + <button type="button" data-decision="discard" class="btn btn-secondary o_mail_discuss_button_moderate_all" title="Discard selected messages">Discard</button> </div> </t> @@ -211,7 +211,7 @@ <button type="button" class="btn btn-primary d-inline d-md-none o_mailbox_inbox_item" title="Inbox" data-type="mailbox_inbox"> Inbox </button> - <button type="button" class="btn btn-default d-inline d-md-none o_mailbox_inbox_item" title="Starred" data-type="mailbox_starred"> + <button type="button" class="btn btn-secondary d-inline d-md-none o_mailbox_inbox_item" title="Starred" data-type="mailbox_starred"> Starred </button> </div> diff --git a/addons/mail/static/src/xml/systray.xml b/addons/mail/static/src/xml/systray.xml index 2f506b926df..1f0cf850f8c 100644 --- a/addons/mail/static/src/xml/systray.xml +++ b/addons/mail/static/src/xml/systray.xml @@ -12,7 +12,7 @@ <ul class="o_mail_systray_dropdown dropdown-menu" role="menu"> <li role="menuitem" t-if="widget.isMobile()"> <div class="o_mail_systray_mobile_header"> - <button type="button" class="btn btn-default o_new_message"> New message </button> + <button type="button" class="btn btn-secondary o_new_message"> New message </button> </div> </li> <li role="menuitem" t-if="!widget.isMobile()" class="o_mail_systray_dropdown_top"> diff --git a/addons/mail/static/tests/discuss_moderation_tests.js b/addons/mail/static/tests/discuss_moderation_tests.js index f4b1994532b..8940efa1185 100644 --- a/addons/mail/static/tests/discuss_moderation_tests.js +++ b/addons/mail/static/tests/discuss_moderation_tests.js @@ -507,7 +507,7 @@ QUnit.test('moderator: discard pending moderation message (reject without explan "should have two buttons in the footer of the dialog"); assert.strictEqual($('.modal-footer button.btn-primary').text(), "Ok", "should have a confirm button in the dialog for discard"); - assert.strictEqual($('.modal-footer button.btn-default').text(), "Cancel", + assert.strictEqual($('.modal-footer button.btn-secondary').text(), "Cancel", "should have a cancel button in the dialog for discard"); // discard mesage diff --git a/addons/mail/views/mail_activity_views.xml b/addons/mail/views/mail_activity_views.xml index a6998e95e29..994acd94699 100644 --- a/addons/mail/views/mail_activity_views.xml +++ b/addons/mail/views/mail_activity_views.xml @@ -115,9 +115,9 @@ <button string="Schedule" name="action_close_dialog" type="object" class="btn-primary"/> <button string="Mark as Done" name="action_done" - type="object" class="btn-default"/> - <button string="Done & Schedule Next" name="action_done_schedule_next" type="object" class="btn-default"/> - <button string="Discard" class="btn-default" special="cancel" /> + type="object" class="btn-secondary"/> + <button string="Done & Schedule Next" name="action_done_schedule_next" type="object" class="btn-secondary"/> + <button string="Discard" class="btn-secondary" special="cancel" /> </footer> </sheet> </form> diff --git a/addons/mail/views/mail_channel_views.xml b/addons/mail/views/mail_channel_views.xml index df471961845..f73e88954ec 100644 --- a/addons/mail/views/mail_channel_views.xml +++ b/addons/mail/views/mail_channel_views.xml @@ -68,7 +68,7 @@ <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-default pull-right" name="action_unfollow">Leave</button> + <button type="object" attrs="{'invisible':['|', ('is_subscribed','=',False), ('group_ids', '!=', [])]}" class="btn btn-secondary pull-right" name="action_unfollow">Leave</button> </div> </div> </t> diff --git a/addons/mail/wizard/email_template_preview_view.xml b/addons/mail/wizard/email_template_preview_view.xml index 67068f5dc84..bbf2e1811da 100644 --- a/addons/mail/wizard/email_template_preview_view.xml +++ b/addons/mail/wizard/email_template_preview_view.xml @@ -29,7 +29,7 @@ nolabel="1" options='{"safe": True}'/> <field name="attachment_ids" widget="many2many_binary" readonly="1"/> <footer> - <button string="Discard" class="btn-default" special="cancel"/> + <button string="Discard" class="btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/mail/wizard/invite_view.xml b/addons/mail/wizard/invite_view.xml index d64e10f387d..aa8633d225d 100644 --- a/addons/mail/wizard/invite_view.xml +++ b/addons/mail/wizard/invite_view.xml @@ -25,7 +25,7 @@ <footer> <button string="Add Followers" name="add_followers" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml index 9995bc15f04..5ca2a1bd494 100644 --- a/addons/mail/wizard/mail_compose_message_view.xml +++ b/addons/mail/wizard/mail_compose_message_view.xml @@ -76,10 +76,10 @@ <footer> <button string="Send" attrs="{'invisible': [('is_log', '=', True)]}" name="send_mail_action" type="object" class="btn-primary o_mail_send"/> <button string="Log" attrs="{'invisible': [('is_log', '=', False)]}" name="send_mail_action" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel" /> + <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-default" help="Save as a new template"/> + class="pull-right btn-secondary" help="Save as a new template"/> </footer> </form> </field> diff --git a/addons/mail/wizard/mail_resend_message_views.xml b/addons/mail/wizard/mail_resend_message_views.xml index 7d30bcfcfdc..045cfe7b7f6 100644 --- a/addons/mail/wizard/mail_resend_message_views.xml +++ b/addons/mail/wizard/mail_resend_message_views.xml @@ -23,8 +23,8 @@ <p attrs="{'invisible':[('has_cancel', '==', False)]}"> <span class="fa fa-info-circle"/> Caution: It won't be possible to send this mail again to the recipients you did not select.</p> <footer> <button string="Resend to selected" name="resend_mail_action" type="object" class="btn-primary o_mail_send"/> - <button string="Ignore all failures" name="cancel_mail_action" type="object" class="btn-default" /> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Ignore all failures" name="cancel_mail_action" type="object" class="btn-secondary" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> </footer> </form> </field> @@ -41,7 +41,7 @@ <img src="/mail/static/img/red_envelope.png" alt="Envelope Example"/> <footer> <button string="Discard delivery failures" name="cancel_resend_action" type="object" class="btn-primary" /> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/mass_mailing/views/mass_mailing_views.xml b/addons/mass_mailing/views/mass_mailing_views.xml index 75a3d9b8d03..b0f1e7cc44e 100644 --- a/addons/mass_mailing/views/mass_mailing_views.xml +++ b/addons/mass_mailing/views/mass_mailing_views.xml @@ -278,7 +278,7 @@ </group> <footer> <button string="Create" name="close_dialog" type="object" class="btn-primary"/> - <button string="Discard" class="btn-default" special="cancel"/> + <button string="Discard" class="btn-secondary" special="cancel"/> </footer> </form> </field> @@ -413,9 +413,9 @@ <header style="min-height:31px;"> <button name="put_in_queue" type="object" attrs="{'invisible': [('state', 'in', ('in_queue', 'done'))]}" class="oe_highlight" string="Send Now" confirm="This will send the email to all recipients. Do you still want to proceed ?"/> - <button name="action_schedule_date" type="object" attrs="{'invisible': [('state', 'in', ('in_queue', 'done'))]}" class="btn-default" string="Schedule"/> - <button name="action_test_mailing" type="object" class="btn-default" string="Test"/> - <button name="cancel_mass_mailing" type="object" attrs="{'invisible': [('state', '!=', 'in_queue')]}" class="btn-default" string="Cancel"/> + <button name="action_schedule_date" type="object" attrs="{'invisible': [('state', 'in', ('in_queue', 'done'))]}" class="btn-secondary" string="Schedule"/> + <button name="action_test_mailing" type="object" class="btn-secondary" string="Test"/> + <button name="cancel_mass_mailing" type="object" attrs="{'invisible': [('state', '!=', 'in_queue')]}" class="btn-secondary" string="Cancel"/> <button name="retry_failed_mail" type="object" attrs="{'invisible': ['|', ('state', '!=', 'done'), ('failed', '=', 0)]}" class="oe_highlight" string="Retry"/> <field name="state" readonly="1" widget="statusbar"/> diff --git a/addons/mass_mailing/wizard/mass_mailing_list_merge_views.xml b/addons/mass_mailing/wizard/mass_mailing_list_merge_views.xml index a199e82ff1c..12e84d21ada 100644 --- a/addons/mass_mailing/wizard/mass_mailing_list_merge_views.xml +++ b/addons/mass_mailing/wizard/mass_mailing_list_merge_views.xml @@ -20,7 +20,7 @@ </field> <footer> <button name="action_mailing_lists_merge" type="object" string="Merge" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/mass_mailing/wizard/mass_mailing_schedule_date_views.xml b/addons/mass_mailing/wizard/mass_mailing_schedule_date_views.xml index b0e1aabe884..46b3244dbb4 100644 --- a/addons/mass_mailing/wizard/mass_mailing_schedule_date_views.xml +++ b/addons/mass_mailing/wizard/mass_mailing_schedule_date_views.xml @@ -12,7 +12,7 @@ </group> <footer> <button string="Schedule" name="set_schedule_date" type="object" class="btn-primary"/> - <button string="Discard " class="btn-default" special="cancel" /> + <button string="Discard " class="btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/mass_mailing/wizard/test_mailing_views.xml b/addons/mass_mailing/wizard/test_mailing_views.xml index 8b69bc0a4b1..b8d9640a88c 100644 --- a/addons/mass_mailing/wizard/test_mailing_views.xml +++ b/addons/mass_mailing/wizard/test_mailing_views.xml @@ -14,7 +14,7 @@ </group> <footer> <button string="Send Sample Mail" name="send_mail_test" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/membership/wizard/membership_invoice_views.xml b/addons/membership/wizard/membership_invoice_views.xml index 366cbe14c61..7c980f68806 100644 --- a/addons/membership/wizard/membership_invoice_views.xml +++ b/addons/membership/wizard/membership_invoice_views.xml @@ -12,7 +12,7 @@ </group> <footer> <button string="Invoice Membership" name="membership_invoice" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/mrp/wizard/change_production_qty_views.xml b/addons/mrp/wizard/change_production_qty_views.xml index f731d2cecc1..ff7c878a58b 100644 --- a/addons/mrp/wizard/change_production_qty_views.xml +++ b/addons/mrp/wizard/change_production_qty_views.xml @@ -15,7 +15,7 @@ <footer> <button name="change_prod_qty" string="Approve" colspan="1" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/mrp/wizard/mrp_product_produce_views.xml b/addons/mrp/wizard/mrp_product_produce_views.xml index f17e5dc9c0e..25da6fe1931 100644 --- a/addons/mrp/wizard/mrp_product_produce_views.xml +++ b/addons/mrp/wizard/mrp_product_produce_views.xml @@ -36,7 +36,7 @@ </group> <footer> <button name="do_produce" type="object" string="Record Production" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/mrp/wizard/mrp_workcenter_block_view.xml b/addons/mrp/wizard/mrp_workcenter_block_view.xml index 01bc051de3a..5a45c5bfe90 100644 --- a/addons/mrp/wizard/mrp_workcenter_block_view.xml +++ b/addons/mrp/wizard/mrp_workcenter_block_view.xml @@ -13,7 +13,7 @@ </group> <footer> <button name="button_block" string="Block" type="object" class="btn-danger text-uppercase"/> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/payment/views/payment_templates.xml b/addons/payment/views/payment_templates.xml index 8e53474d549..b0a733a7fad 100644 --- a/addons/payment/views/payment_templates.xml +++ b/addons/payment/views/payment_templates.xml @@ -141,7 +141,7 @@ </t> </div> <div t-if='back_button_txt' class="pull-left"> - <a role="button" t-att-href="back_button_link or '#'" t-att-class="back_button_class or 'btn btn-lg btn-default'"> + <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> diff --git a/addons/payment/views/payment_views.xml b/addons/payment/views/payment_views.xml index b7fc6500ff0..a6df192a446 100644 --- a/addons/payment/views/payment_views.xml +++ b/addons/payment/views/payment_views.xml @@ -153,7 +153,7 @@ <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-default pull-right" name="button_immediate_install">Install</button> + <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> </div> diff --git a/addons/point_of_sale/views/point_of_sale_dashboard.xml b/addons/point_of_sale/views/point_of_sale_dashboard.xml index b87f14b3b12..ec80fe84365 100644 --- a/addons/point_of_sale/views/point_of_sale_dashboard.xml +++ b/addons/point_of_sale/views/point_of_sale_dashboard.xml @@ -92,7 +92,7 @@ <button t-if="record.current_session_state.raw_value === 'opening_control'" class="btn btn-primary" name="open_existing_session_cb" type="object">Open Session</button> - <button t-if="_.contains(['opened', 'closing_control'], record.current_session_state.raw_value)" class="btn btn-default" name="open_existing_session_cb" type="object">Close</button> + <button t-if="_.contains(['opened', 'closing_control'], record.current_session_state.raw_value)" class="btn btn-secondary" name="open_existing_session_cb" type="object">Close</button> <button t-if="!record.current_session_id.raw_value && !record.pos_session_username.value" class="btn btn-primary" name="open_session_cb" type="object">New Session</button> diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml index 6e1eb5f5ae3..596ba509825 100644 --- a/addons/point_of_sale/wizard/pos_details.xml +++ b/addons/point_of_sale/wizard/pos_details.xml @@ -14,7 +14,7 @@ </group> <footer> <button name="generate_report" string="Print" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/point_of_sale/wizard/pos_discount.xml b/addons/point_of_sale/wizard/pos_discount.xml index e060a7900ab..ff466c2dadc 100644 --- a/addons/point_of_sale/wizard/pos_discount.xml +++ b/addons/point_of_sale/wizard/pos_discount.xml @@ -10,7 +10,7 @@ </group> <footer> <button name="apply_discount" string="Apply Discount" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/point_of_sale/wizard/pos_open_statement.xml b/addons/point_of_sale/wizard/pos_open_statement.xml index 264b4d6cb35..369e610c588 100644 --- a/addons/point_of_sale/wizard/pos_open_statement.xml +++ b/addons/point_of_sale/wizard/pos_open_statement.xml @@ -9,7 +9,7 @@ <span class="o_form_label">The system will open all cash registers, so that you can start recording payments. We suggest you to control the opening balance of each register, using their CashBox tab.</span> <footer> <button name="open_statement" type="object" string="Open Registers" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml index a00ad3957db..9cea3f6aae7 100644 --- a/addons/point_of_sale/wizard/pos_payment.xml +++ b/addons/point_of_sale/wizard/pos_payment.xml @@ -13,7 +13,7 @@ </group> <footer> <button name="check" string="Make Payment" type="object" class="btn-primary"/> - <button special="cancel" string="Cancel" class="btn-default"/> + <button special="cancel" string="Cancel" class="btn-secondary"/> </footer> </form> </field> diff --git a/addons/portal/static/src/scss/portal.scss b/addons/portal/static/src/scss/portal.scss index 6e8ca8dd7a9..faf5942d121 100644 --- a/addons/portal/static/src/scss/portal.scss +++ b/addons/portal/static/src/scss/portal.scss @@ -306,7 +306,6 @@ img.o_we_custom_image { margin-bottom: 0; background-color: $table-bg-active; padding: 6px 10px $navbar-padding-vertical; - border: 1px solid $btn-default-border; border-width: 1px 1px 0 1px; border-bottom-left-radius: 0; border-bottom-right-radius: 0; @@ -323,7 +322,6 @@ img.o_we_custom_image { @include media-breakpoint-down(sm) { .navbar-collapse { z-index: 0; - box-shadow: inset 0 0 0 1px $btn-default-border; background-color: $table-bg-active; border-radius: $btn-border-radius-base; border-top-right-radius: 0; diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml index c061465cebd..89bc191cf32 100644 --- a/addons/portal/views/portal_templates.xml +++ b/addons/portal/views/portal_templates.xml @@ -100,7 +100,7 @@ <t t-call="portal.portal_contact"/> </div> <div class="o_portal_my_details"> - <h3 class="page-header">Your Details <a role="button" href="/my/account" class="btn btn-default btn-xs">Change</a></h3> + <h3 class="page-header">Your Details <a role="button" href="/my/account" class="btn btn-secondary btn-xs">Change</a></h3> <div t-field="user_id.partner_id" t-options='{"widget": "contact", "fields": ["email", "phone", "address", "name"]}'/> </div> <div class="o_my_archives" t-if="archive_groups"> @@ -175,7 +175,7 @@ <ul class="nav pull-left"> <t t-raw="0"/> <li t-if="searchbar_sortings" class="dropdown pull-left ml16"> - <button id="portal_searchbar_sortby" data-toggle="dropdown" class="btn btn-default navbar-btn"> + <button id="portal_searchbar_sortby" data-toggle="dropdown" class="btn btn-secondary navbar-btn"> <span class="fa fa-sort"/> <span class="d-none d-lg-inline"><t t-esc="searchbar_sortings[sortby].get('label', 'Newest')"/></span> <span class="caret"/> @@ -189,7 +189,7 @@ </ul> </li> <li t-if="searchbar_filters" class="dropdown pull-left ml4"> - <button id="portal_searchbar_filters" data-toggle="dropdown" class="btn btn-default navbar-btn"> + <button id="portal_searchbar_filters" data-toggle="dropdown" class="btn btn-secondary navbar-btn"> <span class="fa fa-filter"/> <span class="d-none d-lg-inline"><t t-esc="searchbar_filters[filterby].get('label', 'All')"/></span> <span class="caret"/> @@ -203,7 +203,7 @@ </ul> </li> <li t-if="searchbar_groupby" class="dropdown pull-left ml4"> - <button id="portal_searchbar_groupby" data-toggle="dropdown" class="btn btn-default navbar-btn"> + <button id="portal_searchbar_groupby" data-toggle="dropdown" class="btn btn-secondary 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> <span class="caret"/> @@ -226,7 +226,7 @@ <div class="navbar-form o_portal_search_panel"> <div class="input-group"> <div class="input-group-btn"> - <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> + <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown"> <span id="search_label" class="d-none d-md-inline mr4">Search</span><span class="caret"></span> </button> <ul class="dropdown-menu" role="menu"> @@ -237,7 +237,7 @@ </div> <input type="text" class="form-control" t-att-value='search' name="search"/> <span class="input-group-btn"> - <button class="btn btn-default search-submit" type="button"><span class="fa fa-search d-none d-md-inline-block"/><span class="fa fa-arrow-right d-inline-block d-md-none"/></button> + <button class="btn btn-secondary search-submit" type="button"><span class="fa fa-search d-none d-md-inline-block"/><span class="fa fa-arrow-right d-inline-block d-md-none"/></button> </span> </div> </div> @@ -362,8 +362,8 @@ <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"> - <a role="button" t-att-class="'btn btn-default %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-default %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> + <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> </t> </template> diff --git a/addons/portal/wizard/portal_wizard_views.xml b/addons/portal/wizard/portal_wizard_views.xml index 05896b77748..a39c48e6a31 100644 --- a/addons/portal/wizard/portal_wizard_views.xml +++ b/addons/portal/wizard/portal_wizard_views.xml @@ -31,7 +31,7 @@ placeholder="This text is included in the email sent to new portal users."/> <footer> <button string="Apply" name="action_apply" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/product/wizard/product_price_list_views.xml b/addons/product/wizard/product_price_list_views.xml index 96edadb4c49..d1c3a4b76fe 100644 --- a/addons/product/wizard/product_price_list_views.xml +++ b/addons/product/wizard/product_price_list_views.xml @@ -17,7 +17,7 @@ </group> <footer> <button name="print_report" string="Print" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/product_margin/wizard/product_margin_view.xml b/addons/product_margin/wizard/product_margin_view.xml index 689021f99fa..745009a4b4e 100644 --- a/addons/product_margin/wizard/product_margin_view.xml +++ b/addons/product_margin/wizard/product_margin_view.xml @@ -12,7 +12,7 @@ </group> <footer> <button name="action_open_window" string="Open Margins" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/project/views/project_portal_templates.xml b/addons/project/views/project_portal_templates.xml index 006b9ec4a0e..820d59ccf7b 100644 --- a/addons/project/views/project_portal_templates.xml +++ b/addons/project/views/project_portal_templates.xml @@ -101,7 +101,7 @@ </div> <div class="col-md-6"> <div class="pull-right"> - <a role="button" t-attf-href="/my/tasks?filterby=#{project.id}" class="btn btn-default btn-lg"> + <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" /> <span t-field="project.label_tasks" /> diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml index fec5d2d0bbb..de6663ec65d 100644 --- a/addons/project/views/project_views.xml +++ b/addons/project/views/project_views.xml @@ -265,7 +265,7 @@ </group> <footer> <button string="Create" name="open_tasks" type="object" class="btn-primary o_open_tasks"/> - <button string="Discard" class="btn-default" special="cancel"/> + <button string="Discard" class="btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/repair/wizard/repair_cancel.py b/addons/repair/wizard/repair_cancel.py index eceb6bcb97e..ba3d8bce85b 100644 --- a/addons/repair/wizard/repair_cancel.py +++ b/addons/repair/wizard/repair_cancel.py @@ -33,7 +33,7 @@ class RepairCancel(models.TransientModel): <form string="Cancel Repair"> <header> <button name="cancel_repair" string="_Yes" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </header> <label string="Do you want to continue?"/> </form> diff --git a/addons/repair/wizard/repair_cancel_views.xml b/addons/repair/wizard/repair_cancel_views.xml index 9836653bfa8..be423577d2f 100644 --- a/addons/repair/wizard/repair_cancel_views.xml +++ b/addons/repair/wizard/repair_cancel_views.xml @@ -14,7 +14,7 @@ </group> <footer> <button name="cancel_repair" string="Yes" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/repair/wizard/repair_make_invoice_views.xml b/addons/repair/wizard/repair_make_invoice_views.xml index dab17044305..0196208e2ac 100644 --- a/addons/repair/wizard/repair_make_invoice_views.xml +++ b/addons/repair/wizard/repair_make_invoice_views.xml @@ -14,7 +14,7 @@ </group> <footer> <button name="make_invoices" string="Create Invoice" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/sale/wizard/sale_make_invoice_advance_views.xml b/addons/sale/wizard/sale_make_invoice_advance_views.xml index 5cf44b9a7d5..04330803434 100644 --- a/addons/sale/wizard/sale_make_invoice_advance_views.xml +++ b/addons/sale/wizard/sale_make_invoice_advance_views.xml @@ -34,7 +34,7 @@ context="{'open_invoices': True}" class="btn-primary"/> <button name="create_invoices" string="Create Invoices" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/sale_timesheet/wizard/project_create_invoice_views.xml b/addons/sale_timesheet/wizard/project_create_invoice_views.xml index 3eb5a23a671..6658ce34b28 100644 --- a/addons/sale_timesheet/wizard/project_create_invoice_views.xml +++ b/addons/sale_timesheet/wizard/project_create_invoice_views.xml @@ -13,7 +13,7 @@ </group> <footer> <button string="Create Invoice" type="object" name="action_create_invoice" class="oe_highlight"/> - <button string="Cancel" special="cancel" type="object" class="btn btn-default oe_inline"/> + <button string="Cancel" special="cancel" type="object" class="btn btn-secondary oe_inline"/> </footer> </form> </field> diff --git a/addons/sale_timesheet/wizard/project_create_sale_order_views.xml b/addons/sale_timesheet/wizard/project_create_sale_order_views.xml index 306f9e335f2..f942f66d4ee 100644 --- a/addons/sale_timesheet/wizard/project_create_sale_order_views.xml +++ b/addons/sale_timesheet/wizard/project_create_sale_order_views.xml @@ -17,7 +17,7 @@ </group> <footer> <button string="Create Sales Order" type="object" name="action_create_sale_order" class="oe_highlight"/> - <button string="Cancel" special="cancel" type="object" class="btn btn-default oe_inline"/> + <button string="Cancel" special="cancel" type="object" class="btn btn-secondary oe_inline"/> </footer> </form> </field> diff --git a/addons/sale_timesheet/wizard/project_task_assign_so_line_views.xml b/addons/sale_timesheet/wizard/project_task_assign_so_line_views.xml index 8bc70807a6c..e28f411c8b6 100644 --- a/addons/sale_timesheet/wizard/project_task_assign_so_line_views.xml +++ b/addons/sale_timesheet/wizard/project_task_assign_so_line_views.xml @@ -13,7 +13,7 @@ </group> <footer> <button string="Assign" type="object" name="action_assign_sale_line" class="oe_highlight"/> - <button string="Cancel" special="cancel" type="object" class="btn btn-default oe_inline"/> + <button string="Cancel" special="cancel" type="object" class="btn btn-secondary oe_inline"/> </footer> </form> </field> diff --git a/addons/stock/views/stock_scrap_views.xml b/addons/stock/views/stock_scrap_views.xml index 365442903e4..ac91b1b8417 100644 --- a/addons/stock/views/stock_scrap_views.xml +++ b/addons/stock/views/stock_scrap_views.xml @@ -167,7 +167,7 @@ </group> <footer> <button name="action_validate" string="Done" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/stock/wizard/product_replenish_views.xml b/addons/stock/wizard/product_replenish_views.xml index f1337e2db57..c66d8da5922 100644 --- a/addons/stock/wizard/product_replenish_views.xml +++ b/addons/stock/wizard/product_replenish_views.xml @@ -38,7 +38,7 @@ type="object" class="btn-primary"/> <button string="Discard" - class="btn-default" + class="btn-secondary" special="cancel" /> </footer> </form> diff --git a/addons/stock/wizard/stock_backorder_confirmation_views.xml b/addons/stock/wizard/stock_backorder_confirmation_views.xml index dfd205c8c6e..586c0513df9 100644 --- a/addons/stock/wizard/stock_backorder_confirmation_views.xml +++ b/addons/stock/wizard/stock_backorder_confirmation_views.xml @@ -17,7 +17,7 @@ <footer> <button name="process" string="Create Backorder" type="object" class="oe_highlight"/> <button name="process_cancel_backorder" string="No Backorder" type="object" class="btn-primary"/> - <button string="_Cancel" class="btn-default" special="cancel" /> + <button string="_Cancel" class="btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/stock/wizard/stock_change_product_qty_views.xml b/addons/stock/wizard/stock_change_product_qty_views.xml index 42e72434c23..d0260e9ee92 100644 --- a/addons/stock/wizard/stock_change_product_qty_views.xml +++ b/addons/stock/wizard/stock_change_product_qty_views.xml @@ -18,7 +18,7 @@ </group> <footer> <button name="change_product_qty" string="_Apply" type="object" class="btn-primary"/> - <button string="_Cancel" class="btn-default" special="cancel" /> + <button string="_Cancel" class="btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/stock/wizard/stock_immediate_transfer_views.xml b/addons/stock/wizard/stock_immediate_transfer_views.xml index e84fb1f3fea..ba9988a94ec 100644 --- a/addons/stock/wizard/stock_immediate_transfer_views.xml +++ b/addons/stock/wizard/stock_immediate_transfer_views.xml @@ -13,7 +13,7 @@ </group> <footer> <button name="process" string="_Apply" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/stock/wizard/stock_overprocessed_transfer_views.xml b/addons/stock/wizard/stock_overprocessed_transfer_views.xml index 196c767bcd0..8de8b95fdcd 100644 --- a/addons/stock/wizard/stock_overprocessed_transfer_views.xml +++ b/addons/stock/wizard/stock_overprocessed_transfer_views.xml @@ -14,7 +14,7 @@ </p> <footer> <button name="action_confirm" string="Confirm" type="object" class="btn-primary"/> - <button string="Cancel" special="cancel" class="btn-default"/> + <button string="Cancel" special="cancel" class="btn-secondary"/> </footer> </form> </field> diff --git a/addons/stock/wizard/stock_picking_return_views.xml b/addons/stock/wizard/stock_picking_return_views.xml index cc4dd2de9a3..3bbba44a176 100644 --- a/addons/stock/wizard/stock_picking_return_views.xml +++ b/addons/stock/wizard/stock_picking_return_views.xml @@ -31,7 +31,7 @@ </group> <footer> <button name="create_returns" string="Return" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/stock/wizard/stock_quantity_history.xml b/addons/stock/wizard/stock_quantity_history.xml index d4d2c4aa494..378fde286e7 100644 --- a/addons/stock/wizard/stock_quantity_history.xml +++ b/addons/stock/wizard/stock_quantity_history.xml @@ -13,7 +13,7 @@ </group> <footer> <button name="open_table" string="Retrieve the Inventory Quantities" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/stock/wizard/stock_scheduler_compute_views.xml b/addons/stock/wizard/stock_scheduler_compute_views.xml index bf208c12917..023c1bfb6d8 100644 --- a/addons/stock/wizard/stock_scheduler_compute_views.xml +++ b/addons/stock/wizard/stock_scheduler_compute_views.xml @@ -11,7 +11,7 @@ </p> <footer> <button name="procure_calculation" string="Run Schedulers" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/stock/wizard/stock_track_confirmation_views.xml b/addons/stock/wizard/stock_track_confirmation_views.xml index 41955fc86d5..cc257a84301 100644 --- a/addons/stock/wizard/stock_track_confirmation_views.xml +++ b/addons/stock/wizard/stock_track_confirmation_views.xml @@ -16,7 +16,7 @@ </field> <footer> <button name="action_confirm" string="Confirm" type="object" class="btn-primary"/> - <button string="Discard" special="cancel" class="btn-default"/> + <button string="Discard" special="cancel" class="btn-secondary"/> </footer> </form> </field> diff --git a/addons/stock/wizard/stock_warn_insufficient_qty_views.xml b/addons/stock/wizard/stock_warn_insufficient_qty_views.xml index 8da08434081..f6fb8eee99e 100644 --- a/addons/stock/wizard/stock_warn_insufficient_qty_views.xml +++ b/addons/stock/wizard/stock_warn_insufficient_qty_views.xml @@ -29,7 +29,7 @@ </div> <footer> <button name="cancel_button" string="Discard" class="btn-primary" special="cancel"/> - <button string="Confirm" name="action_done" type="object" class="btn-default"/> + <button string="Confirm" name="action_done" type="object" class="btn-secondary"/> </footer> </form> </field> diff --git a/addons/stock_account/views/stock_account_views.xml b/addons/stock_account/views/stock_account_views.xml index 1e3d84fc6b7..814ee2bbb0b 100644 --- a/addons/stock_account/views/stock_account_views.xml +++ b/addons/stock_account/views/stock_account_views.xml @@ -63,7 +63,7 @@ </group> <footer> <button name="open_table" string="Retrieve the inventory valuation" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> </footer> </form> </field> diff --git a/addons/stock_account/wizard/stock_change_standard_price_views.xml b/addons/stock_account/wizard/stock_change_standard_price_views.xml index 01f4d61318a..3302e1a20fc 100644 --- a/addons/stock_account/wizard/stock_change_standard_price_views.xml +++ b/addons/stock_account/wizard/stock_change_standard_price_views.xml @@ -19,7 +19,7 @@ </group> <footer> <button name="change_price" string="_Apply" type="object" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> </footer> </form> </field> 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 b904605ecd1..a618f8e21d2 100644 --- a/addons/stock_landed_costs/views/stock_landed_cost_views.xml +++ b/addons/stock_landed_costs/views/stock_landed_cost_views.xml @@ -63,7 +63,7 @@ </field> <group class="oe_subtotal_footer oe_right"> <field name="amount_total" widget="monetary"/> - <button colspan="2" name="compute_landed_cost" string="Compute" type="object" class="oe_right btn-default" states='draft'/> + <button colspan="2" name="compute_landed_cost" string="Compute" type="object" class="oe_right btn-secondary" states='draft'/> </group> <div class="oe_clear"/> diff --git a/addons/stock_picking_batch/wizard/stock_picking_to_batch_views.xml b/addons/stock_picking_batch/wizard/stock_picking_to_batch_views.xml index dc45cf58269..da393c44972 100644 --- a/addons/stock_picking_batch/wizard/stock_picking_to_batch_views.xml +++ b/addons/stock_picking_batch/wizard/stock_picking_to_batch_views.xml @@ -11,7 +11,7 @@ <field name="batch_id" class="oe_inline" options="{'no_create_edit': True, 'no_open': True}"/> <footer> <button name="attach_pickings" type="object" string="Add to Batch" class="btn-primary"/> - <button string="Cancel" class="btn-default" special="cancel"/> + <button string="Cancel" class="btn-secondary" special="cancel"/> </footer> </form> </field> diff --git a/addons/survey/views/survey_templates.xml b/addons/survey/views/survey_templates.xml index ec103a8867d..0434d60de4e 100644 --- a/addons/survey/views/survey_templates.xml +++ b/addons/survey/views/survey_templates.xml @@ -99,7 +99,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"> - <a role="button" t-attf-href="/web#view_type=form&model=survey.survey&id=#{survey.id}&action=survey.action_survey_form" class="btn btn-default">Back to Survey</a> + <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> @@ -201,7 +201,7 @@ </div> </t> <div class="text-center mt16 mb16"> - <button t-if="survey.users_can_go_back and page_nr > 0" type="submit" class="btn btn-default" name="button_submit" value="previous">Previous page</button> + <button t-if="survey.users_can_go_back and page_nr > 0" type="submit" class="btn btn-secondary" name="button_submit" value="previous">Previous page</button> <button t-if="not last" type="submit" class="btn btn-primary" name="button_submit" value="next">Next page</button> <button t-if="last" type="submit" class="btn btn-primary" name="button_submit" value="finish">Submit survey</button> </div> diff --git a/addons/survey/wizard/survey_email_compose_message.xml b/addons/survey/wizard/survey_email_compose_message.xml index dee6315971f..167464896ba 100644 --- a/addons/survey/wizard/survey_email_compose_message.xml +++ b/addons/survey/wizard/survey_email_compose_message.xml @@ -56,7 +56,7 @@ </footer> <footer attrs="{'invisible':['|',('public','=',False),('public','in',['public_link'])]}"> <button string="Send" name="send_mail_action" type="object" class="btn-primary" /> - <button string="Cancel" class="btn-default" special="cancel" /> + <button string="Cancel" class="btn-secondary" special="cancel" /> <group class="oe_right" col="1"> <div> Use template diff --git a/addons/theme_default/static/src/scss/option_color_amethyst.scss b/addons/theme_default/static/src/scss/option_color_amethyst.scss index a0a7c914930..a5c9dbbac11 100644 --- a/addons/theme_default/static/src/scss/option_color_amethyst.scss +++ b/addons/theme_default/static/src/scss/option_color_amethyst.scss @@ -19,7 +19,7 @@ .btn .fa { color: white;} -.btn-default .fa { +.btn-secondary .fa { color: $gray-dark;} /* TRANSPARENT BG --------------------------------------------------- */ diff --git a/addons/theme_default/static/src/scss/option_color_cobalt.scss b/addons/theme_default/static/src/scss/option_color_cobalt.scss index ed3c6efb5c4..74d4f5cf00e 100644 --- a/addons/theme_default/static/src/scss/option_color_cobalt.scss +++ b/addons/theme_default/static/src/scss/option_color_cobalt.scss @@ -19,7 +19,7 @@ .btn .fa { color: white;} -.btn-default .fa { +.btn-secondary .fa { color: $gray-dark;} /* TRANSPARENT BG --------------------------------------------------- */ diff --git a/addons/theme_default/static/src/scss/option_color_emerald.scss b/addons/theme_default/static/src/scss/option_color_emerald.scss index d936425e1f2..0c9fc0b47db 100644 --- a/addons/theme_default/static/src/scss/option_color_emerald.scss +++ b/addons/theme_default/static/src/scss/option_color_emerald.scss @@ -19,7 +19,7 @@ .btn .fa { color: white;} -.btn-default .fa { +.btn-secondary .fa { color: $gray-dark;} /* TRANSPARENT BG --------------------------------------------------- */ diff --git a/addons/theme_default/static/src/scss/option_color_gold.scss b/addons/theme_default/static/src/scss/option_color_gold.scss index ba6fa843ec5..9f27adff25f 100644 --- a/addons/theme_default/static/src/scss/option_color_gold.scss +++ b/addons/theme_default/static/src/scss/option_color_gold.scss @@ -19,7 +19,7 @@ .btn .fa { color: white;} -.btn-default .fa { +.btn-secondary .fa { color: $gray-dark;} /* TRANSPARENT BG --------------------------------------------------- */ diff --git a/addons/theme_default/static/src/scss/option_color_ruby.scss b/addons/theme_default/static/src/scss/option_color_ruby.scss index e87f7168391..f1883a2e60f 100644 --- a/addons/theme_default/static/src/scss/option_color_ruby.scss +++ b/addons/theme_default/static/src/scss/option_color_ruby.scss @@ -19,7 +19,7 @@ .btn .fa { color: white;} -.btn-default .fa { +.btn-secondary .fa { color: $gray-dark;} /* TRANSPARENT BG --------------------------------------------------- */ diff --git a/addons/web/static/src/js/core/dialog.js b/addons/web/static/src/js/core/dialog.js index 847845ae17e..9cca9c1127a 100644 --- a/addons/web/static/src/js/core/dialog.js +++ b/addons/web/static/src/js/core/dialog.js @@ -40,7 +40,7 @@ var Dialog = Widget.extend({ * button is added to allow closing the dialog * @param {string} [options.buttons[].text] * @param {string} [options.buttons[].classes] - * Default to 'btn-primary' if only one button, 'btn-default' + * Default to 'btn-primary' if only one button, 'btn-secondary' * otherwise * @param {boolean} [options.buttons[].close=false] * @param {function} [options.buttons[].click] @@ -123,7 +123,7 @@ var Dialog = Widget.extend({ _.each(buttons, function (buttonData) { var $button = dom.renderButton({ attrs: { - class: buttonData.classes || (buttons.length > 1 ? 'btn-default' : 'btn-primary'), + class: buttonData.classes || (buttons.length > 1 ? 'btn-secondary' : 'btn-primary'), disabled: buttonData.disabled, }, icon: buttonData.icon, diff --git a/addons/web/static/src/js/core/dom.js b/addons/web/static/src/js/core/dom.js index 81f5bfec5c0..ba3eebf9bea 100644 --- a/addons/web/static/src/js/core/dom.js +++ b/addons/web/static/src/js/core/dom.js @@ -208,7 +208,7 @@ return { * @param {Object} options * @param {Object} [options.attrs] - Attributes to put on the button element * @param {string} [options.attrs.type='button'] - * @param {string} [options.attrs.class='btn-default'] + * @param {string} [options.attrs.class='btn-secondary'] * Note: automatically completed with "btn btn-X" * (@see options.size for the value of X) * @param {string} [options.size] - @see options.attrs.class @@ -237,7 +237,7 @@ return { if (options.size) { jQueryParams.class += (' btn-' + options.size); } - jQueryParams.class += (' ' + (extraClasses || 'btn-default')); + jQueryParams.class += (' ' + (extraClasses || 'btn-secondary')); var $button = $('<button/>', jQueryParams); diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js index c1c458d1935..73bcc1f1f35 100644 --- a/addons/web/static/src/js/fields/relational_fields.js +++ b/addons/web/static/src/js/fields/relational_fields.js @@ -968,7 +968,7 @@ var FieldX2Many = AbstractField.extend({ _renderButtons: function () { if (!this.isReadonly && this.view.arch.tag === 'kanban') { this.$buttons = $(qweb.render('KanbanView.buttons', { - btnClass: 'btn-default', + btnClass: 'btn-secondary', create_text: this.nodeOptions.create_text, })); this.$buttons.on('click', 'button.o-kanban-button-new', this._onAddRecord.bind(this)); diff --git a/addons/web/static/src/js/views/form/form_renderer.js b/addons/web/static/src/js/views/form/form_renderer.js index a96742bd0e2..5d4e2ad4cb5 100644 --- a/addons/web/static/src/js/views/form/form_renderer.js +++ b/addons/web/static/src/js/views/form/form_renderer.js @@ -159,9 +159,9 @@ var FormRenderer = BasicRenderer.extend({ .removeAttr('disabled'); }, /** - * Put the focus on the last activated widget. + * Put the focus on the last activated widget. * This function is used when closing a dialog to give the focus back to the - * form that has opened it and ensures that the focus is in the correct + * form that has opened it and ensures that the focus is in the correct * field. */ focusLastActivatedWidget: function () { @@ -396,12 +396,13 @@ var FormRenderer = BasicRenderer.extend({ // Current API of odoo for rendering buttons is "if classes are given // use those on top of the 'btn' and 'btn-{size}' classes, otherwise act - // as if 'btn-default' class was given". The problem is that, for header - // buttons only, we allowed users to only indicate their custom classes - // without having to explicitely ask for the 'btn-default' class to be - // added. We force it so here when no bootstrap btn type class is found. - if ($button.not('.btn-primary, .btn-default, .btn-link, .btn-success, .btn-info, .btn-warning, .btn-danger').length) { - $button.addClass('btn-default'); + // as if 'btn-secondary' class was given". The problem is that, for + // header buttons only, we allowed users to only indicate their custom + // classes without having to explicitely ask for the 'btn-secondary' + // class to be added. We force it so here when no bootstrap btn type + // class is found. + if ($button.not('.btn-primary, .btn-secondary, .btn-link, .btn-success, .btn-info, .btn-warning, .btn-danger').length) { + $button.addClass('btn-secondary'); } this._addOnClickAction($button, node); @@ -858,7 +859,7 @@ var FormRenderer = BasicRenderer.extend({ this.defs = defs; var $form = this._renderNode(this.arch).addClass(this.className); delete this.defs; - + return $.when.apply($, defs).then(function () { self._updateView($form.contents()); }, function () { @@ -866,7 +867,7 @@ var FormRenderer = BasicRenderer.extend({ }).then(function(){ if (self.lastActivatedFieldIndex >= 0) { self._activateNextFieldWidget(self.state, self.lastActivatedFieldIndex); - } + } }); }, /** diff --git a/addons/web/static/src/js/views/kanban/kanban_controller.js b/addons/web/static/src/js/views/kanban/kanban_controller.js index 26846e2c511..ab05fabd517 100644 --- a/addons/web/static/src/js/views/kanban/kanban_controller.js +++ b/addons/web/static/src/js/views/kanban/kanban_controller.js @@ -119,7 +119,7 @@ var KanbanController = BasicController.extend({ return this._super.apply(this, arguments); }, /** - * In grouped mode, set 'Create' button as btn-default if there is no column + * In grouped mode, set 'Create' button as btn-secondary if there is no column * (except if we can't create new columns) * * @private diff --git a/addons/web/static/src/js/views/search/search_view_mobile.js b/addons/web/static/src/js/views/search/search_view_mobile.js index 852a65c0a37..ea7fe33ad81 100644 --- a/addons/web/static/src/js/views/search/search_view_mobile.js +++ b/addons/web/static/src/js/views/search/search_view_mobile.js @@ -54,7 +54,7 @@ SearchView.include({ * @private */ _toggleMobileSearchView: function () { - this.$('.o_enable_searchview').toggleClass('btn-default', !!this.query.length); + this.$('.o_enable_searchview').toggleClass('btn-secondary', !!this.query.length); this.$('.o_mobile_search').toggleClass('o_hidden'); }, diff --git a/addons/web/static/src/js/views/view_dialogs.js b/addons/web/static/src/js/views/view_dialogs.js index ed0adf0ff3b..e99f81ccb08 100644 --- a/addons/web/static/src/js/views/view_dialogs.js +++ b/addons/web/static/src/js/views/view_dialogs.js @@ -109,7 +109,7 @@ var FormViewDialog = ViewDialog.extend({ options = options || {}; options.buttons = [{ text: (readonly ? _t("Close") : _t("Discard")), - classes: "btn-default o_form_button_cancel", + classes: "btn-secondary o_form_button_cancel", close: true, click: function () { if (!readonly) { @@ -360,7 +360,7 @@ var SelectCreateDialog = ViewDialog.extend({ // Set the dialog's buttons self.__buttons = [{ text: _t("Cancel"), - classes: "btn-default o_form_button_cancel", + classes: "btn-secondary o_form_button_cancel", close: true, }]; if (!self.options.no_create) { diff --git a/addons/web/static/src/js/widgets/dropdown_menu.js b/addons/web/static/src/js/widgets/dropdown_menu.js index 77dd7be10d0..410d915dc9a 100644 --- a/addons/web/static/src/js/widgets/dropdown_menu.js +++ b/addons/web/static/src/js/widgets/dropdown_menu.js @@ -49,7 +49,7 @@ var DropdownMenu = Widget.extend({ // the style used is the one used in the search view this.dropdownStyle = dropdownHeader.style || { el: {class: 'btn-group o_dropdown', attrs: {}}, - mainButton: {class: 'o_dropdown_toggler_btn btn btn-default dropdown-toggle'}, + mainButton: {class: 'o_dropdown_toggler_btn btn btn-secondary dropdown-toggle'}, }; this.items = items; _.each(this.items, this._prepareItem.bind(this)); diff --git a/addons/web/static/src/scss/control_panel.scss b/addons/web/static/src/scss/control_panel.scss index 54a8eb4ef76..25d4a725604 100644 --- a/addons/web/static/src/scss/control_panel.scss +++ b/addons/web/static/src/scss/control_panel.scss @@ -55,7 +55,7 @@ } .o_form_binary_form span { padding: 3px 25px; - color: $btn-default-color; + color: $btn-secondary-color; } .o_form_binary_form:hover { background-color: $table-bg-hover; diff --git a/addons/web/static/src/scss/webclient.scss b/addons/web/static/src/scss/webclient.scss index 68be626b93a..caea4378aa4 100644 --- a/addons/web/static/src/scss/webclient.scss +++ b/addons/web/static/src/scss/webclient.scss @@ -159,7 +159,7 @@ div.o_boolean_toggle { .btn-link { font-weight: $btn-font-weight; - &.btn-default { + &.btn-secondary { @include o-btn-link-variant($text-color, $headings-color); } &.btn-success, &.text-success { diff --git a/addons/web/static/src/scss/webclient_extra.scss b/addons/web/static/src/scss/webclient_extra.scss index cc87e526f8d..12729c149ae 100644 --- a/addons/web/static/src/scss/webclient_extra.scss +++ b/addons/web/static/src/scss/webclient_extra.scss @@ -47,5 +47,5 @@ select { // Button .btn-icon { - @include button-variant($btn-default-color, $btn-default-bg, $btn-default-border); + @include button-variant($btn-secondary-color, $btn-secondary-bg, $btn-secondary-border); } diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 5e64eb6d0a9..21c8ccc92c3 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -123,7 +123,7 @@ </div> <div class="o_notification_content" t-if="widget.message"><t t-raw="widget.message"/></div> <div t-if="widget.buttons.length" class="o_buttons"> - <button t-foreach="widget.buttons" t-as="button" t-attf-class="btn #{button.primary ? 'btn-primary' : 'btn-default'}" type="button"> + <button t-foreach="widget.buttons" t-as="button" t-attf-class="btn #{button.primary ? 'btn-primary' : 'btn-secondary'}" type="button"> <t t-if="button.icon"> <i t-if="button.icon.indexOf('fa-') === 0" t-attf-class="fa fa-fw o_button_icon #{button.icon}" role="img" t-att-aria-label="button.name" t-att-title="button.name"/> <img t-else="" t-att-src="button.icon" t-att-alt="button.name"/> @@ -176,7 +176,7 @@ </table> <button type="button" class="btn btn-primary oe_form_button">Change Password</button> - <button type="button" class="btn btn-default oe_form_button oe_form_button_cancel" href="javascript:void(0)">Cancel</button> + <button type="button" class="btn btn-secondary oe_form_button oe_form_button_cancel" href="javascript:void(0)">Cancel</button> </div> </form> @@ -342,7 +342,7 @@ <t t-name="Sidebar"> <t t-foreach="widget.sections" t-as="section"> <div class="btn-group o_dropdown"> - <button t-if="section.name != 'buttons'" class="o_dropdown_toggler_btn btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> + <button t-if="section.name != 'buttons'" class="o_dropdown_toggler_btn btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> <t t-if="section.name == 'files'" t-raw="widget.items[section.name].length || ''"/> <t t-esc="section.label"/> <span class="caret"/> </button> @@ -400,7 +400,7 @@ <button type="button" class="btn btn-primary o_list_button_save" accesskey="s"> Save </button> - <button type="button" class="btn btn-default o_list_button_discard" accesskey="j"> + <button type="button" class="btn btn-secondary o_list_button_discard" accesskey="j"> Discard </button> </div> @@ -413,7 +413,7 @@ Edit </button> <button t-if="widget.is_action_enabled('create')" type="button" - class="btn btn-default o_form_button_create" accesskey="c"> + class="btn btn-secondary o_form_button_create" accesskey="c"> Create </button> </div> @@ -423,7 +423,7 @@ Save </button> <button type="button" - class="btn btn-default o_form_button_cancel" accesskey="j"> + class="btn btn-secondary o_form_button_cancel" accesskey="j"> Discard </button> </div> @@ -522,9 +522,9 @@ </ul> </div> <div class="btn-group" role="toolbar" aria-label="Change graph"> - <button class="btn btn-default fa fa-bar-chart-o o_graph_button" title="Bar Chart" aria-label="Bar Chart" data-mode="bar"/> - <button class="btn btn-default fa fa-line-chart o_graph_button" title="Line Chart" aria-label="Line Chart" data-mode="line"/> - <button class="btn btn-default fa fa-pie-chart o_graph_button" title="Pie Chart" aria-label="Pie Chart" data-mode="pie"/> + <button class="btn btn-secondary fa fa-bar-chart-o o_graph_button" title="Bar Chart" aria-label="Bar Chart" data-mode="bar"/> + <button class="btn btn-secondary fa fa-line-chart o_graph_button" title="Line Chart" aria-label="Line Chart" data-mode="line"/> + <button class="btn btn-secondary fa fa-pie-chart o_graph_button" title="Pie Chart" aria-label="Pie Chart" data-mode="pie"/> </div> </t> <div t-name="GraphView.error" class="o_view_nocontent" role="alert"> @@ -551,9 +551,9 @@ </ul> </div> <div class="btn-group" role="toolbar" aria-label="Pivot settings"> - <button class="btn btn-default fa fa-expand o_pivot_flip_button" title="Flip axis" aria-label="Flip axis"/> - <button class="btn btn-default fa fa-arrows-alt o_pivot_expand_button" title="Expand all" aria-label="Expand all"/> - <button class="btn btn-default fa fa-download o_pivot_download" title="Download xls" aria-label="Download xls"/> + <button class="btn btn-secondary fa fa-expand o_pivot_flip_button" title="Flip axis" aria-label="Flip axis"/> + <button class="btn btn-secondary fa fa-arrows-alt o_pivot_expand_button" title="Expand all" aria-label="Expand all"/> + <button class="btn btn-secondary fa fa-download o_pivot_download" title="Download xls" aria-label="Download xls"/> </div> </t> <t t-name="PivotView.FieldSelection"> @@ -613,7 +613,7 @@ <div t-if="hasModel" class="o_field_domain_panel"> <i class="fa fa-arrow-right" role="img" aria-label="Domain" title="Domain"/> - <button t-if="isValid" class="btn btn-xs btn-default o_domain_show_selection_button" type="button"> + <button t-if="isValid" class="btn btn-xs btn-secondary o_domain_show_selection_button" type="button"> <t t-esc="nbRecords"/> record(s) </button> <span t-else="" class="text-warning" role="alert"><i class="fa fa-exclamation-triangle" role="img" aria-label="Warning" title="Warning"/> Invalid domain</span> @@ -834,7 +834,7 @@ t-att-id="widget.idForLabel"/> <a role="button" class="o_dropdown_button" draggable="false"/> </div> - <button type="button" t-if="!widget.nodeOptions.no_open" class="fa fa-external-link btn btn-default o_external_button" tabindex="-1" draggable="false" aria-label="External link" title="External link"/> + <button type="button" t-if="!widget.nodeOptions.no_open" class="fa fa-external-link btn btn-secondary o_external_button" tabindex="-1" draggable="false" aria-label="External link" title="External link"/> </div> </t> <t t-name="FieldReference" t-extend="FieldMany2One"> @@ -901,7 +901,7 @@ </t> <t t-name="FieldStatus.content"> <t t-if="selection_folded.length"> - <button type="button" class="btn o_arrow_button btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">More <span class="caret"/></button> + <button type="button" class="btn o_arrow_button btn-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">More <span class="caret"/></button> <ul class="dropdown-menu o-status-more" role="menu"> <li t-foreach="selection_folded" t-as="i"> <t t-call="FieldStatus.content.button"/> @@ -919,11 +919,11 @@ <t t-esc="i.display_name" role="img" t-attf-aria-label="#{i.display_name} is current state"/> </button> <button type="button" t-att-data-value="i.id" disabled="disabled" title="Not active state" aria-pressed="false" - class="btn o_arrow_button btn-default disabled" t-if="!i.selected and disabled"> + class="btn o_arrow_button btn-secondary disabled" t-if="!i.selected and disabled"> <t t-esc="i.display_name" role="img" t-attf-aria-label="#{i.display_name} is not current state"/> </button> <button type="button" t-att-data-value="i.id" title="Not active state, click to change it" aria-pressed="false" - class="btn o_arrow_button btn-default" t-if="!i.selected and !disabled"> + class="btn o_arrow_button btn-secondary" t-if="!i.selected and !disabled"> <t t-esc="i.display_name" role="img" t-attf-aria-label="Click to change current state to #{i.display_name}"/> </button> </t> @@ -971,8 +971,8 @@ t-att-autofocus="widget.attrs.autofocus"/> <button type="button" class="btn btn-primary o_select_file_button" title="Select">Upload your file</button> - <button type="button" class="btn btn-default fa fa-pencil o_select_file_button" title="Select" aria-label="Select"/> - <button type="button" class="btn btn-default fa fa-trash-o o_clear_file_button" title="Clear" aria-label="Clear"/> + <button type="button" class="btn btn-secondary fa fa-pencil o_select_file_button" title="Select" aria-label="Select"/> + <button type="button" class="btn btn-secondary fa fa-trash-o o_clear_file_button" title="Clear" aria-label="Clear"/> <span class="o_form_binary_progress">Uploading...</span> <t t-call="HiddenInputFile"> @@ -1002,8 +1002,8 @@ <div t-if="widget.mode !== 'readonly'" class="o_form_pdf_controls mt8" role="toolbar" aria-label="PDF controls"> <span class="o_form_binary_progress">Uploading...</span> <button type="button" class="btn btn-primary o_select_file_button" title="Select">Upload your file</button> - <button class="btn btn-default fa fa-pencil o_select_file_button" title="Select" aria-label="Select" type="button"></button> - <button class="btn btn-default fa fa-trash-o o_clear_file_button" title="Clear" aria-label="Clear" type="button"></button> + <button class="btn btn-secondary fa fa-pencil o_select_file_button" title="Select" aria-label="Select" type="button"></button> + <button class="btn btn-secondary fa fa-trash-o o_clear_file_button" title="Clear" aria-label="Clear" type="button"></button> </div> <iframe class="o_pdfview_iframe o_field_pdfviewer"/> <t t-call="HiddenInputPDFFile"> @@ -1024,7 +1024,7 @@ <div t-name="FieldBinaryFileUploader" t-attf-class="oe_fileupload #{widget.attrs.class ? widget.attrs.class :''}" aria-atomic="true"> <div class="oe_placeholder_files"/> <div t-if="widget.mode !== 'readonly'" class="oe_add"> - <button class="btn btn-default o_attach" title="Attach"><span class="fa fa-paperclip" aria-label="Attach"/> <t t-esc="widget.string"/></button> + <button class="btn btn-secondary o_attach" title="Attach"><span class="fa fa-paperclip" aria-label="Attach"/> <t t-esc="widget.string"/></button> <t t-call="HiddenInputFile"> <t t-set="fileupload_id" t-value="widget.fileupload_id"/> <t t-set="fileupload_action" t-translation="off">/web/binary/upload_attachment</t> @@ -1129,7 +1129,7 @@ </li> <li class="o_add_filter_menu"> <button class="btn btn-primary o_apply_filter" type="button">Apply</button> - <button class="btn btn-default o_add_condition" type="button"> + <button class="btn btn-secondary o_add_condition" type="button"> <span class="fa fa-plus-circle"/> Add a condition </button> @@ -1276,7 +1276,7 @@ </t> <div t-name="SearchView.FavoriteMenu" class="btn-group o_dropdown"> - <button class="o_dropdown_toggler_btn btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false" tabindex="-1" aria-label="Favorites" title="Favorites"> + <button class="o_dropdown_toggler_btn btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false" tabindex="-1" aria-label="Favorites" title="Favorites"> <span class="fa fa-star"/> Favorites <span t-attf-class="#{widget.isMobile ? 'fa fa-chevron-right pull-right mt4' : 'caret'}"/> </button> <ul class="dropdown-menu o_favorites_menu" role="menu"> @@ -1331,11 +1331,11 @@ <div class="o_left_field_panel"/> </div> <div class="o_center_panel"> - <button type="button" class="btn btn-default o_add_field">Add</button> - <button type="button" class="btn btn-default o_remove_field">Remove</button> - <button type="button" class="btn btn-default o_remove_all_field">Remove All</button> - <button type="button" class="btn btn-default o_move_up">Move Up</button> - <button type="button" class="btn btn-default o_move_down">Move Down</button> + <button type="button" class="btn btn-secondary o_add_field">Add</button> + <button type="button" class="btn btn-secondary o_remove_field">Remove</button> + <button type="button" class="btn btn-secondary o_remove_all_field">Remove All</button> + <button type="button" class="btn btn-secondary o_move_up">Move Up</button> + <button type="button" class="btn btn-secondary o_move_down">Move Down</button> </div> <div class="o_right_panel"> <h4> @@ -1363,7 +1363,7 @@ </t> </t> <t t-name="Export.SaveList"> - <label>Save as:</label> <input type="text"/><button type="button" class="btn btn-default">Ok</button> + <label>Save as:</label> <input type="text"/><button type="button" class="btn btn-secondary">Ok</button> </t> <t t-name="Export.SavedList"> <label>Saved exports: </label> @@ -1373,7 +1373,7 @@ <option t-att-value="export.id"><t t-esc="export.name"/></option> </t> </select> - <button type="button" class="btn btn-default o_delete_exported_list">Delete</button> + <button type="button" class="btn btn-secondary o_delete_exported_list">Delete</button> </t> <t t-name="Throbber"> @@ -1519,7 +1519,7 @@ </t> <t t-name="AttachDocument"> - <button class="btn btn-default o_attachment_button"> + <button class="btn btn-secondary o_attachment_button"> <span class="o_attach_document"><t t-esc="widget.node.attrs.string"/></span> <span class="d-none"> <t t-call="HiddenInputFile"> diff --git a/addons/web/static/src/xml/kanban.xml b/addons/web/static/src/xml/kanban.xml index 7fd461a7c94..a6d5ecc4ff4 100644 --- a/addons/web/static/src/xml/kanban.xml +++ b/addons/web/static/src/xml/kanban.xml @@ -72,7 +72,7 @@ <div> <button class="btn btn-primary o_kanban_add">Add</button> <button class="btn btn-primary o_kanban_edit">Edit</button> - <button class="btn btn-default o_kanban_cancel ml8">Discard</button> + <button class="btn btn-secondary o_kanban_cancel ml8">Discard</button> </div> </t> diff --git a/addons/web/static/src/xml/report.xml b/addons/web/static/src/xml/report.xml index 927502e19ac..49313e8de5a 100644 --- a/addons/web/static/src/xml/report.xml +++ b/addons/web/static/src/xml/report.xml @@ -11,11 +11,11 @@ <button type="button" class="btn btn-primary o_report_print" title="Print">Print</button> </div> <div class="o_edit_mode_available"> - <button type="button" class="btn btn-default o_report_edit" title="Edit">Edit</button> + <button type="button" class="btn btn-secondary o_report_edit" title="Edit">Edit</button> </div> <div class="o_report_edit_mode"> <button type="button" class="btn btn-primary o_report_save" title="Save">Save</button> - <button type="button" class="btn btn-default o_report_discard" title="Discard">Discard</button> + <button type="button" class="btn btn-secondary o_report_discard" title="Discard">Discard</button> </div> </t> </template>
\ No newline at end of file diff --git a/addons/web/static/src/xml/web_calendar.xml b/addons/web/static/src/xml/web_calendar.xml index daf378ff3c6..3eb95710c48 100644 --- a/addons/web/static/src/xml/web_calendar.xml +++ b/addons/web/static/src/xml/web_calendar.xml @@ -69,9 +69,9 @@ <button class="o_calendar_button_next btn btn-primary" aria-label="Next" title="Next"><span class="fa fa-arrow-right"/></button> </t> <div class="btn-group"> - <button type="button" class="o_calendar_button_day btn btn-default">Day</button> - <button type="button" class="o_calendar_button_week btn btn-default">Week</button> - <button type="button" class="o_calendar_button_month btn btn-default">Month</button> + <button type="button" class="o_calendar_button_day btn btn-secondary">Day</button> + <button type="button" class="o_calendar_button_week btn btn-secondary">Week</button> + <button type="button" class="o_calendar_button_month btn btn-secondary">Month</button> </div> </div> </t> diff --git a/addons/web/static/tests/chrome/action_manager_tests.js b/addons/web/static/tests/chrome/action_manager_tests.js index 2f003c07577..15ccbb38a7f 100644 --- a/addons/web/static/tests/chrome/action_manager_tests.js +++ b/addons/web/static/tests/chrome/action_manager_tests.js @@ -2677,7 +2677,7 @@ QUnit.module('ActionManager', { "should display a modal dialog to confirm discard action"); // cancel - $('.modal .modal-footer button.btn-default').click(); + $('.modal .modal-footer button.btn-secondary').click(); assert.strictEqual(actionManager.$('.o_form_view').length, 1, "should still be in form view"); diff --git a/addons/web/static/tests/fields/relational_fields_tests.js b/addons/web/static/tests/fields/relational_fields_tests.js index fd81fba68ab..8c91b0f4d54 100644 --- a/addons/web/static/tests/fields/relational_fields_tests.js +++ b/addons/web/static/tests/fields/relational_fields_tests.js @@ -4048,7 +4048,7 @@ QUnit.module('relational_fields', { "there should be two records in the one2many in the dialog"); // click on 'Discard' - $('.modal-footer .btn-default').click(); + $('.modal-footer .btn-secondary').click(); assert.strictEqual($('.modal').length, 0, "dialog should be closed"); @@ -4800,8 +4800,8 @@ QUnit.module('relational_fields', { 'delete icon should be visible in edit'); assert.ok(form.$('.o_field_one2many .o-kanban-button-new').length, '"Create" button should be visible in edit'); - assert.ok(form.$('.o_field_one2many .o-kanban-button-new').hasClass('btn-default'), - "'Create' button should have className 'btn-default'"); + assert.ok(form.$('.o_field_one2many .o-kanban-button-new').hasClass('btn-secondary'), + "'Create' button should have className 'btn-secondary'"); assert.strictEqual(form.$('.o_field_one2many .o-kanban-button-new').text().trim(), "Add", 'Create button should have "Add" label'); @@ -5380,7 +5380,7 @@ QUnit.module('relational_fields', { "pager should still display the correct total"); // click on cancel - $('.modal .modal-footer .btn-default').click(); // click on cancel + $('.modal .modal-footer .btn-secondary').click(); // click on cancel assert.strictEqual(form.$('.o_cp_pager').text().trim(), '1-3 / 4', "pager should again display the correct total"); @@ -5471,7 +5471,7 @@ QUnit.module('relational_fields', { 'a confirmation model should be opened'); // click on cancel, the line should still be selected - $('.modal .modal-footer button.btn-default').click(); + $('.modal .modal-footer button.btn-secondary').click(); assert.strictEqual(form.$('tr.o_data_row.o_selected_row').length, 1, "should still have 1 selected data row"); @@ -11139,9 +11139,9 @@ QUnit.module('relational_fields', { var $selectedStatus = form.$('.o_statusbar_status button[data-value="4"]'); assert.ok($selectedStatus.hasClass('btn-primary') && $selectedStatus.hasClass('disabled'), "selected status should be btn-primary and disabled"); - var $clickable = form.$('.o_statusbar_status button.btn-default:not(.dropdown-toggle):not(:disabled)'); + var $clickable = form.$('.o_statusbar_status button.btn-secondary:not(.dropdown-toggle):not(:disabled)'); assert.strictEqual($clickable.length, 2, - "other status should be btn-default and not disabled"); + "other status should be btn-secondary and not disabled"); $clickable.last().click(); // (last is visually the first here (css)) var $status = form.$('.o_statusbar_status button[data-value="1"]'); assert.ok($status.hasClass("btn-primary") && $status.hasClass("disabled"), diff --git a/addons/web/static/tests/services/notification_service_tests.js b/addons/web/static/tests/services/notification_service_tests.js index e2619e393f4..aff3de8cc39 100644 --- a/addons/web/static/tests/services/notification_service_tests.js +++ b/addons/web/static/tests/services/notification_service_tests.js @@ -184,7 +184,7 @@ QUnit.module('Services', { var $notification = $('body .o_notification_manager .o_notification'); assert.strictEqual($notification.eq(0).find('.o_close').length, 1, "should display the close button in notification"); assert.strictEqual(_.str.trim($notification.eq(0).html().replace(/\s+/g, ' ')), - "<a aria-label=\"Close\" class=\"fa fa-times o_close\" href=\"#\" title=\"Close\"></a> <div class=\"o_notification_title\"> <span role=\"img\" aria-label=\"Notification undefined\" class=\"o_icon fa fa-3x fa-question-circle-o\" title=\"Notification undefined\"></span> a0 </div> <div class=\"o_notification_content\">b0</div> <div class=\"o_buttons\"> <button type=\"button\" class=\"btn btn-primary\"> <span>accept0</span> </button><button type=\"button\" class=\"btn btn-default\"> <span>refuse0</span> </button> </div>", + "<a aria-label=\"Close\" class=\"fa fa-times o_close\" href=\"#\" title=\"Close\"></a> <div class=\"o_notification_title\"> <span role=\"img\" aria-label=\"Notification undefined\" class=\"o_icon fa fa-3x fa-question-circle-o\" title=\"Notification undefined\"></span> a0 </div> <div class=\"o_notification_content\">b0</div> <div class=\"o_buttons\"> <button type=\"button\" class=\"btn btn-primary\"> <span>accept0</span> </button><button type=\"button\" class=\"btn btn-secondary\"> <span>refuse0</span> </button> </div>", "should display notification"); $notification.find('.o_buttons button:contains(accept0)').click(); diff --git a/addons/web/static/tests/views/calendar_tests.js b/addons/web/static/tests/views/calendar_tests.js index 9a8d0e9f043..0bdc22bd3ee 100644 --- a/addons/web/static/tests/views/calendar_tests.js +++ b/addons/web/static/tests/views/calendar_tests.js @@ -549,7 +549,7 @@ QUnit.module('Views', { // delete record $newevent.trigger('click'); - $('.modal button.btn-default:contains(Delete)').trigger('click'); + $('.modal button.btn-secondary:contains(Delete)').trigger('click'); $('.modal button.btn-primary:contains(Ok)').trigger('click'); assert.strictEqual(calendar.$('.fc-content').length, 0, "should delete the record"); @@ -798,7 +798,7 @@ QUnit.module('Views', { // delete record $newevent.trigger('click'); - $('.modal button.btn-default:contains(Delete)').trigger('click'); + $('.modal button.btn-secondary:contains(Delete)').trigger('click'); $('.modal button.btn-primary:contains(Ok)').trigger('click'); assert.strictEqual(calendar.$('.fc-content').length, 0, "should delete the record"); diff --git a/addons/web/static/tests/views/form_tests.js b/addons/web/static/tests/views/form_tests.js index 868101833aa..232a6d59f30 100644 --- a/addons/web/static/tests/views/form_tests.js +++ b/addons/web/static/tests/views/form_tests.js @@ -1122,7 +1122,7 @@ QUnit.module('Views', { '<button name="0"/>' + '<button name="1" class="btn-primary"/>' + '<button name="2" class="oe_highlight"/>' + - '<button name="3" class="btn-default"/>' + + '<button name="3" class="btn-secondary"/>' + '<button name="4" class="btn-link"/>' + '<button name="5" class="oe_link"/>' + '<button name="6" class="btn-success"/>' + @@ -1132,7 +1132,7 @@ QUnit.module('Views', { '<button name="8"/>' + '<button name="9" class="btn-primary"/>' + '<button name="10" class="oe_highlight"/>' + - '<button name="11" class="btn-default"/>' + + '<button name="11" class="btn-secondary"/>' + '<button name="12" class="btn-link"/>' + '<button name="13" class="oe_link"/>' + '<button name="14" class="btn-success"/>' + @@ -1142,13 +1142,13 @@ QUnit.module('Views', { res_id: 2, }); - assert.strictEqual(form.$('button[name="0"]').attr('class'), 'btn btn-default', + assert.strictEqual(form.$('button[name="0"]').attr('class'), 'btn btn-secondary', "header buttons without any class should receive the correct classes"); assert.strictEqual(form.$('button[name="1"]').attr('class'), 'btn btn-primary', "header buttons with bootstrap primary class should receive the correct classes"); assert.strictEqual(form.$('button[name="2"]').attr('class'), 'btn btn-primary', "header buttons with oe_highlight class should receive the correct classes"); - assert.strictEqual(form.$('button[name="3"]').attr('class'), 'btn btn-default', + assert.strictEqual(form.$('button[name="3"]').attr('class'), 'btn btn-secondary', "header buttons with bootstrap default class should receive the correct classes"); assert.strictEqual(form.$('button[name="4"]').attr('class'), 'btn btn-link', "header buttons with bootstrap link class should receive the correct classes"); @@ -1156,15 +1156,15 @@ QUnit.module('Views', { "header buttons with oe_link class should receive the correct classes"); assert.strictEqual(form.$('button[name="6"]').attr('class'), 'btn btn-success', "header buttons with bootstrap state class should receive the correct classes"); - assert.strictEqual(form.$('button[name="7"]').attr('class'), 'btn o_this_is_a_button btn-default', + assert.strictEqual(form.$('button[name="7"]').attr('class'), 'btn o_this_is_a_button btn-secondary', "header buttons with custom classes should receive the correct classes"); - assert.strictEqual(form.$('button[name="8"]').attr('class'), 'btn btn-default', + assert.strictEqual(form.$('button[name="8"]').attr('class'), 'btn btn-secondary', "sheet header buttons without any class should receive the correct classes"); assert.strictEqual(form.$('button[name="9"]').attr('class'), 'btn btn-primary', "sheet buttons with bootstrap primary class should receive the correct classes"); assert.strictEqual(form.$('button[name="10"]').attr('class'), 'btn btn-primary', "sheet buttons with oe_highlight class should receive the correct classes"); - assert.strictEqual(form.$('button[name="11"]').attr('class'), 'btn btn-default', + assert.strictEqual(form.$('button[name="11"]').attr('class'), 'btn btn-secondary', "sheet buttons with bootstrap default class should receive the correct classes"); assert.strictEqual(form.$('button[name="12"]').attr('class'), 'btn btn-link', "sheet buttons with bootstrap link class should receive the correct classes"); @@ -1996,7 +1996,7 @@ QUnit.module('Views', { arch: '<form string="Partners">' + '<field name="foo"/>' + '<button string="Do something" class="btn-primary" name="abc" type="object"/>' + - '<button string="Discard" class="btn-default" special="cancel"/>' + + '<button string="Discard" class="btn-secondary" special="cancel"/>' + '</form>', res_id: 1, mockRPC: function (route, args) { @@ -2246,7 +2246,7 @@ QUnit.module('Views', { // click on discard and cancel the confirm request form.$buttons.find('.o_form_button_cancel').click(); assert.ok($('.modal').length, 'a confirm modal should be displayed'); - $('.modal-footer .btn-default').click(); // click on cancel + $('.modal-footer .btn-secondary').click(); // click on cancel assert.strictEqual(form.$('input').val(), 'new value', 'input should still contain new value'); // click on discard and confirm @@ -2482,7 +2482,7 @@ QUnit.module('Views', { // click on the pager to switch to the next record and cancel the confirm request form.pager.$('.o_pager_next').click(); // click on next assert.ok($('.modal').length, 'a confirm modal should be displayed'); - $('.modal-footer .btn-default').click(); // click on cancel + $('.modal-footer .btn-secondary').click(); // click on cancel assert.strictEqual(form.$('input').val(), 'new value', 'input should still contain new value'); assert.strictEqual(form.pager.$('.o_pager_value').text(), "1", 'pager value should still be 1'); @@ -5861,7 +5861,7 @@ QUnit.module('Views', { form.$('.o_statusbar_buttons button').click(); assert.ok(form.$('.o_statusbar_buttons button').prop('disabled'), 'button should be disabled'); - $('.modal-footer button.btn-default').click(); + $('.modal-footer button.btn-secondary').click(); assert.ok(!form.$('.o_statusbar_buttons button').prop('disabled'), 'button should no longer be disabled'); @@ -6519,7 +6519,7 @@ QUnit.module('Views', { } }); - form.$('.o_form_statusbar .btn-default').click(); + form.$('.o_form_statusbar .btn-secondary').click(); form.destroy(); }); diff --git a/addons/web/static/tests/views/kanban_tests.js b/addons/web/static/tests/views/kanban_tests.js index bbf02b1eaae..5d18d03c553 100644 --- a/addons/web/static/tests/views/kanban_tests.js +++ b/addons/web/static/tests/views/kanban_tests.js @@ -184,7 +184,7 @@ QUnit.module('Views', { envIDs = [4]; kanban.$('.o_kanban_group:last .o_column_archive_records').click(); // Click on 'Archive All' assert.ok($('.modal').length, 'a confirm modal should be displayed'); - $('.modal-footer .btn-default').click(); // Click on 'Cancel' + $('.modal-footer .btn-secondary').click(); // Click on 'Cancel' assert.strictEqual(kanban.$('.o_kanban_group:last .o_kanban_record').length, 3, "still last column should contain 3 records"); kanban.$('.o_kanban_group:last .o_column_archive_records').click(); assert.ok($('.modal').length, 'a confirm modal should be displayed'); @@ -1795,7 +1795,7 @@ QUnit.module('Views', { // delete second column (first cancel the confirm request, then confirm) kanban.$('.o_kanban_group:last .o_column_delete').click(); // click on delete assert.ok($('.modal').length, 'a confirm modal should be displayed'); - $('.modal-footer .btn-default').click(); // click on cancel + $('.modal-footer .btn-secondary').click(); // click on cancel assert.strictEqual(kanban.$('.o_kanban_group:last').data('id'), 5, 'column [5, "xmo"] should still be there'); kanban.$('.o_kanban_group:last .o_column_delete').click(); // click on delete @@ -1928,7 +1928,7 @@ QUnit.module('Views', { kanban.$('.o_kanban_group[data-id=5] .o_column_edit').click(); // click on 'Edit' $('.modal .o_form_editable input').val('ged').trigger('input'); // change the value nbRPCs = 0; - $('.modal-footer .btn-default').click(); // click on discard + $('.modal-footer .btn-secondary').click(); // click on discard assert.ok(!$('.modal').length, 'the modal should be closed'); assert.strictEqual(kanban.$('.o_kanban_group[data-id=5] .o_column_title').text(), 'xmo', 'title of the column should still be "xmo"'); diff --git a/addons/web/static/tests/views/list_tests.js b/addons/web/static/tests/views/list_tests.js index 52b7eaed31b..1ea69e9320b 100644 --- a/addons/web/static/tests/views/list_tests.js +++ b/addons/web/static/tests/views/list_tests.js @@ -917,7 +917,7 @@ QUnit.module('Views', { assert.verifySteps(['/web/dataset/search_read']); list.sidebar.$('a:contains(Archive)').click(); assert.strictEqual($('.modal').length, 1, 'a confirm modal should be displayed'); - $('.modal-footer .btn-default').click(); // Click on 'Cancel' + $('.modal-footer .btn-secondary').click(); // Click on 'Cancel' assert.strictEqual(list.$('tbody td.o_list_record_selector').length, 4, "still should have 4 records"); list.sidebar.$('a:contains(Archive)').click(); diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml index 5bbb480f735..b05e7e05bf6 100644 --- a/addons/web/views/webclient_templates.xml +++ b/addons/web/views/webclient_templates.xml @@ -363,7 +363,7 @@ <div class="input-group"> <input type="text" name="db" t-att-value="request.db" id="db" class="form-control" required="required" readonly="readonly"/> <span class="input-group-btn"> - <a role="button" href="/web/database/selector" class="btn btn-default">Select <i class="fa fa-database" role="img" aria-label="Database" title="Database"></i></a> + <a role="button" href="/web/database/selector" class="btn btn-secondary">Select <i class="fa fa-database" role="img" aria-label="Database" title="Database"></i></a> </span> </div> </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 7fa1afe3adc..4886a76377b 100644 --- a/addons/web_editor/static/lib/summernote/src/js/Renderer.js +++ b/addons/web_editor/static/lib/summernote/src/js/Renderer.js @@ -36,7 +36,7 @@ define([ return (dropdown ? '<div class="btn-group' + (className ? ' ' + className : '') + '">' : '') + '<button type="button"' + - ' class="btn btn-default btn-sm' + + ' class="btn btn-secondary btn-sm' + ((!dropdown && className) ? ' ' + className : '') + (dropdown ? ' dropdown-toggle' : '') + '"' + 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 b0669f4b390..cd482a18d7c 100644 --- a/addons/web_editor/static/src/js/editor/rte.summernote.js +++ b/addons/web_editor/static/src/js/editor/rte.summernote.js @@ -168,7 +168,7 @@ renderer.tplPopovers = function (lang, options) { var $alt = $('<div class="btn-group"/>'); $alt.appendTo($imagePopover.find('.popover-content')); - $alt.append('<button class="btn btn-default" data-event="alt"><strong>' + _t('Description') + ': </strong><span class="o_image_alt"/></button>'); + $alt.append('<button class="btn btn-secondary" data-event="alt"><strong>' + _t('Description') + ': </strong><span class="o_image_alt"/></button>'); //////////////// link popover diff --git a/addons/web_editor/static/src/js/widgets/widgets.js b/addons/web_editor/static/src/js/widgets/widgets.js index 8148f61a4f8..9e04c9dbe7d 100644 --- a/addons/web_editor/static/src/js/widgets/widgets.js +++ b/addons/web_editor/static/src/js/widgets/widgets.js @@ -613,7 +613,7 @@ var ImageWidget = MediaWidget.extend({ var $input = $(ev.currentTarget); var $button = $input.next('button'); var emptyValue = ($input.val() === ''); - $button.toggleClass('btn-default', emptyValue).toggleClass('btn-primary', !emptyValue) + $button.toggleClass('btn-secondary', emptyValue).toggleClass('btn-primary', !emptyValue) .prop('disabled', emptyValue); }, /** @@ -1477,7 +1477,7 @@ var LinkDialog = Dialog.extend({ this.data.text = data.label; this.data.url = data.url; this.data.className = data.classes.replace(/\s+/gi, ' ').replace(/^\s+|\s+$/gi, ''); - if (data.classes.replace(/(^|[ ])(btn-default|btn-success|btn-primary|btn-info|btn-warning|btn-danger)([ ]|$)/gi, ' ')) { + if (data.classes.replace(/(^|[ ])(btn-secondary|btn-success|btn-primary|btn-info|btn-warning|btn-danger)([ ]|$)/gi, ' ')) { this.data.style = {'background-color': '', 'color': ''}; } this.data.isNewWindow = data.isNewWindow; diff --git a/addons/web_editor/static/src/scss/web_editor.ui.scss b/addons/web_editor/static/src/scss/web_editor.ui.scss index 585f134afb7..e82ad579fe8 100644 --- a/addons/web_editor/static/src/scss/web_editor.ui.scss +++ b/addons/web_editor/static/src/scss/web_editor.ui.scss @@ -61,7 +61,7 @@ &.btn-primary { @include button-variant(white, $o-brand-primary, $o-brand-primary); } - &.btn-default { + &.btn-secondary { @include button-variant(white, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0)); &:hover { diff --git a/addons/web_editor/static/src/scss/web_editor.variables.scss b/addons/web_editor/static/src/scss/web_editor.variables.scss index 196af3ff0ad..0e65ea99afa 100644 --- a/addons/web_editor/static/src/scss/web_editor.variables.scss +++ b/addons/web_editor/static/src/scss/web_editor.variables.scss @@ -177,7 +177,7 @@ $o-we-switch-inactive-color: $o-we-color-paper !default; &.btn-primary { @include button-variant(white, $o-brand-optional, darken($o-brand-optional,5%)); } - &.btn-default { + &.btn-secondary { @include button-variant($o-we-color-normal, white, $o-we-color-text-light); } &.btn-link { diff --git a/addons/web_editor/static/src/xml/ace.xml b/addons/web_editor/static/src/xml/ace.xml index 4380a73ae54..257ce6af707 100644 --- a/addons/web_editor/static/src/xml/ace.xml +++ b/addons/web_editor/static/src/xml/ace.xml @@ -27,7 +27,7 @@ </label> <div class="o_button_section"> <button data-action="save" type="submit" class="btn btn-primary">Save</button> - <button data-action="close" type="button" class="btn btn-default">Close</button> + <button data-action="close" type="button" class="btn btn-secondary">Close</button> </div> </div> <div id="ace-view-id"> diff --git a/addons/web_editor/static/src/xml/backend.xml b/addons/web_editor/static/src/xml/backend.xml index 76663cc9fbc..c4666a1aa96 100644 --- a/addons/web_editor/static/src/xml/backend.xml +++ b/addons/web_editor/static/src/xml/backend.xml @@ -9,7 +9,7 @@ <t t-name="web_editor.FieldTextHtml.button.translate"> <div class="btn-group pull-right"> - <button t-if="widget.field.translate" class="o_field_translate btn btn-default" style="height: 24px; padding: 1px 17px 0px 5px" aria-label="Translate" title="Translate"> + <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> </div> diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml index 01a4af11ac4..1928572fc0d 100644 --- a/addons/web_editor/static/src/xml/editor.xml +++ b/addons/web_editor/static/src/xml/editor.xml @@ -9,7 +9,7 @@ <div id="web_editor-top-edit"> <div id="web_editor-toolbars"/> <form class="navbar-form text-muted"> - <button type="button" class="btn btn-default" data-action="cancel"><i class="fa fa-times"/> Discard</button> + <button type="button" class="btn btn-secondary" data-action="cancel"><i class="fa fa-times"/> Discard</button> <button type="button" class="btn btn-primary" data-action="save"><i class="fa fa-floppy-o"/> Save</button> </form> </div> @@ -54,10 +54,10 @@ <li class="search pull-right"> <ul class="pager mb0 mt0"> <li class="previous"> - <a role="button" class="btn btn-default disabled" href="#"><i class="fa fa-angle-left"/> Previous</a> + <a role="button" class="btn btn-secondary disabled" href="#"><i class="fa fa-angle-left"/> Previous</a> </li> <li class="next"> - <a role="button" class="btn btn-default disabled" href="#">Next <i class="fa fa-angle-right"/></a> + <a role="button" class="btn btn-secondary disabled" href="#">Next <i class="fa fa-angle-right"/></a> </li> </ul> </li> @@ -110,7 +110,7 @@ <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;"/> - <button type="button" class="btn btn-default o_upload_image_url_button" disabled="disabled">Add</button> + <button type="button" class="btn btn-secondary o_upload_image_url_button" disabled="disabled">Add</button> </div> </div> </div> @@ -271,7 +271,7 @@ <input class="d-none link-style" name="link_style_color" type="radio" value=""/> <i class="fa"/> </label> - <t t-foreach="['primary', 'default', 'success', 'info', 'warning', 'danger', 'alpha', 'beta', 'gamma', 'delta', 'epsilon']" t-as="color"> + <t t-foreach="['primary', 'secondary', 'success', 'info', 'warning', 'danger', 'alpha', 'beta', 'gamma', 'delta', 'epsilon']" t-as="color"> <label role="button" t-attf-class="o_link_dialog_color_item o_btn_preview btn btn-#{color}" t-attf-aria-label="Color for #{color}" t-attf-title="Color for #{color}"> <input type="radio" name="link_style_color" class="d-none link-style" t-att-value="color"/> <i class="fa"/> @@ -319,25 +319,25 @@ <div class="btn-group" title="Aspect Ratio" data-toggle="buttons"> <t t-foreach="widget.aspectRatioList" t-as="ratio"> <t t-set="is_active" t-value="ratio[1] === widget.imageData.aspectRatio"/> - <a href="#" t-attf-class="btn btn-default#{is_active and ' active' or ''}" data-event="ratio" t-att-data-label="ratio[1]" t-att-data-value="ratio[2]"> + <a href="#" t-attf-class="btn btn-secondary#{is_active and ' active' or ''}" data-event="ratio" t-att-data-label="ratio[1]" t-att-data-value="ratio[2]"> <t t-esc="ratio[0]"/> </a> </t> </div> <div class="btn-group" role="group"> - <a href="#" class="btn btn-default" title="Zoom In" data-event="zoom" data-value="0.1"><i class="fa fa-search-plus"/></a> - <a href="#" class="btn btn-default" title="Zoom Out" data-event="zoom" data-value="-0.1"><i class="fa fa-search-minus"/></a> + <a href="#" class="btn btn-secondary" title="Zoom In" data-event="zoom" data-value="0.1"><i class="fa fa-search-plus"/></a> + <a href="#" class="btn btn-secondary" title="Zoom Out" data-event="zoom" data-value="-0.1"><i class="fa fa-search-minus"/></a> </div> <div class="btn-group" role="group"> - <a href="#" class="btn btn-default" title="Rotate Left" data-event="rotate" data-value="-45"><i class="fa fa-rotate-left"/></a> - <a href="#" class="btn btn-default" title="Rotate Right" data-event="rotate" data-value="45"><i class="fa fa-rotate-right"/></a> + <a href="#" class="btn btn-secondary" title="Rotate Left" data-event="rotate" data-value="-45"><i class="fa fa-rotate-left"/></a> + <a href="#" class="btn btn-secondary" title="Rotate Right" data-event="rotate" data-value="45"><i class="fa fa-rotate-right"/></a> </div> <div class="btn-group" role="group"> - <a href="#" class="btn btn-default" title="Flip Horizontal" data-event="flip" data-value="horizontal" data-x="1"><i class="fa fa-arrows-h"/></a> - <a href="#" class="btn btn-default" title="Flip Vertical" data-event="flip" data-value="vertical" data-y="1"><i class="fa fa-arrows-v"/></a> + <a href="#" class="btn btn-secondary" title="Flip Horizontal" data-event="flip" data-value="horizontal" data-x="1"><i class="fa fa-arrows-h"/></a> + <a href="#" class="btn btn-secondary" title="Flip Vertical" data-event="flip" data-value="vertical" data-y="1"><i class="fa fa-arrows-v"/></a> </div> <div class="btn-group" role="group"> - <a href="#" class="btn btn-default" title="Reset Image" data-event="reset"><i class="fa fa-refresh"/> Reset Image</a> + <a href="#" class="btn btn-secondary" title="Reset Image" data-event="reset"><i class="fa fa-refresh"/> Reset Image</a> </div> </div> </t> diff --git a/addons/web_editor/static/src/xml/snippets.xml b/addons/web_editor/static/src/xml/snippets.xml index 3c368ebaaf2..586b920edf0 100644 --- a/addons/web_editor/static/src/xml/snippets.xml +++ b/addons/web_editor/static/src/xml/snippets.xml @@ -10,14 +10,14 @@ </div> <div class="oe_overlay_options" contentEditable="false"> <div class="btn-group"> - <a role="button" href="#" class="btn btn-default oe_snippet_parent" title="Select Parent Container" aria-label="Select Parent Container"><i class="fa fa-lg fa-level-up"/></a> + <a role="button" href="#" class="btn btn-secondary oe_snippet_parent" title="Select Parent Container" aria-label="Select Parent Container"><i class="fa fa-lg fa-level-up"/></a> <div class="dropdown oe_options d-none btn-group"> <a role="button" href="#" data-toggle="dropdown" class="btn btn-primary" title="Customize">Customize</a> <ul class="dropdown-menu" role="menu"/> </div> - <a role="button" href="#" class="btn btn-default oe_snippet_move" title="Drag to Move" aria-label="Drag to Move"><i class="fa fa-arrows ml4 mr4"></i></a> - <a role="button" href="#" class="btn btn-default oe_snippet_clone" title="Duplicate Container" aria-label="Duplicate Container"><i class="fa fa-files-o ml4 mr4"></i></a> - <a role="button" href="#" class="btn btn-default oe_snippet_remove" title="Remove Block" aria-label="Remove Block"><i class="fa fa-trash-o ml4 mr4"></i></a> + <a role="button" href="#" class="btn btn-secondary oe_snippet_move" title="Drag to Move" aria-label="Drag to Move"><i class="fa fa-arrows ml4 mr4"></i></a> + <a role="button" href="#" class="btn btn-secondary oe_snippet_clone" title="Duplicate Container" aria-label="Duplicate Container"><i class="fa fa-files-o ml4 mr4"></i></a> + <a role="button" href="#" class="btn btn-secondary oe_snippet_remove" title="Remove Block" aria-label="Remove Block"><i class="fa fa-trash-o ml4 mr4"></i></a> </div> </div> </div> @@ -40,7 +40,7 @@ <!-- t-field options --> <t t-name="web_editor.many2one.button"> <div class="btn-group"> - <a role="button" href="#" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" title="Search Contact" aria-label="Search Contact"><i class="fa fa-search"></i></a> + <a role="button" href="#" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" title="Search Contact" aria-label="Search Contact"><i class="fa fa-search"></i></a> <ul class="dropdown-menu contact_menu" role="menu"> <li><a role="menuitem"><input href="#" type="email" placeholder="Search"/></a></li> </ul> diff --git a/addons/website/static/src/js/tours/rte.js b/addons/website/static/src/js/tours/rte.js index 7ce549a0346..46fbbff3fce 100644 --- a/addons/website/static/src/js/tours/rte.js +++ b/addons/website/static/src/js/tours/rte.js @@ -72,7 +72,7 @@ tour.register('rte_translator', { trigger: 'html:not(:has(#wrap p span)) .o_menu_systray a[data-action="translate"]', }, { content: "close modal", - trigger: '.modal-footer .btn-default', + trigger: '.modal-footer .btn-secondary', }, { content: "check if translation is activate", trigger: '[data-oe-translation-id]', diff --git a/addons/website/static/src/xml/website.backend.xml b/addons/website/static/src/xml/website.backend.xml index 1bf996f7cef..e5a07ad6139 100644 --- a/addons/website/static/src/xml/website.backend.xml +++ b/addons/website/static/src/xml/website.backend.xml @@ -63,9 +63,9 @@ <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"> - <button class="btn btn-default js_date_range active" data-date="week">Last Week</button> - <button class="btn btn-default js_date_range" data-date="month">Last Month</button> - <button class="btn btn-default js_date_range" data-date="year">Last Year</button> + <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> </div> </t> diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml index 7bded7ce4e6..300badf2511 100644 --- a/addons/website/static/src/xml/website.xml +++ b/addons/website/static/src/xml/website.xml @@ -24,7 +24,7 @@ </main> <footer class="modal-footer"> <button type="button" class="btn btn-primary btn-continue">Continue</button> - <button type="button" class="btn btn-default" data-dismiss="modal" aria-label="Cancel">Cancel</button> + <button type="button" class="btn btn-secondary" data-dismiss="modal" aria-label="Cancel">Cancel</button> </footer> </div> </div> diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 421157ea2b4..37f85a2e161 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -310,7 +310,7 @@ <ul class="js_language_selector mb0 list-inline" t-if="(request and request.is_frontend_multilang and len(languages) > 1) or (website and (editable or translatable))"> <li> <div class="dropup"> - <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> + <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> <span t-esc="list(filter(lambda lg : lg[0] == lang, languages))[0][1].split('/').pop()"/> <span class="caret ml4"/> </button> @@ -341,7 +341,7 @@ <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> - <button type="button" t-attf-class="btn btn-default dropdown-toggle" t-att-id="'dopprod-%s' % object.id" data-toggle="dropdown"> + <button type="button" t-attf-class="btn btn-secondary dropdown-toggle" t-att-id="'dopprod-%s' % object.id" data-toggle="dropdown"> <span class="caret"></span> </button> <ul class="dropdown-menu" role="menu" t-att-aria-labelledby="'dopprod-%s' % object.id"> @@ -857,7 +857,7 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml <input type="text" name="search" class="search-query form-control oe_search_box" placeholder="Search..." t-att-value="search" /> </div> <span class="input-group-btn"> - <button type="submit" class="btn btn-default oe_search_button" aria-label="Search" title="Search"><i class="fa fa-search"/></button> + <button type="submit" class="btn btn-secondary oe_search_button" aria-label="Search" title="Search"><i class="fa fa-search"/></button> </span> </div> </template> @@ -879,7 +879,7 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml <t t-call="website.website_search_box"/> </form> <div t-if="searchbar_sortings" class="dropdown pull-right mt8 mr8"> - <button class="btn btn-default" type="button" data-toggle="dropdown"> + <button class="btn btn-secondary" 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')"/> <span class="caret" role="img" aria-label="Dropdown menu" title="Dropdown menu"></span> 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 c0645d9ebe9..a4b1fd48dd0 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 @@ -263,7 +263,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-default navbar-btn ml16" title="Add an opportunity" aria-label="Add an opportunity"><i class="fa fa-plus"/></button></li> + <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> </t> <div class="modal fade modal_new_opp" role="form"> <div class="modal-dialog"> @@ -447,7 +447,7 @@ </main> <footer class="modal-footer"> <button t-attf-class="btn btn-primary interested_partner_assign_confirm">Confirm</button> - <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> + <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button> </footer> </form> </div> @@ -480,7 +480,7 @@ </main> <footer class="modal-footer"> <button t-attf-class="btn btn-primary desinterested_partner_assign_confirm">Confirm</button> - <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> + <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button> </footer> </form> </div> @@ -510,7 +510,7 @@ </h4> <span class="btn-group pull-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-default' 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="pull-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> @@ -611,7 +611,7 @@ </main> <footer class="modal-footer"> <button t-attf-class="btn btn-primary edit_contact_confirm">Confirm</button> - <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> + <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button> </footer> </form> </div> @@ -731,7 +731,7 @@ </main> <footer class="modal-footer"> <button t-attf-class="btn btn-primary edit_opp_confirm">Confirm</button> - <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> + <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button> </footer> </form> </div> diff --git a/addons/website_crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/website_crm_partner_assign/wizard/crm_forward_to_partner_view.xml index 7adc57ec617..39b88bc65cb 100644 --- a/addons/website_crm_partner_assign/wizard/crm_forward_to_partner_view.xml +++ b/addons/website_crm_partner_assign/wizard/crm_forward_to_partner_view.xml @@ -30,7 +30,7 @@ </notebook> <footer> <button name="action_forward" string="Send" type="object" class="btn-primary"/> - <button string="Cancel" special="cancel" class="btn-default"/> + <button string="Cancel" special="cancel" class="btn-secondary"/> </footer> </form> </field> diff --git a/addons/website_event/views/event_templates.xml b/addons/website_event/views/event_templates.xml index 2cca45546d1..462942423c2 100644 --- a/addons/website_event/views/event_templates.xml +++ b/addons/website_event/views/event_templates.xml @@ -566,7 +566,7 @@ <footer class="modal-footer"> <div class="pull-left"> <button type="submit" class="btn btn-primary">Continue</button> - <button type="button" class="btn btn-default js_goto_event" data-dismiss="modal">Cancel Registration</button> + <button type="button" class="btn btn-secondary js_goto_event" data-dismiss="modal">Cancel Registration</button> </div> </footer> </div> diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml index f2e5f2934c5..a2a109ea9f4 100644 --- a/addons/website_forum/views/website_forum.xml +++ b/addons/website_forum/views/website_forum.xml @@ -87,7 +87,7 @@ <form class="navbar-form" role="search" t-attf-action="/forum/#{ slug(forum) }" method="get"> <t t-call="website.website_search_box"/> <span class="dropdown" groups="base.group_erp_manager"> - <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown"> + <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown"> <i class="fa fa-cog" role="img" aria-label="Dropdown menu" title="Dropdown menu"/> </button> <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu1"> diff --git a/addons/website_forum_doc/views/website_doc.xml b/addons/website_forum_doc/views/website_doc.xml index 6c01faf2295..590975fa063 100644 --- a/addons/website_forum_doc/views/website_doc.xml +++ b/addons/website_forum_doc/views/website_doc.xml @@ -64,7 +64,7 @@ <input type="search" class="form-control" name="search" placeholder="Search..." t-att-value="search or None"/> - <button type="submit" class="btn btn-default">Search</button> + <button type="submit" class="btn btn-secondary">Search</button> </div> </form> </div> @@ -103,7 +103,7 @@ <input type="search" class="form-control" name="search" placeholder="Search..." t-att-value="search or None"/> - <button type="submit" class="btn btn-default">Search</button> + <button type="submit" class="btn btn-secondary">Search</button> </div> </form> </div> diff --git a/addons/website_gengo/static/src/xml/website.gengo.xml b/addons/website_gengo/static/src/xml/website.gengo.xml index 2265ad7a70c..a7ae579d116 100644 --- a/addons/website_gengo/static/src/xml/website.gengo.xml +++ b/addons/website_gengo/static/src/xml/website.gengo.xml @@ -45,7 +45,7 @@ </div> <div> <button type="button" data-action="activate" class="btn btn-primary">Ok</button> - <button type="button" class="btn btn-default" data-action="discard" data-dismiss="modal">Cancel</button> + <button type="button" class="btn btn-secondary" data-action="discard" data-dismiss="modal">Cancel</button> </div> </footer> </div> @@ -73,7 +73,7 @@ </main> <footer class="modal-footer"> <button type="button" data-action="service_level" class="btn btn-primary">Post</button> - <button type="button" class="btn btn-default" data-action="discard" data-dismiss="modal">Cancel</button> + <button type="button" class="btn btn-secondary" data-action="discard" data-dismiss="modal">Cancel</button> </footer> </div> </div> @@ -150,7 +150,7 @@ </main> <footer class="modal-footer"> <button type="button" data-action="set_config" class="btn btn-primary">Submit</button> - <button type="button" class="btn btn-default" data-action="discard" data-dismiss="modal">Close</button> + <button type="button" class="btn btn-secondary" data-action="discard" data-dismiss="modal">Close</button> </footer> </div> </div> diff --git a/addons/website_mail/views/website_mail_templates.xml b/addons/website_mail/views/website_mail_templates.xml index 253851a504b..ddc881e012c 100644 --- a/addons/website_mail/views/website_mail_templates.xml +++ b/addons/website_mail/views/website_mail_templates.xml @@ -11,7 +11,7 @@ placeholder="your email..." groups="base.group_public"/> <span class="input-group-btn"> - <button href="#" t-attf-class="btn btn-default js_unfollow_btn">Unsubscribe</button> + <button href="#" t-attf-class="btn btn-secondary js_unfollow_btn">Unsubscribe</button> <button href="#" t-attf-class="btn btn-primary js_follow_btn">Subscribe</button> </span> </div> diff --git a/addons/website_quote/views/website_quote_templates.xml b/addons/website_quote/views/website_quote_templates.xml index 4441006d6a8..3f423e6761d 100644 --- a/addons/website_quote/views/website_quote_templates.xml +++ b/addons/website_quote/views/website_quote_templates.xml @@ -421,7 +421,7 @@ </main> <footer class="modal-footer"> <button type="submit" t-att-id="quotation.id" class="btn btn-primary">Reject</button> - <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> + <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button> </footer> </form> </div> diff --git a/addons/website_sale/static/src/js/website_sale_tour_shop.js b/addons/website_sale/static/src/js/website_sale_tour_shop.js index 1f333bf2cff..72beb5999d8 100644 --- a/addons/website_sale/static/src/js/website_sale_tour_shop.js +++ b/addons/website_sale/static/src/js/website_sale_tour_shop.js @@ -45,7 +45,7 @@ odoo.define("website_sale.tour_shop", function (require) { content: _t("Upload an image from your local library."), position: "bottom", run: function (actions) { - actions.auto(".modal-footer .btn-default"); + actions.auto(".modal-footer .btn-secondary"); }, }, { trigger: "#snippet_structure .oe_snippet:eq(8) .oe_snippet_thumbnail", diff --git a/addons/website_sale/views/product_views.xml b/addons/website_sale/views/product_views.xml index 6ca1f76d7e9..71bba73da01 100644 --- a/addons/website_sale/views/product_views.xml +++ b/addons/website_sale/views/product_views.xml @@ -118,7 +118,7 @@ <span t-attf-class="o_website_sale_image_card_size label label-#{size_status}" t-att-title="message"> <t t-esc="record.image.value"/> </span> - <a role="button" t-if="!read_only_mode" type="delete" class="btn btn-xs btn-default o_website_sale_image_card_remove" aria-label="Remove" title="Remove"><i class="fa fa-trash"/></a> + <a role="button" t-if="!read_only_mode" type="delete" class="btn btn-xs btn-secondary o_website_sale_image_card_remove" aria-label="Remove" title="Remove"><i class="fa fa-trash"/></a> </div> </div> </t> diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml index 4fae02ef552..d3e703af08d 100644 --- a/addons/website_sale/views/templates.xml +++ b/addons/website_sale/views/templates.xml @@ -111,7 +111,7 @@ <strong> <a itemprop="name" t-att-href="product_href" t-att-content="product.name" t-field="product.name" /> </strong> - <a role="button" t-if="not show_publish and not product.website_published" t-att-href="product_href" class="btn btn-default btn-xs btn-danger" title="This product is unpublished.">Unpublished</a> + <a role="button" t-if="not show_publish and not product.website_published" t-att-href="product_href" class="btn btn-secondary btn-xs btn-danger" title="This product is unpublished.">Unpublished</a> </h5> <div itemprop="offers" itemscope="itemscope" itemtype="http://schema.org/Offer" class="product_price" t-if="product.product_variant_ids"> <b> @@ -141,12 +141,12 @@ <xpath expr="//div[hasclass('product_price')]" position="inside"> <input name="product_id" t-att-value="product.product_variant_id.id" type="hidden" /> <t t-if="len(product.product_variant_ids) == 1"> - <a role="button" class="btn btn-default btn-xs a-submit" aria-label="Shopping cart" title="Shopping cart"> + <a role="button" class="btn btn-secondary btn-xs a-submit" aria-label="Shopping cart" title="Shopping cart"> <span class="fa fa-shopping-cart" /> </a> </t> <t t-if="len(product.product_variant_ids) > 1"> - <a role="button" class="btn btn-default btn-xs" t-att-href="keep('/shop/product/%s' % slug(product), page=(pager['page']['num'] if pager['page']['num']>1 else None))" aria-label="Shopping cart" title="Shopping cart"> + <a role="button" class="btn btn-secondary btn-xs" t-att-href="keep('/shop/product/%s' % slug(product), page=(pager['page']['num'] if pager['page']['num']>1 else None))" aria-label="Shopping cart" title="Shopping cart"> <span class="fa fa-shopping-cart" /> </a> </t> @@ -157,7 +157,7 @@ <t t-set="website_sale_pricelists" t-value="website.get_pricelist_available(show_visible=True)" /> <div t-attf-class="#{website_sale_pricelists and len(website_sale_pricelists)>1 and 'dropdown' or 'd-none'} btn-group"> <t t-set="curr_pl" t-value="website.get_current_pricelist()" /> - <a role="button" href="#" class="dropdown-toggle btn btn-default" data-toggle="dropdown"> + <a role="button" href="#" class="dropdown-toggle btn btn-secondary" data-toggle="dropdown"> <t t-esc="curr_pl and curr_pl.name or ' - '" /> <span class="caret"></span> </a> @@ -247,7 +247,7 @@ ]"/> <t t-set="website_sale_sortable_current" t-value="[sort for sort in website_sale_sortable if sort[1]==request.params.get('order', '')]"/> <div class="dropdown btn-group dropdown_sorty_by"> - <a role="button" href="#" class="dropdown-toggle btn btn-default" data-toggle="dropdown"> + <a role="button" href="#" class="dropdown-toggle btn btn-secondary" data-toggle="dropdown"> <t t-if='len(website_sale_sortable_current)'> <span>Sorting by : <t t-raw='website_sale_sortable_current[0][0]'/></span> </t> @@ -778,7 +778,7 @@ <div class="col-md-3 col-sm-4"> </div> <div class="col-md-9 col-sm-8"> - <a role="button" href="/shop/checkout" class="btn btn-default mb32 pull-left"><span class="fa fa-chevron-left" /> Previous</a> + <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> </div> </div> @@ -899,7 +899,7 @@ </div> <t t-call="website_sale.cart_lines" /> <div class="clearfix" /> - <a role="button" href="/shop" class="btn btn-default mb32 d-none d-xl-inline-block"> + <a role="button" href="/shop" class="btn btn-secondary mb32 d-none d-xl-inline-block"> <span class="fa fa-chevron-left" /> <span class="">Continue Shopping</span> </a> @@ -914,7 +914,7 @@ <div class="col-lg-4 col-sm-12 col-xs-12"> <t t-call='website_sale.short_cart_summary'/> <div class="d-xl-none"> - <a role="button" href="/shop" class="btn btn-default mb32"> + <a role="button" href="/shop" class="btn btn-secondary mb32"> <span class="fa fa-chevron-left" /> Continue<span class="d-none d-md-inline"> Shopping</span> </a> @@ -1010,7 +1010,7 @@ <div class="input-group" style='margin-left:auto; margin-right: auto'> <input name="promo" style='min-width:180px' class="form-control" type="text" placeholder="code..." t-att-value="website_sale_order.pricelist_id.code or None" /> <div class="input-group-btn"> - <a role="button" class="btn btn-default a-submit">Apply</a> + <a role="button" class="btn btn-secondary a-submit">Apply</a> </div> </div> </form> @@ -1057,7 +1057,7 @@ <div class="col-sm-12 col-md-12 one_kanban"> <form action="/shop/address" method="post" class=''> <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()" /> - <a role="button" class='a-submit btn btn-default mb16 btn-block'> + <a role="button" class='a-submit btn btn-secondary mb16 btn-block'> <i class="fa fa-plus-square"></i> Add an address </a> </form> @@ -1079,7 +1079,7 @@ </t> <div class="clearfix" /> <div> - <a role="button" href="/shop/cart" class="btn btn-default mb32"> + <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> </div> @@ -1111,7 +1111,7 @@ </a> </span> <span class='btn-ship' t-att-style="'' if not selected else 'display:none;'"> - <a role="button" class="btn btn-block btn-default"> + <a role="button" class="btn btn-block btn-secondary"> Select this address </a> </span> @@ -1251,7 +1251,7 @@ <div class="clearfix"/> <div style='padding: 0 15px'> - <a role="button" t-att-href="mode == ('new', 'billing') and '/shop/cart' or '/shop/checkout'" class="btn btn-default mb32"> + <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"> @@ -1325,7 +1325,7 @@ <t t-set="back_button_icon_class" t-value="'fa-chevron-left'"/> <t t-set="back_button_txt" t-value="'Return to Cart'"/> - <t t-set="back_button_class" t-value="'btn btn-default'"/> + <t t-set="back_button_class" t-value="'btn btn-secondary'"/> <t t-set="back_button_link" t-value="'/shop/cart'"/> </t> </div> @@ -1367,7 +1367,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-default 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 pull-right mr8 d-none d-xl-inline-block" href="/shop/checkout?express=1"> <span>Process Checkout</span> </a> </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 6d197da5e0f..b15e981ad02 100644 --- a/addons/website_sale_comparison/views/website_sale_comparison_template.xml +++ b/addons/website_sale_comparison/views/website_sale_comparison_template.xml @@ -10,14 +10,14 @@ <template id="add_to_compare" inherit_id="website_sale.products_item" active="True" customize_show="True" name="Comparison List" priority="22"> <xpath expr="//div[hasclass('product_price')]" position="inside"> - <a role="button" class="d-none d-md-inline-block btn btn-default btn-xs o_add_compare" title="Compare" aria-label="Compare" t-att-data-product-product-id="product.product_variant_ids[0].id" data-action="o_comparelist"><span class="fa fa-exchange"></span></a> + <a role="button" class="d-none d-md-inline-block btn btn-secondary btn-xs o_add_compare" title="Compare" aria-label="Compare" t-att-data-product-product-id="product.product_variant_ids[0].id" data-action="o_comparelist"><span class="fa fa-exchange"></span></a> </xpath> </template> <template id="product_add_to_compare" name='Add to comparison in product page' inherit_id="website_sale.product" priority="8"> <xpath expr="//a[@id='add_to_cart']" position="after"> <t t-if="product.env.ref('website_sale_comparison.add_to_compare').active"> - <a role="button" class="d-none d-md-inline-block btn btn-default btn-lg mt8 o_add_compare_dyn" title="Compare" aria-label="Compare" t-att-data-product-product-id="product.product_variant_ids[0].id" data-action="o_comparelist"><span class="fa fa-exchange"></span></a> + <a role="button" class="d-none d-md-inline-block btn btn-secondary btn-lg mt8 o_add_compare_dyn" title="Compare" aria-label="Compare" t-att-data-product-product-id="product.product_variant_ids[0].id" data-action="o_comparelist"><span class="fa fa-exchange"></span></a> </t> </xpath> </template> diff --git a/addons/website_sale_digital/views/website_sale_digital.xml b/addons/website_sale_digital/views/website_sale_digital.xml index de02b8cf1c5..92415355916 100644 --- a/addons/website_sale_digital/views/website_sale_digital.xml +++ b/addons/website_sale_digital/views/website_sale_digital.xml @@ -5,7 +5,7 @@ <t t-set="attachments" t-value="digital_attachments.get(line.product_id.id)"/> <t t-if="attachments"> <span class="dropdown"> - <button class="btn btn-xs btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown"> + <button class="btn btn-xs btn-secondary dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown"> Downloads <span class="caret"></span> </button> <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu1"> 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 acd9ee9651d..73fa0bc3019 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 @@ -20,7 +20,7 @@ <t t-name="website_sale.LinkTrackersDropDown"> <div class="dropdown"> - <button class="btn btn-default dropdown-toggle utm_dropdown ml4" id="utm_dropdown" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><span class="utm_button_name">Campaigns</span><span class="caret ml4"/> + <button class="btn btn-secondary dropdown-toggle utm_dropdown ml4" id="utm_dropdown" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><span class="utm_button_name">Campaigns</span><span class="caret ml4"/> </button> <ul class="dropdown-menu" role="menu" aria-labelledby="utm_dropdown"> <li><a role="menuitem" class="js_utm_selector" name="campaign_id">Campaigns</a></li> 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 53dede7d207..3be328a3d27 100644 --- a/addons/website_sale_options/views/website_sale_options_templates.xml +++ b/addons/website_sale_options/views/website_sale_options_templates.xml @@ -134,7 +134,7 @@ </table> </main> <footer class="modal-footer"> - <a role="button" class="btn btn-default 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-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> </footer> </div> diff --git a/addons/website_sale_wishlist/views/website_sale_wishlist_template.xml b/addons/website_sale_wishlist/views/website_sale_wishlist_template.xml index 9eb44e52f46..225143a5642 100644 --- a/addons/website_sale_wishlist/views/website_sale_wishlist_template.xml +++ b/addons/website_sale_wishlist/views/website_sale_wishlist_template.xml @@ -12,7 +12,7 @@ <template id="add_to_wishlist" inherit_id="website_sale.products_item" active="True" customize_show="True" name="Wishlist" priority="20"> <xpath expr="//div[hasclass('product_price')]" position="inside"> <t t-set="in_wish" t-value="product.product_variant_ids & request.env['product.wishlist'].current().mapped('product_id')"/> - <a role="button" class="btn btn-default btn-xs o_add_wishlist" t-att-disabled='in_wish or None' title="Add to Wishlist" t-att-data-product-product-id="product.product_variant_ids[0].id" data-action="o_wishlist"><span class="fa fa-heart" role="img" aria-label="Add to wishlist"></span></a> + <a role="button" class="btn btn-secondary btn-xs o_add_wishlist" t-att-disabled='in_wish or None' title="Add to Wishlist" t-att-data-product-product-id="product.product_variant_ids[0].id" data-action="o_wishlist"><span class="fa fa-heart" role="img" aria-label="Add to wishlist"></span></a> </xpath> </template> @@ -20,7 +20,7 @@ <xpath expr="//a[@id='add_to_cart']" position="after"> <t t-if="product.env.ref('website_sale_wishlist.add_to_wishlist').active"> <t t-set="in_wish" t-value="product.product_variant_ids & request.env['product.wishlist'].current().mapped('product_id')"/> - <a role="button" class="btn btn-default btn-lg mt8 o_add_wishlist_dyn" t-att-disabled='in_wish or None' title="Add to Wishlist" t-att-data-product-product-id="product.product_variant_ids[0].id" data-action="o_wishlist"><span class="fa fa-heart" role="img" aria-label="Add to wishlist"></span></a> + <a role="button" class="btn btn-secondary btn-lg mt8 o_add_wishlist_dyn" t-att-disabled='in_wish or None' title="Add to Wishlist" t-att-data-product-product-id="product.product_variant_ids[0].id" data-action="o_wishlist"><span class="fa fa-heart" role="img" aria-label="Add to wishlist"></span></a> </t> </xpath> </template> @@ -73,7 +73,7 @@ </td> <td class='text-center td-wish-btn'> <input name="product_id" t-att-value="wish.product_id.id" type="hidden"/> - <a role="button" class="btn btn-default btn-block o_wish_add mb4" >Add <span class='d-none d-md-inline'>to Cart</span></a> + <a role="button" class="btn btn-secondary btn-block o_wish_add mb4" >Add <span class='d-none d-md-inline'>to Cart</span></a> </td> </tr> </t> diff --git a/addons/website_slides/static/src/xml/website_slides.xml b/addons/website_slides/static/src/xml/website_slides.xml index 0df830eb5db..46074498ef0 100644 --- a/addons/website_slides/static/src/xml/website_slides.xml +++ b/addons/website_slides/static/src/xml/website_slides.xml @@ -68,7 +68,7 @@ <footer class="modal-footer"> <button type="button" data-loading-text="Loading..." class="btn btn-primary save">Save as Draft</button> <button type="button" data-loading-text="Loading..." data-published="true" class="btn btn-primary save">Save and Publish</button> - <button type="button" class="btn btn-default" data-dismiss="modal">Discard</button> + <button type="button" class="btn btn-secondary" data-dismiss="modal">Discard</button> </footer> </div> </div> diff --git a/addons/website_theme_install/views/views.xml b/addons/website_theme_install/views/views.xml index 1522b751936..a310aa6f37a 100644 --- a/addons/website_theme_install/views/views.xml +++ b/addons/website_theme_install/views/views.xml @@ -26,7 +26,7 @@ <div states="uninstalled" class="o_button_area"> <button type="object" name="button_choose_theme" class="btn btn-primary">Use this theme</button> <hr t-if="record.url.value"/> - <a role="button" t-if="record.url.value" class="btn btn-default" t-att-href="record.url.value" target="_blank">Live Preview</a> + <a role="button" t-if="record.url.value" class="btn btn-secondary" t-att-href="record.url.value" target="_blank">Live Preview</a> </div> </div> <div class="o_theme_preview_bottom clearfix"> |
