summaryrefslogtreecommitdiff
path: root/addons/account/static/src/xml
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2018-04-27 16:01:09 +0200
committerqsm-odoo <qsm@odoo.com>2018-07-27 12:36:54 +0200
commit81f359c81c69af2a5ec0645602e2bb43b2e16721 (patch)
treedc3ebb2391acf9c3e51def6dc1407586c8d9e2cb /addons/account/static/src/xml
parent7f10b55a5035bd3cab48ba58a519510a25b94f60 (diff)
[REF] *: BS4, remove the use of btn-sm
Odoo made the bad choice of using the 'btn-sm' class for every button instead of configuring the padding for default 'btn' to be smaller. In BS4, the style of btn-sm is actually more complex, lowering the font-size too. Also, btn-xs was removed so we would not have the possibility to display smaller button than our default ones. This commit removes btn-sm wherever it was used. Unfortunately, this might remove it at some places where it made sense but this can be restored in a second time.
Diffstat (limited to 'addons/account/static/src/xml')
-rw-r--r--addons/account/static/src/xml/account_dashboard_setup_bar.xml8
-rw-r--r--addons/account/static/src/xml/account_reconciliation.xml16
2 files changed, 12 insertions, 12 deletions
diff --git a/addons/account/static/src/xml/account_dashboard_setup_bar.xml b/addons/account/static/src/xml/account_dashboard_setup_bar.xml
index 47f5b580c41..44317822c92 100644
--- a/addons/account/static/src/xml/account_dashboard_setup_bar.xml
+++ b/addons/account/static/src/xml/account_dashboard_setup_bar.xml
@@ -5,22 +5,22 @@
<div class="o_account_dashboard_header d-none d-md-block o_form_view" t-if="values['show_setup_bar']">
<div class="o_form_statusbar">
<div class="o_statusbar_status" data-original-title="" title="" >
- <button name="setting_chart_of_accounts_action" type="company_object" t-attf-class="btn btn-sm o_arrow_button btn-default account_setup_dashboard_action #{values['chart_of_accounts'] and 'o_action_done' or ''}" >
+ <button name="setting_chart_of_accounts_action" type="company_object" t-attf-class="btn o_arrow_button btn-default account_setup_dashboard_action #{values['chart_of_accounts'] and 'o_action_done' or ''}" >
<i class="fa fa-check" t-if="values['chart_of_accounts']" role="img" aria-label="Current state" title="Current state" aria-current="step"/>
<b class="o_account_dashboard_index">4</b>
Chart of Accounts
</button>
- <button name="setting_init_fiscal_year_action" type="company_object" t-attf-class="btn btn-sm o_arrow_button btn-default account_setup_dashboard_action #{values['fiscal_year'] and 'o_action_done' or ''}">
+ <button name="setting_init_fiscal_year_action" type="company_object" t-attf-class="btn o_arrow_button btn-default account_setup_dashboard_action #{values['fiscal_year'] and 'o_action_done' or ''}">
<i class="fa fa-check" t-if="values['fiscal_year']" role="img" aria-label="Current state" title="Current state" aria-current="step"/>
<b class="o_account_dashboard_index">3</b>
Fiscal Year
</button>
- <button name="setting_init_bank_account_action" type="company_object" t-attf-class="btn btn-sm o_arrow_button btn-default account_setup_dashboard_action #{values['bank'] and 'o_action_done' or ''}">
+ <button name="setting_init_bank_account_action" type="company_object" t-attf-class="btn o_arrow_button btn-default account_setup_dashboard_action #{values['bank'] and 'o_action_done' or ''}">
<i class="fa fa-check" t-if="values['bank']" role="img" aria-label="Current state" title="Current state" aria-current="step"/>
<b class="o_account_dashboard_index">2</b>
Add a Bank Account
</button>
- <button name="setting_init_company_action" type="company_object" t-attf-class="btn btn-sm o_arrow_button btn-default account_setup_dashboard_action #{values['company'] and 'o_action_done' or ''}">
+ <button name="setting_init_company_action" type="company_object" t-attf-class="btn o_arrow_button btn-default account_setup_dashboard_action #{values['company'] and 'o_action_done' or ''}">
<i class="fa fa-check" t-if="values['company']" role="img" aria-label="Current state" title="Current state" aria-current="step"/>
<b class="o_account_dashboard_index">1</b>
Company Data
diff --git a/addons/account/static/src/xml/account_reconciliation.xml b/addons/account/static/src/xml/account_reconciliation.xml
index d5c77c19b9e..76ad700c0af 100644
--- a/addons/account/static/src/xml/account_reconciliation.xml
+++ b/addons/account/static/src/xml/account_reconciliation.xml
@@ -59,10 +59,10 @@
<t t-if="context &amp;&amp; context.active_model">
<p t-if="context['active_model'] === 'account.journal' || context['active_model'] === 'account.bank.statement'" class="actions_buttons">
<t t-if="context.journal_id">
- <button class="button_back_to_statement btn btn-default btn-sm" t-att-data_journal_id='context.journal_id'>Go to bank statement(s)</button>
+ <button class="button_back_to_statement btn btn-default" t-att-data_journal_id='context.journal_id'>Go to bank statement(s)</button>
</t>
<t t-if="context['active_model'] === 'account.bank.statement'">
- <button class="button_close_statement btn btn-primary btn-sm" style="display: inline-block;">Close statement</button>
+ <button class="button_close_statement btn btn-primary" style="display: inline-block;">Close statement</button>
</t>
</p>
</t>
@@ -74,8 +74,8 @@
<table class="accounting_view">
<caption>
<div class="pull-right o_buttons">
- <button t-attf-class="o_validate btn btn-default btn-sm #{!state.balance.type ? '' : 'd-none'}">Validate</button>
- <button t-attf-class="o_reconcile btn btn-primary btn-sm #{state.balance.type &gt; 0 ? '' : 'd-none'}">Reconcile</button>
+ <button t-attf-class="o_validate btn btn-default #{!state.balance.type ? '' : 'd-none'}">Validate</button>
+ <button t-attf-class="o_reconcile btn btn-primary #{state.balance.type &gt; 0 ? '' : 'd-none'}">Reconcile</button>
<span t-attf-class="o_no_valid text-danger #{state.balance.type &lt; 0 ? '' : 'd-none'}">Select a partner or choose a counterpart</span>
</div>
</caption>
@@ -107,9 +107,9 @@
<t t-name="reconciliation.manual.line" t-extend="reconciliation.line">
<t t-jquery=".o_buttons" t-operation="replace">
<div class="pull-right o_buttons">
- <button t-attf-class="o_validate btn btn-default btn-sm #{!state.balance.type ? '' : 'd-none'}">Reconcile</button>
- <button t-attf-class="o_reconcile btn btn-primary btn-sm #{state.balance.type &gt; 0 ? '' : 'd-none'}">Reconcile</button>
- <button t-attf-class="o_no_valid btn btn-default btn-sm #{state.balance.type &lt; 0 ? '' : 'd-none'}">Skip</button>
+ <button t-attf-class="o_validate btn btn-default #{!state.balance.type ? '' : 'd-none'}">Reconcile</button>
+ <button t-attf-class="o_reconcile btn btn-primary #{state.balance.type &gt; 0 ? '' : 'd-none'}">Reconcile</button>
+ <button t-attf-class="o_no_valid btn btn-default #{state.balance.type &lt; 0 ? '' : 'd-none'}">Skip</button>
</div>
</t>
<t t-jquery=".accounting_view tbody" t-operation="append">
@@ -156,7 +156,7 @@
<div t-name="reconciliation.line.create">
<div class="quick_add">
- <div class="btn-group btn-group-sm o_reconcile_models" t-if="state.reconcileModels">
+ <div class="btn-group o_reconcile_models" t-if="state.reconcileModels">
<t t-foreach="state.reconcileModels" t-as="reconcileModel">
<button class="btn btn-primary" t-att-data-reconcile-model-id="reconcileModel.id"><t t-esc="reconcileModel.name"/></button>
</t>