From c59380bac5bbd47bc7dcd92b38049af29a62c3d1 Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Mon, 16 Jul 2018 16:48:59 +0200 Subject: [PATCH] [REF] *: BS4, rename btn-default to btn-secondary BS4 "btn-default" class was replaced with "btn-secondary", which makes more sense. --- .../static/src/scss/account_dashboard.scss | 2 +- .../src/xml/account_dashboard_setup_bar.xml | 8 +-- .../static/src/xml/account_payment.xml | 2 +- .../static/src/xml/account_reconciliation.xml | 12 ++-- .../static/tests/reconciliation_tests.js | 4 +- addons/account/views/account_payment_view.xml | 4 +- .../views/account_portal_templates.xml | 4 +- addons/account/views/account_view.xml | 4 +- .../wizard/account_invoice_refund_view.xml | 2 +- .../wizard/account_invoice_state_view.xml | 2 +- .../wizard/account_move_reversal_view.xml | 2 +- .../account/wizard/account_reconcile_view.xml | 4 +- ...count_report_aged_partner_balance_view.xml | 2 +- .../wizard/account_report_common_view.xml | 2 +- .../wizard/account_unreconcile_view.xml | 2 +- .../wizard/account_validate_move_view.xml | 2 +- .../wizard/multi_compose_message_views.xml | 4 +- addons/account/wizard/pos_box.xml | 4 +- .../wizard/wizard_tax_adjustments_view.xml | 4 +- ...depreciation_confirmation_wizard_views.xml | 2 +- .../wizard/asset_modify_views.xml | 2 +- .../account_bank_statement_import_view.xml | 2 +- .../wizard/journal_creation.xml | 2 +- .../wizard/print_prenumbered_checks_views.xml | 2 +- .../wizard/base_gengo_translations_view.xml | 2 +- .../static/src/js/import_action.js | 2 +- .../static/src/xml/base_import.xml | 8 +-- .../views/base_import_module_view.xml | 4 +- addons/crm/views/crm_lead_views.xml | 2 +- addons/crm/wizard/crm_lead_lost_views.xml | 2 +- .../wizard/crm_lead_to_opportunity_views.xml | 4 +- .../wizard/crm_merge_opportunities_views.xml | 2 +- .../wizard/crm_lead_convert2task_views.xml | 2 +- .../wizard/choose_delivery_package_views.xml | 2 +- addons/event/wizard/event_confirm_view.xml | 2 +- .../wizard/event_edit_registration.xml | 2 +- addons/gamification/wizard/grant_badge.xml | 2 +- addons/gamification/wizard/update_goal.xml | 2 +- .../static/src/js/google_calendar.js | 2 +- .../static/src/scss/hr_attendance.scss | 6 +- .../static/src/xml/attendance.xml | 12 ++-- .../hr_expense_sheet_register_payment.xml | 2 +- .../gamification_badge_user_wizard_views.xml | 2 +- .../hr_holidays_summary_department_views.xml | 2 +- .../hr_holidays_summary_employees_views.xml | 2 +- ...oll_contribution_register_report_views.xml | 2 +- .../views/hr_recruitment_views.xml | 2 +- addons/l10n_eu_service/wizard/wizard.xml | 2 +- .../wizard/account_fr_fec_view.xml | 2 +- .../hr_salary_employee_bymonth_view.xml | 2 +- .../wizard/hr_yearly_salary_detail_view.xml | 2 +- addons/lunch/wizard/lucky_order_view.xml | 2 +- addons/mail/static/src/js/discuss_mobile.js | 4 +- addons/mail/static/src/scss/discuss.scss | 2 +- addons/mail/static/src/xml/activity.xml | 2 +- addons/mail/static/src/xml/discuss.xml | 20 +++--- addons/mail/static/src/xml/systray.xml | 2 +- .../static/tests/discuss_moderation_tests.js | 2 +- addons/mail/views/mail_activity_views.xml | 6 +- addons/mail/views/mail_channel_views.xml | 2 +- .../wizard/email_template_preview_view.xml | 2 +- addons/mail/wizard/invite_view.xml | 2 +- .../mail/wizard/mail_compose_message_view.xml | 4 +- .../mail/wizard/mail_resend_message_views.xml | 6 +- .../mass_mailing/views/mass_mailing_views.xml | 8 +-- .../wizard/mass_mailing_list_merge_views.xml | 2 +- .../mass_mailing_schedule_date_views.xml | 2 +- .../wizard/test_mailing_views.xml | 2 +- .../wizard/membership_invoice_views.xml | 2 +- .../wizard/change_production_qty_views.xml | 2 +- .../mrp/wizard/mrp_product_produce_views.xml | 2 +- .../mrp/wizard/mrp_workcenter_block_view.xml | 2 +- addons/payment/views/payment_templates.xml | 2 +- addons/payment/views/payment_views.xml | 2 +- .../views/point_of_sale_dashboard.xml | 2 +- addons/point_of_sale/wizard/pos_details.xml | 2 +- addons/point_of_sale/wizard/pos_discount.xml | 2 +- .../wizard/pos_open_statement.xml | 2 +- addons/point_of_sale/wizard/pos_payment.xml | 2 +- addons/portal/static/src/scss/portal.scss | 2 - addons/portal/views/portal_templates.xml | 16 ++--- addons/portal/wizard/portal_wizard_views.xml | 2 +- .../wizard/product_price_list_views.xml | 2 +- .../wizard/product_margin_view.xml | 2 +- .../views/project_portal_templates.xml | 2 +- addons/project/views/project_views.xml | 2 +- addons/repair/wizard/repair_cancel.py | 2 +- addons/repair/wizard/repair_cancel_views.xml | 2 +- .../wizard/repair_make_invoice_views.xml | 2 +- .../sale_make_invoice_advance_views.xml | 2 +- .../wizard/project_create_invoice_views.xml | 2 +- .../project_create_sale_order_views.xml | 2 +- .../project_task_assign_so_line_views.xml | 2 +- addons/stock/views/stock_scrap_views.xml | 2 +- .../stock/wizard/product_replenish_views.xml | 2 +- .../stock_backorder_confirmation_views.xml | 2 +- .../wizard/stock_change_product_qty_views.xml | 2 +- .../wizard/stock_immediate_transfer_views.xml | 2 +- .../stock_overprocessed_transfer_views.xml | 2 +- .../wizard/stock_picking_return_views.xml | 2 +- .../stock/wizard/stock_quantity_history.xml | 2 +- .../wizard/stock_scheduler_compute_views.xml | 2 +- .../wizard/stock_track_confirmation_views.xml | 2 +- .../stock_warn_insufficient_qty_views.xml | 2 +- .../views/stock_account_views.xml | 2 +- .../stock_change_standard_price_views.xml | 2 +- .../views/stock_landed_cost_views.xml | 2 +- .../wizard/stock_picking_to_batch_views.xml | 2 +- addons/survey/views/survey_templates.xml | 4 +- .../wizard/survey_email_compose_message.xml | 2 +- .../src/scss/option_color_amethyst.scss | 2 +- .../static/src/scss/option_color_cobalt.scss | 2 +- .../static/src/scss/option_color_emerald.scss | 2 +- .../static/src/scss/option_color_gold.scss | 2 +- .../static/src/scss/option_color_ruby.scss | 2 +- addons/web/static/src/js/core/dialog.js | 4 +- addons/web/static/src/js/core/dom.js | 4 +- .../static/src/js/fields/relational_fields.js | 2 +- .../static/src/js/views/form/form_renderer.js | 21 +++--- .../src/js/views/kanban/kanban_controller.js | 2 +- .../src/js/views/search/search_view_mobile.js | 2 +- .../web/static/src/js/views/view_dialogs.js | 4 +- .../static/src/js/widgets/dropdown_menu.js | 2 +- addons/web/static/src/scss/control_panel.scss | 2 +- addons/web/static/src/scss/webclient.scss | 2 +- .../web/static/src/scss/webclient_extra.scss | 2 +- addons/web/static/src/xml/base.xml | 64 +++++++++---------- addons/web/static/src/xml/kanban.xml | 2 +- addons/web/static/src/xml/report.xml | 4 +- addons/web/static/src/xml/web_calendar.xml | 6 +- .../tests/chrome/action_manager_tests.js | 2 +- .../tests/fields/relational_fields_tests.js | 14 ++-- .../services/notification_service_tests.js | 2 +- .../web/static/tests/views/calendar_tests.js | 4 +- addons/web/static/tests/views/form_tests.js | 24 +++---- addons/web/static/tests/views/kanban_tests.js | 6 +- addons/web/static/tests/views/list_tests.js | 2 +- addons/web/views/webclient_templates.xml | 2 +- .../static/lib/summernote/src/js/Renderer.js | 2 +- .../static/src/js/editor/rte.summernote.js | 2 +- .../static/src/js/widgets/widgets.js | 4 +- .../static/src/scss/web_editor.ui.scss | 2 +- .../static/src/scss/web_editor.variables.scss | 2 +- addons/web_editor/static/src/xml/ace.xml | 2 +- addons/web_editor/static/src/xml/backend.xml | 2 +- addons/web_editor/static/src/xml/editor.xml | 26 ++++---- addons/web_editor/static/src/xml/snippets.xml | 10 +-- addons/website/static/src/js/tours/rte.js | 2 +- .../static/src/xml/website.backend.xml | 6 +- addons/website/static/src/xml/website.xml | 2 +- addons/website/views/website_templates.xml | 8 +-- .../website_crm_partner_assign_templates.xml | 12 ++-- .../wizard/crm_forward_to_partner_view.xml | 2 +- .../website_event/views/event_templates.xml | 2 +- addons/website_forum/views/website_forum.xml | 2 +- .../website_forum_doc/views/website_doc.xml | 4 +- .../static/src/xml/website.gengo.xml | 6 +- .../views/website_mail_templates.xml | 2 +- .../views/website_quote_templates.xml | 2 +- .../static/src/js/website_sale_tour_shop.js | 2 +- addons/website_sale/views/product_views.xml | 2 +- addons/website_sale/views/templates.xml | 30 ++++----- .../website_sale_comparison_template.xml | 4 +- .../views/website_sale_digital.xml | 2 +- .../xml/website_sale_dashboard_utm_chart.xml | 2 +- .../views/website_sale_options_templates.xml | 2 +- .../views/website_sale_wishlist_template.xml | 6 +- .../static/src/xml/website_slides.xml | 2 +- addons/website_theme_install/views/views.xml | 2 +- odoo/addons/base/data/ir_demo_data.xml | 2 +- odoo/addons/base/tests/test_views.py | 4 +- odoo/addons/base/views/ir_model_views.xml | 2 +- odoo/addons/base/views/ir_module_views.xml | 8 +-- odoo/addons/base/views/onboarding_views.xml | 2 +- odoo/addons/base/views/res_config_views.xml | 4 +- odoo/addons/base/views/res_users_views.xml | 4 +- .../wizard/base_export_language_views.xml | 2 +- .../wizard/base_import_language_views.xml | 2 +- .../wizard/base_language_install_views.xml | 2 +- .../wizard/base_module_uninstall_views.xml | 2 +- .../base/wizard/base_module_update_views.xml | 4 +- .../addons/base/wizard/base_module_upgrade.py | 2 +- .../base/wizard/base_module_upgrade_views.xml | 4 +- .../base/wizard/base_partner_merge_views.xml | 4 +- .../wizard/base_update_translations_views.xml | 2 +- 185 files changed, 361 insertions(+), 362 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 @@
- - - -
- + 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 @@
- +
- +
Tip: Hit CTRL-Enter to reconcile all the balanced items in the sheet.
@@ -59,7 +59,7 @@

- + @@ -74,7 +74,7 @@
- + Select a partner or choose a counterpart
@@ -107,9 +107,9 @@
- + - +
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 @@ - + - - + +
@@ -155,7 +155,7 @@ - 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 = $(' +
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 @@
- - - - - - - - - + + + + + + + + +
@@ -211,7 +211,7 @@ - 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 @@
- + @@ -342,7 +342,7 @@

- @@ -400,7 +400,7 @@ -
@@ -413,7 +413,7 @@ Edit @@ -423,7 +423,7 @@ Save @@ -522,9 +522,9 @@
@@ -613,7 +613,7 @@
- Invalid domain @@ -834,7 +834,7 @@ t-att-id="widget.idForLabel"/>
- +