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 @@
- Tip: Hit CTRL-Enter to reconcile all the balanced items in the sheet.
@@ -59,7 +59,7 @@
- Go to bank statement(s)
+ Go to bank statement(s)
Close statement
@@ -74,7 +74,7 @@
- Validate
+ Validate
Reconcile
Select a partner or choose a counterpart
@@ -107,9 +107,9 @@
- Reconcile
+ Reconcile
Reconcile
- Skip
+ Skip
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 @@
@@ -355,7 +355,7 @@
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 @@
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 @@
@@ -556,7 +556,7 @@
Confirming this will create automatically a journal entry with the difference in the profit/loss account set on the cash journal.
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 @@
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 @@
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 @@
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 @@
-
+
@@ -47,7 +47,7 @@
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 @@
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 @@
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 @@
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 @@
All selected journal entries will be validated and posted. You won't be able to modify them afterwards.
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"/>
-
+
+ class="pull-right btn-secondary" help="Save as a new template" />
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 @@
@@ -41,7 +41,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
Import
- Test Import
+ Test Import
Load File
- Reload File
- Cancel
+ Reload File
+ Cancel
@@ -155,7 +155,7 @@
-
+
Import
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 @@
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 @@
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 @@
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 @@
@@ -85,7 +85,7 @@
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 @@
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 @@
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 @@
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 @@
Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?
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 @@
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 @@
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 @@
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 = $(' ', {type: 'button', html: _t("Sync with Google ")})
- .addClass('o_google_sync_button oe_button btn btn-default')
+ .addClass('o_google_sync_button oe_button btn btn-secondary')
.prepend($(' ', {
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 @@
Welcome! Want to check out?
-
+
Click to check out check in
@@ -60,8 +60,8 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
This wizard will print report which displays employees break-up of Net Head for a specified dates.
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 @@
This wizard will print report which display a pay head employee breakup for a specified dates.
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 @@
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 @@
Mark Done
-
+
Edit
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 @@
Invite
- Mark all read
- Unstar all
- New Message
- New Channel
- Select All
- Unselect All
- Accept
- Reject
- Discard
+ Mark all read
+ Unstar all
+ New Message
+ New Channel
+ Select All
+ Unselect All
+ Accept
+ Reject
+ Discard
@@ -211,7 +211,7 @@
Inbox
-
+
Starred
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 @@
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}'/>
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 @@
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 @@
-
+
+ class="pull-right btn-secondary" help="Save as a new template"/>
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 @@
Caution: It won't be possible to send this mail again to the recipients you did not select.
@@ -41,7 +41,7 @@
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 @@
@@ -413,9 +413,9 @@
-
-
-
+
+
+
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
-
+
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 @@
-
Install
+
Install
Activate
Configure
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 @@
Open Session
- Close
+ Close
New Session
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 @@
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 @@
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 @@
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.
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 @@
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 @@
@@ -175,7 +175,7 @@
-
+
@@ -203,7 +203,7 @@
-
+
@@ -226,7 +226,7 @@
@@ -362,8 +362,8 @@
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."/>
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 @@
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 @@
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 @@
-
+
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 @@
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):
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 @@
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 @@
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"/>
-
+
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 @@
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 @@
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 @@
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 @@
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"/>
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
@@ -201,7 +201,7 @@
- Previous page
+ Previous page
Next page
Submit survey
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 @@
-
+
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 = $(' ', 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 @@
Change Password
- Cancel
+ Cancel
@@ -342,7 +342,7 @@
-
+
@@ -400,7 +400,7 @@
Save
-
+
Discard
@@ -413,7 +413,7 @@
Edit
+ class="btn btn-secondary o_form_button_create" accesskey="c">
Create
@@ -423,7 +423,7 @@
Save
+ class="btn btn-secondary o_form_button_cancel" accesskey="j">
Discard
@@ -522,9 +522,9 @@
-
-
-
+
+
+
@@ -551,9 +551,9 @@
-
-
-
+
+
+
@@ -613,7 +613,7 @@
-
+
record(s)
Invalid domain
@@ -834,7 +834,7 @@
t-att-id="widget.idForLabel"/>
-
+
@@ -901,7 +901,7 @@
- More
+ More
@@ -971,8 +971,8 @@
t-att-autofocus="widget.attrs.autofocus"/>
Upload your file
-
-
+
+
Uploading...
@@ -1002,8 +1002,8 @@
Uploading...
Upload your file
-
-
+
+
@@ -1024,7 +1024,7 @@
-
+
/web/binary/upload_attachment
@@ -1129,7 +1129,7 @@
-
+
Favorites
- Add
- Remove
- Remove All
- Move Up
- Move Down
+ Add
+ Remove
+ Remove All
+ Move Up
+ Move Down
@@ -1363,7 +1363,7 @@
- Save as: Ok
+ Save as: Ok
Saved exports:
@@ -1373,7 +1373,7 @@
- Delete
+ Delete
@@ -1519,7 +1519,7 @@
-
+
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 @@
Add
Edit
- Discard
+ Discard
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 @@
Print
- Edit
+ Edit
Save
- Discard
+ Discard
\ 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 @@
- Day
- Week
- Month
+ Day
+ Week
+ Month
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, ' ')),
- "
a0
b0
accept0 refuse0
",
+ "
a0
b0
accept0 refuse0
",
"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', {
'
' +
'
' +
'
' +
- '
' +
+ '
' +
'
' +
'
' +
'
' +
@@ -1132,7 +1132,7 @@ QUnit.module('Views', {
'
' +
'
' +
'
' +
- '
' +
+ '
' +
'
' +
'
' +
'
' +
@@ -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: '
',
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 @@
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 ? '' : '') +
'
');
$alt.appendTo($imagePopover.find('.popover-content'));
- $alt.append('
' + _t('Description') + ': ');
+ $alt.append('
' + _t('Description') + ': ');
//////////////// 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 @@
Save
- Close
+ Close
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 @@
-
+
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 @@
@@ -54,10 +54,10 @@
@@ -110,7 +110,7 @@
Add an image URL
- Add
+ Add
@@ -271,7 +271,7 @@
-
+
@@ -319,25 +319,25 @@
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 @@
@@ -40,7 +40,7 @@
-
+
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 @@
- Last Week
- Last Month
- Last Year
+ Last Week
+ Last Month
+ Last Year
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 @@
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 @@
-
+
@@ -341,7 +341,7 @@
Unpublished
Published
-
+
-
+
@@ -879,7 +879,7 @@ Sitemap: sitemap.xml
-
+
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 @@
My Opportunities
-
+
@@ -447,7 +447,7 @@
@@ -480,7 +480,7 @@
@@ -510,7 +510,7 @@
-
+
@@ -611,7 +611,7 @@
@@ -731,7 +731,7 @@
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 @@
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 @@
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 @@
@@ -103,7 +103,7 @@
- Search
+ Search
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 @@
Ok
- Cancel
+ Cancel
@@ -73,7 +73,7 @@
@@ -150,7 +150,7 @@
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"/>
- Unsubscribe
+ Unsubscribe
Subscribe
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 @@
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 @@
-
+
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 @@
- Unpublished
+ Unpublished
@@ -141,12 +141,12 @@
-
+
-
+
@@ -157,7 +157,7 @@
-
+
@@ -247,7 +247,7 @@
]"/>
@@ -899,7 +899,7 @@
-
+
Continue Shopping
@@ -914,7 +914,7 @@
-
+
Continue Shopping
@@ -1010,7 +1010,7 @@
@@ -1057,7 +1057,7 @@
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 @@
-
+
-
+
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 @@
-
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 @@
diff --git a/odoo/addons/base/data/ir_demo_data.xml b/odoo/addons/base/data/ir_demo_data.xml
index e108590147a..e0e42387ab4 100644
--- a/odoo/addons/base/data/ir_demo_data.xml
+++ b/odoo/addons/base/data/ir_demo_data.xml
@@ -15,7 +15,7 @@
Are you sure you want to load demo data?
diff --git a/odoo/addons/base/tests/test_views.py b/odoo/addons/base/tests/test_views.py
index 3a417ba61ca..ab137d70ed6 100644
--- a/odoo/addons/base/tests/test_views.py
+++ b/odoo/addons/base/tests/test_views.py
@@ -866,7 +866,7 @@ class TestViews(ViewCase):
"""
@@ -991,7 +991,7 @@ class TestViews(ViewCase):
"""
diff --git a/odoo/addons/base/views/ir_model_views.xml b/odoo/addons/base/views/ir_model_views.xml
index b20c49a413d..f8ab6ed25fa 100644
--- a/odoo/addons/base/views/ir_model_views.xml
+++ b/odoo/addons/base/views/ir_model_views.xml
@@ -13,7 +13,7 @@
diff --git a/odoo/addons/base/views/ir_module_views.xml b/odoo/addons/base/views/ir_module_views.xml
index 99fdf5b91eb..d873046b4c1 100644
--- a/odoo/addons/base/views/ir_module_views.xml
+++ b/odoo/addons/base/views/ir_module_views.xml
@@ -68,10 +68,10 @@
-
-
-
-
+
+
+
+
diff --git a/odoo/addons/base/views/onboarding_views.xml b/odoo/addons/base/views/onboarding_views.xml
index 470e78157ec..6da8ab74e24 100644
--- a/odoo/addons/base/views/onboarding_views.xml
+++ b/odoo/addons/base/views/onboarding_views.xml
@@ -25,7 +25,7 @@
This action is definitive.