Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Remove lots of style attributes.
James Cole464a89f305a6
diff --git a/public/v1/css/firefly.css b/public/v1/css/firefly.cssindex 4c0f75b8af..00db7fcb8d 100644--- a/public/v1/css/firefly.css+++ b/public/v1/css/firefly.css@@ -25,6 +25,121 @@/** new classes because of CSP */.wide-chart {width:100%;height:400px;}.low-chart {width:100%;height:200px;}+.medium-chart {width:100%;height:250px;}+.center-chart {width:100%;margin:0 auto;}+.map-size {width:100%;height:300px;}+++/* spacing and padding */+.m-0 { margin:0!important; }+.m-1 { margin:.25rem!important; }+.m-2 { margin:.5rem !important; }+.m-3 { margin:1rem !important; }+.m-4 { margin:1.5rem !important; }+.m-5 { margin:3rem!important; }++.mt-0 { margin-top:0!important; }+.mr-0 { margin-right:0!important; }+.mb-0 { margin-bottom:0!important; }+.ml-0 { margin-left:0!important; }+.mx-0 { margin-left:0 !important;margin-right:0!important; }+.my-0 { margin-top:0 !important;margin-bottom:0!important; }++.mt-1 { margin-top:.25rem!important; }+.mr-1 { margin-right:.25rem!important; }+.mb-1 { margin-bottom:.25rem!important; }+.ml-1 { margin-left:.25rem!important; }+.mx-1 { margin-left:.25rem!important;margin-right:.25rem!important; }+.my-1 { margin-top:.25rem!important;margin-bottom:.25rem!important; }++.mt-2 { margin-top:.5rem!important; }+.mr-2 { margin-right:.5rem!important; }+.mb-2 { margin-bottom:.5rem!important; }+.ml-2 { margin-left:.5rem!important; }+.mx-2 { margin-right:.5rem!important;margin-left:.5rem!important; }+.my-2 { margin-top:.5rem!important;margin-bottom:.5rem!important; }++.mt-3 { margin-top:1rem!important; }+.mr-3 { margin-right:1rem!important; }+.mb-3 { margin-bottom:1rem!important; }+.ml-3 { margin-left:1rem!important; }+.mx-3 { margin-right:1rem!important;margin-left:1rem!important; }+.my-3 { margin-bottom:1rem!important;margin-top:1rem!important; }++.mt-4 { margin-top:1.5rem!important; }+.mr-4 { margin-right:1.5rem!important; }+.mb-4 { margin-bottom:1.5rem!important; }+.ml-4 { margin-left:1.5rem!important; }+.mx-4 { margin-right:1.5rem!important;margin-left:1.5rem!important; }+.my-4 { margin-top:1.5rem!important;margin-bottom:1.5rem!important; }++.mt-5 { margin-top:3rem!important; }+.mr-5 { margin-right:3rem!important; }+.mb-5 { margin-bottom:3rem!important; }+.ml-5 { margin-left:3rem!important; }+.mx-5 { margin-right:3rem!important;margin-left:3rem!important; }+.my-5 { margin-top:3rem!important;margin-bottom:3rem!important; }++.mt-auto { margin-top:auto!important; }+.mr-auto { margin-right:auto!important; }+.mb-auto { margin-bottom:auto!important; }+.ml-auto { margin-left:auto!important; }+.mx-auto { margin-right:auto!important;margin-left:auto!important; }+.my-auto { margin-bottom:auto!important;margin-top:auto!important; }++.p-0 { padding:0!important; }+.p-1 { padding:.25rem!important; }+.p-2 { padding:.5rem!important; }+.p-3 { padding:1rem!important; }+.p-4 { padding:1.5rem!important; }+.p-5 { padding:3rem!important; }++.pt-0 { padding-top:0!important; }+.pr-0 { padding-right:0!important; }+.pb-0 { padding-bottom:0!important; }+.pl-0 { padding-left:0!important; }+.px-0 { padding-left:0!important;padding-right:0!important; }+.py-0 { padding-top:0!important;padding-bottom:0!important; }++.pt-1 { padding-top:.25rem!important; }+.pr-1 { padding-right:.25rem!important; }+.pb-1 { padding-bottom:.25rem!important; }+.pl-1 { padding-left:.25rem!important; }+.px-1 { padding-left:.25rem!important;padding-right:.25rem!important; }+.py-1 { padding-top:.25rem!important;padding-bottom:.25rem!important; }++.pt-2 { padding-top:.5rem!important; }+.pr-2 { padding-right:.5rem!important; }+.pb-2 { padding-bottom:.5rem!important; }+.pl-2 { padding-left:.5rem!important; }+.px-2 { padding-right:.5rem!important;padding-left:.5rem!important; }+.py-2 { padding-top:.5rem!important;padding-bottom:.5rem!important; }++.pt-3 { padding-top:1rem!important; }+.pr-3 { padding-right:1rem!important; }+.pb-3 { padding-bottom:1rem!important; }+.pl-3 { padding-left:1rem!important; }+.py-3 { padding-bottom:1rem!important;padding-top:1rem!important; }+.px-3 { padding-right:1rem!important;padding-left:1rem!important; }++.pt-4 { padding-top:1.5rem!important; }+.pr-4 { padding-right:1.5rem!important; }+.pb-4 { padding-bottom:1.5rem!important; }+.pl-4 { padding-left:1.5rem!important; }+.px-4 { padding-right:1.5rem!important;padding-left:1.5rem!important; }+.py-4 { padding-top:1.5rem!important;padding-bottom:1.5rem!important; }++.pt-5 { padding-top:3rem!important; }+.pr-5 { padding-right:3rem!important; }+.pb-5 { padding-bottom:3rem!important; }+.pl-5 { padding-left:3rem!important; }+.px-5 { padding-right:3rem!important;padding-left:3rem!important; }+.py-5 { padding-top:3rem!important;padding-bottom:3rem!important; }+++++/* TODO find out where this is used. */input.ti-new-tag-input {diff --git a/resources/views/accounts/index.twig b/resources/views/accounts/index.twigindex 213aacf9be..e6953a389b 100644--- a/resources/views/accounts/index.twig+++ b/resources/views/accounts/index.twig@@ -26,12 +26,10 @@</div>-<div class="box-body no-padding">- <div style="padding:8px;">+ <div class="m-1"><a href="{{ route('accounts.create', objectType) }}" class="btn btn-success"><span class="fa fa-plus fa-fw"></span> {{ ('make_new_' ~ objectType ~ '_account')|_ }}</a></div>-{% include 'list.accounts' %}</div><div class="box-footer">diff --git a/resources/views/accounts/reconcile/transactions.twig b/resources/views/accounts/reconcile/transactions.twigindex be9cc0331f..6d89f1e162 100644--- a/resources/views/accounts/reconcile/transactions.twig+++ b/resources/views/accounts/reconcile/transactions.twig@@ -3,7 +3,7 @@<tr class="ignore"><th class="hidden-xs" colspan="2"> </th><th>{{ trans('list.description') }}</th>- <th style="text-align:right;">{{ trans('list.amount') }}</th>+ <th class="text-right">{{ trans('list.amount') }}</th><th class="hidden-xs hidden-sm hidden-md">{{ trans('list.reconcile') }}</th><th class="hidden-xs hidden-sm">{{ trans('list.date') }}</th><th class="hidden-xs hidden-sm hidden-md">{{ trans('list.from') }}</th>@@ -100,7 +100,7 @@{{ journal.description }}</a></td>- <td style="text-align: right;">+ <td class="text-right"><span style="margin-right:5px;">{{ formatAmountBySymbol(journal.amount, journal.currency_symbol, journal.currency_decimal_places) }}{% if null != journal.foreign_amount %}diff --git a/resources/views/accounts/show.twig b/resources/views/accounts/show.twigindex 9929d9b8ff..d552600cf9 100644--- a/resources/views/accounts/show.twig+++ b/resources/views/accounts/show.twig@@ -81,8 +81,8 @@<h3 class="box-title">{{ 'expenses_by_category'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="account-cat-out" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="account-cat-out" class="medium-chart" height="250"></canvas></div></div></div>@@ -93,8 +93,8 @@<h3 class="box-title">{{ 'expenses_by_budget'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="account-budget-out" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="account-budget-out" class="medium-chart" height="250"></canvas></div></div></div>@@ -105,8 +105,8 @@<h3 class="box-title">{{ 'income_by_category'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="account-cat-in" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="account-cat-in" class="medium-chart" height="250"></canvas></div></div></div>@@ -122,7 +122,7 @@<h3 class="box-title">{{ 'location'|_ }}</h3></div><div class="box-body">- <div id="location_map" style="width:100%;height:300px;"></div>+ <div id="location_map" class="map-size"></div></div></div></div>diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twigindex 215665e884..1110b7a3ad 100644--- a/resources/views/budgets/index.twig+++ b/resources/views/budgets/index.twig@@ -71,7 +71,7 @@</small></div>{# info about the amount spent #}- <div class="col-lg-9 col-md-9 col-sm-9 col-xs-9" style="text-align:right;margin-bottom:3px;">+ <div class="col-lg-9 col-md-9 col-sm-9 col-xs-9 text-right" style="margin-bottom:3px;"><small class="available_bar"data-id="0">{{ trans('firefly.available_between', {start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat) }) }}:@@ -123,7 +123,7 @@</small></div>{# info about the amount spent #}- <div class="col-lg-9 col-md-9 col-sm-9 col-xs-9" style="text-align:right;margin-bottom:3px;">+ <div class="col-lg-9 col-md-9 col-sm-9 col-xs-9 text-right" style="margin-bottom:3px;"><small class="available_bar"data-id="{{ budget.id }}">{{ trans('firefly.available_between', {start: budget.start_date.isoFormat(monthAndDayFormat), end: budget.end_date.isoFormat(monthAndDayFormat) }) }}:@@ -323,11 +323,11 @@</a>{% endif %}</td>- <td class="hidden-sm hidden-xs spent" data-id="{{ budget.id }}" style="text-align:right;">+ <td class="hidden-sm hidden-xs spent text-right" data-id="{{ budget.id }}">{% include('budgets.partials.amount-spent') %}</td>{# this cell displays the amount left in the budget, per budget limit. #}- <td class="left" data-id="{{ budget.id }}" style="text-align: right;">+ <td class="left" data-id="{{ budget.id }}" class="text-right">{% include('budgets.partials.amount-left') %}</td></tr>diff --git a/resources/views/budgets/show.twig b/resources/views/budgets/show.twigindex 1580124988..1bf10442c2 100644--- a/resources/views/budgets/show.twig+++ b/resources/views/budgets/show.twig@@ -60,8 +60,8 @@<h3 class="box-title">{{ 'expenses_by_category'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="budget-cat-out" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="budget-cat-out" class="medium-chart" height="250"></canvas></div></div>{% if budgetLimit %}@@ -79,8 +79,8 @@<h3 class="box-title">{{ 'expenses_by_asset_account'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="budget-asset-out" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="budget-asset-out" class="medium-chart" height="250"></canvas></div></div>{% if budgetLimit %}@@ -98,8 +98,8 @@<h3 class="box-title">{{ 'expenses_by_expense_account'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="budget-expense-out" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="budget-expense-out" class="medium-chart" height="250"></canvas></div></div>{% if budgetLimit %}diff --git a/resources/views/debug.twig b/resources/views/debug.twigindex d2e2872674..dd6feb40eb 100644--- a/resources/views/debug.twig+++ b/resources/views/debug.twig@@ -3,16 +3,21 @@<head><title>{{ trans('firefly.debug_page') }}</title></head>+<style nonce="{{ JS_NONCE }}">+ p.default-text {font-family:Arial, Arial, Helvetica, sans-serif;font-size:12pt;width:600px;}+ p.warn-text {font-family:Arial, Arial, Helvetica, sans-serif;font-size:12pt;width:600px;color:#a00;}+ textarea {font-family:Menlo, Monaco, Consolas, monospace;font-size:8pt;}+</style><body>-<p style="font-family:Arial, Arial, Helvetica, sans-serif;font-size:12pt;width:600px;">+<p class="default-text">{{ trans('firefly.debug_submit_instructions')|raw }}</p>-<p style="font-family:Arial, Arial, Helvetica, sans-serif;font-size:12pt;width:600px;">+<p class="default-text"><strong>{{ trans('firefly.debug_pretty_table') }}</strong></p>-<textarea rows="30" cols="100" name="debug_info" id="debug_info"- style="font-family:Menlo, Monaco, Consolas, monospace;font-size:8pt;">+<label for="debug_info"></label>+<textarea rows="30" cols="100" name="debug_info" id="debug_info">Debug information generated at {{ now }} for Firefly III version **{% if not FF_IS_DEVELOP %}v{% endif %}{{ FF_VERSION }}**.{{ table|escape('html') }}@@ -25,21 +30,21 @@ Debug information generated at {{ now }} for Firefly III version **{% if not FF_textArea.value = text;</script>-<p style="font-family:Arial, Arial, Helvetica, sans-serif;font-size:12pt;width:600px;color:#a00;">+<p class=default-text"><a href="{{ route('index') }}">{{ trans('firefly.back_to_index') }}</a></p>-<p style="font-family:Arial, Arial, Helvetica, sans-serif;font-size:12pt;width:600px;color:#a00;">+<p class="warn-text">{{ trans('firefly.debug_additional_data')|raw }}</p>-<textarea rows="30" cols="100" name="log_info" style="font-family:Menlo, Monaco, Consolas, monospace;font-size:7pt;">+<textarea rows="30" cols="100" name="log_info">```{{ logContent }}```</textarea>-<p style="font-family:Arial, Arial, Helvetica, sans-serif;font-size:12pt;width:600px;color:#a00;">+<p class=default-text"><a href="{{ route('index') }}">{{ trans('firefly.back_to_index') }}</a></p>diff --git a/resources/views/index.twig b/resources/views/index.twigindex 185aff30b1..4b45efeabb 100644--- a/resources/views/index.twig+++ b/resources/views/index.twig@@ -137,7 +137,7 @@</div><div class="box-body">- <div style="width:100%;margin:0 auto;">+ <div class="center-chart"><canvas id="bills-chart" class="low-chart" height="200"></canvas></div></div>diff --git a/resources/views/list/accounts.twig b/resources/views/list/accounts.twigindex c7168fcd26..d301584fe4 100644--- a/resources/views/list/accounts.twig+++ b/resources/views/list/accounts.twig@@ -1,4 +1,4 @@-<div style="padding-left:8px;">+<div class="ml-1">{{ accounts.links('pagination.bootstrap-4')|raw }}</div><table class="table table-responsive table-hover" id="sortable-table">@@ -16,10 +16,10 @@{% endif %}<th class="hidden-sm hidden-xs">{{ trans('form.account_number') }}</th>{% if objectType != 'liabilities' %}- <th style="text-align: right;">{{ trans('list.currentBalance') }}</th>+ <th class="text-right">{{ trans('list.currentBalance') }}</th>{% endif %}{% if objectType == 'liabilities' %}- <th style="text-align: right;">+ <th class="text-right">{{ trans('firefly.left_in_debt') }}</th>{% endif %}@@ -64,7 +64,7 @@{% endif %}<td class="hidden-sm hidden-xs">{{ account.iban }}{% if account.iban == '' %}{{ accountGetMetaField(account, 'account_number') }}{% endif %}</td>{% if objectType != 'liabilities' %}- <td style="text-align: right;">+ <td class="text-right"><span style="margin-right:5px;">{% for key, balance in account.endBalances %}<span title="{{ key }}">@@ -85,7 +85,7 @@</td>{% endif %}{% if objectType == 'liabilities' %}- <td style="text-align: right;">+ <td class="text-right">{% if '-' != account.current_debt %}<span class="text-info money-transfer">{{ formatAmountBySymbol(account.current_debt, account.currency.symbol, account.currency.decimal_places, false) }}@@ -113,7 +113,7 @@</td>{% endif %}{% endif %}- <td class="hidden-sm hidden-xs hidden-md" style="text-align: right;">+ <td class="text-right hidden-sm hidden-xs hidden-md"><span style="margin-right:5px;">{% for key, balance in account.differences %}<span title="{{ key }}">diff --git a/resources/views/list/bills.twig b/resources/views/list/bills.twigindex ef0093b389..29f928f1aa 100644--- a/resources/views/list/bills.twig+++ b/resources/views/list/bills.twig@@ -8,7 +8,7 @@<th class="hidden-sm hidden-xs"> </th><th>{{ trans('list.name') }}</th><th class="hidden-sm hidden-md hidden-xs">{{ trans('list.linked_to_rules') }}</th>- <th style="text-align: right;">{{ trans('list.matchingAmount') }}</th>+ <th class="text-right">{{ trans('list.matchingAmount') }}</th><th class="hidden-sm hidden-xs">{{ trans('list.paid_current_period') }}</th><th class="hidden-sm hidden-xs">{{ trans('list.next_expected_match') }}</th><th class="hidden-sm hidden-xs">{{ trans('list.repeat_freq') }}</th>@@ -62,7 +62,7 @@</ul>{% endif %}</td>- <td style="text-align: right;">+ <td class="text-right"><span style="margin-right:5px;"title="{{ formatAmountBySymbol(entry.amount_min, entry.currency_symbol, entry.currency_decimal_places, false)|escape }} -- {{ formatAmountBySymbol(entry.amount_max, entry.currency_symbol, entry.currency_decimal_places, false)|escape }}">@@ -178,10 +178,10 @@<tr><td class="hidden-sm hidden-xs"> </td> <!-- handle --><td class="hidden-sm hidden-xs"> </td> <!-- buttons -->- <td colspan="2" style="text-align: right;"> <!-- title -->+ <td colspan="2" class="text-right"> <!-- title --><small>{{ 'sum'|_ }} ({{ sum.currency_name }}) ({{ 'active_exp_bills_only'|_ }})</small></td>- <td style="text-align: right;"> <!-- amount -->+ <td class="text-right"> <!-- amount -->{{ formatAmountBySymbol(sum.avg, sum.currency_symbol, sum.currency_decimal_places) }}</td><td> </td> <!-- paid in period -->@@ -193,10 +193,10 @@<tr><td class="hidden-sm hidden-xs"> </td> <!-- handle --><td class="hidden-sm hidden-xs"> </td> <!-- buttons -->- <td colspan="2" style="text-align: right;"> <!-- title -->+ <td colspan="2" class="text-right"> <!-- title --><small>{{ 'sum'|_ }} ({{ sum.currency_name }}) ({{ 'left_to_pay_active_bills'|_ }})</small></td>- <td style="text-align: right;"> <!-- amount -->+ <td class="text-right"> <!-- amount -->{{ formatAmountBySymbol(sum.total_left_to_pay, sum.currency_symbol, sum.currency_decimal_places) }}</td><td> </td> <!-- paid in period -->@@ -208,11 +208,11 @@<tr><td class="hidden-sm hidden-xs"> </td> <!-- handle --><td class="hidden-sm hidden-xs"> </td> <!-- buttons -->- <td colspan="2" style="text-align: right;"> <!-- title -->+ <td colspan="2" class="text-right"> <!-- title --><small>{{ ('per_period_sum_'~sum.period)|_ }} ({{ sum.currency_name }})({{ 'active_bills_only'|_ }})</small></td>- <td style="text-align: right;"> <!-- amount -->+ <td class="text-right"> <!-- amount -->{{ formatAmountBySymbol(sum.per_period, sum.currency_symbol, sum.currency_decimal_places) }}</td><td> </td> <!-- paid in period -->@@ -234,10 +234,10 @@<tr><td class="hidden-sm hidden-xs"> </td> <!-- handle --><td class="hidden-sm hidden-xs"> </td> <!-- buttons -->- <td colspan="2" style="text-align: right;"> <!-- title -->+ <td colspan="2" class="text-right"> <!-- title --><small>{{ 'sum'|_ }} ({{ sum.currency_name }}) ({{ 'active_exp_bills_only_total'|_ }})</small></td>- <td style="text-align: right;"> <!-- amount -->+ <td class="text-right"> <!-- amount -->{{ formatAmountBySymbol(sum.avg, sum.currency_symbol, sum.currency_decimal_places) }}</td><td> </td> <!-- paid in period -->@@ -249,11 +249,11 @@<tr><td class="hidden-sm hidden-xs"> </td> <!-- handle --><td class="hidden-sm hidden-xs"> </td> <!-- buttons -->- <td colspan="2" style="text-align: right;"> <!-- title -->+ <td colspan="2" class="text-right"> <!-- title --><small>{{ ('per_period_sum_'~sum.period)|_ }} ({{ sum.currency_name }})({{ 'active_bills_only_total'|_ }})</small></td>- <td style="text-align: right;"> <!-- amount -->+ <td class="text-right"> <!-- amount -->{{ formatAmountBySymbol(sum.per_period, sum.currency_symbol, sum.currency_decimal_places) }}</td><td> </td> <!-- paid in period -->diff --git a/resources/views/list/groups.twig b/resources/views/list/groups.twigindex 459ea7ad31..eb33dba5ea 100644--- a/resources/views/list/groups.twig+++ b/resources/views/list/groups.twig@@ -59,7 +59,7 @@title="{{ group.title }}">{{ group.title }}</a></strong></small></td>- <td colspan="1" style="text-align:right;border-top:1px #aaa solid;">+ <td colspan="1" class="text-right" style="border-top:1px #aaa solid;">{% for sum in group.sums %}{% if group.transaction_type == 'Deposit' %}{{ formatAmountBySymbol(sum.amount*-1, sum.currency_symbol, sum.currency_decimal_places) }}@@ -162,7 +162,7 @@</a>{% endif %}</td>- <td style="{{ style|raw }};text-align:right">+ <td style="{{ style|raw }};" class="text-right">{# deposit #}{% if transaction.transaction_type_type == 'Deposit' %}diff --git a/resources/views/list/periods.twig b/resources/views/list/periods.twigindex 0f19ef7525..c938cd6757 100644--- a/resources/views/list/periods.twig+++ b/resources/views/list/periods.twig@@ -9,14 +9,14 @@{% if period.total_transactions > 0 %}<tr><td style="width:33%;">{{ 'transactions'|_ }}</td>- <td style="text-align: right;">{{ period.total_transactions }}</td>+ <td class="text-right">{{ period.total_transactions }}</td></tr>{% endif %}{% for entry in period.spent %}{% if entry.amount != 0 %}<tr><td style="width:33%;">{{ 'spent'|_ }}</td>- <td style="text-align: right;">+ <td class="text-right"><span title="{{ entry.count }}">{{ formatAmountBySymbol(entry.amount, entry.currency_symbol, entry.currency_decimal_places) }}</span>@@ -29,7 +29,7 @@{% if entry.amount != 0 %}<tr><td style="width:33%;">{{ 'earned'|_ }}</td>- <td style="text-align: right;">+ <td class="text-right"><span title="{{ entry.count }}">{% if entry.amount < 0 %}{{ formatAmountBySymbol(entry.amount*-1, entry.currency_symbol, entry.currency_decimal_places) }}@@ -46,7 +46,7 @@{% if entry.amount != 0 %}<tr><td style="width:33%;">{{ 'transferred'|_ }}</td>- <td style="text-align: right;">+ <td class="text-right"><span title="{{ entry.count }}">{{ formatAmountBySymbol(entry.amount*-1, entry.currency_symbol, entry.currency_decimal_places) }}</span>@@ -59,7 +59,7 @@{% if entry.amount != 0 %}<tr><td style="width:33%;">{{ 'transferred_away'|_ }}</td>- <td style="text-align: right;">+ <td class="text-right"><span title="{{ entry.count }}">{% if entry.amount < 0 %}{{ formatAmountBySymbol(entry.amount, entry.currency_symbol, entry.currency_decimal_places) }}@@ -76,7 +76,7 @@{% if entry.amount != 0 %}<tr><td style="width:33%;">{{ 'transferred_in'|_ }}</td>- <td style="text-align: right;">+ <td class="text-right"><span title="{{ entry.count }}">{% if entry.amount < 0 %}{{ formatAmountBySymbol(entry.amount*-1, entry.currency_symbol, entry.currency_decimal_places) }}diff --git a/resources/views/list/piggy-bank-events.twig b/resources/views/list/piggy-bank-events.twigindex a1f36c50b5..d31b739d4b 100644--- a/resources/views/list/piggy-bank-events.twig+++ b/resources/views/list/piggy-bank-events.twig@@ -22,7 +22,7 @@{% endif %}</td>- <td style="text-align: right;">+ <td class="text-right">{% if event.amount < 0 %}<span class="text-danger money-negative">{{ trans('firefly.removed_amount', {amount: formatAmountBySymbol(event.amount,event.piggyBank.transactionCurrency.symbol, event.piggyBank.transactionCurrency.decimal_places, false)})|raw }}</span>{% else %}diff --git a/resources/views/list/piggy-banks.twig b/resources/views/list/piggy-banks.twigindex 01dd93ec6e..83354f6198 100644--- a/resources/views/list/piggy-banks.twig+++ b/resources/views/list/piggy-banks.twig@@ -3,11 +3,11 @@<tr><th colspan="2"> </th><th>{{ 'piggy_bank'|_ }}</th>- <th style="text-align: right;">{{ 'saved_so_far'|_ }}</th>+ <th class="text-right">{{ 'saved_so_far'|_ }}</th><th colspan="3" class="hidden-sm hidden-xs"> </th>- <th style="text-align: right;" class="hidden-sm hidden-xs">{{ 'target_amount'|_ }}</th>- <th style="text-align: right;" class="hidden-sm hidden-xs">{{ 'left_to_save'|_ }}</th>- <th style="text-align: right;" class="hidden-sm hidden-xs">{{ 'suggested_savings_per_month'|_ }}</th>+ <th class="text-right hidden-sm hidden-xs">{{ 'target_amount'|_ }}</th>+ <th class="text-right hidden-sm hidden-xs">{{ 'left_to_save'|_ }}</th>+ <th class="text-right hidden-sm hidden-xs">{{ 'suggested_savings_per_month'|_ }}</th></tr></thead>@@ -45,15 +45,15 @@<span class="fa fa-fw fa-paperclip"></span>{% endif %}</td>- <td style="text-align: right;" class="piggySaved">- <span title="Saved so far" style="text-align:right;">+ <td class="text-right piggySaved">+ <span title="Saved so far" class="text-right">{{ formatAmountBySymbol(piggy.current_amount,piggy.currency_symbol,piggy.currency_decimal_places) }}{% if convertToPrimary and piggy.currency_id != primaryCurrency.id and null != piggy.pc_current_amount %}({{ formatAmountBySymbol(piggy.pc_current_amount,primaryCurrency.symbol,primaryCurrency.decimal_places) }}){% endif %}</span></td>- <td class="hidden-sm hidden-xs" style="text-align:right;width:40px;">+ <td class="hidden-sm hidden-xs text-right" style="width:40px;">{% if piggy.current_amount > 0 %}<a href="{{ route('piggy-banks.remove-money', piggy.id) }}" class="btn btn-default btn-xs removeMoney" data-id="{{ piggy.id }}"><span data-id="{{ piggy.id }}" class="fa fa-minus"></span></a>@@ -87,7 +87,7 @@<span data-id="{{ piggy.id }}" class="fa fa-plus"></span></a>{% endif %}</td>- <td class="hidden-sm hidden-xs" style="text-align:right;">+ <td class="hidden-sm hidden-xs text-right">{% if null != piggy.target_amount and 0 != piggy.target_amount %}<span title="{{ 'target_amount'|_ }}">{{ formatAmountBySymbol(piggy.target_amount,piggy.currency_symbol,piggy.currency_decimal_places) }}</span>{% if convertToPrimary and piggy.currency_id != primaryCurrency.id and null != piggy.pc_target_amount %}@@ -95,7 +95,7 @@{% endif %}{% endif %}</td>- <td class="hidden-sm hidden-xs" style="text-align:right;">+ <td class="hidden-sm hidden-xs text-right">{% if piggy.left_to_save > 0 %}<span title="{{ 'left_to_save'|_ }}">{{ formatAmountBySymbol(piggy.left_to_save,piggy.currency_symbol,piggy.currency_decimal_places) }}</span>{% if convertToPrimary and piggy.currency_id != primaryCurrency.id and null != piggy.pc_left_to_save %}@@ -103,7 +103,7 @@{% endif %}{% endif %}</td>- <td class="hidden-sm hidden-xs" style="text-align:right;">+ <td class="hidden-sm hidden-xs text-right">{% if piggy.target_date and piggy.save_per_month %}{{ formatAmountBySymbol(piggy.save_per_month, piggy.currency_symbol, piggy.currency_decimal_places) }}{% if convertToPrimary and piggy.currency_id != primaryCurrency.id and null != piggy.pc_save_per_month %}@@ -119,7 +119,7 @@<td class="hidden-sm hidden-xs"> </td> {# handle #}<td class="hidden-sm hidden-xs"> </td> {# buttons #}<td> </td>- <td style="text-align: right;">+ <td class="text-right">{% for sum in objectGroup.sums %}{{ formatAmountBySymbol(sum.saved, sum.currency_symbol, sum.currency_decimal_places) }}<br />{% endfor %}@@ -127,17 +127,17 @@<td class="hidden-sm hidden-xs"> </td> {# remove money #}<td class="hidden-sm hidden-xs"> </td> {# progress#}<td class="hidden-sm hidden-xs"> </td> {# add money #}- <td class="hidden-sm hidden-xs" style="text-align: right;">+ <td class="text-right hidden-sm hidden-xs">{% for sum in objectGroup.sums %}{{ formatAmountBySymbol(sum.target, sum.currency_symbol, sum.currency_decimal_places) }}<br />{% endfor %}</td>- <td class="hidden-sm hidden-xs" style="text-align: right;">+ <td class="text-right hidden-sm hidden-xs">{% for sum in objectGroup.sums %}{{ formatAmountBySymbol(sum.left_to_save, sum.currency_symbol, sum.currency_decimal_places) }}<br />{% endfor %}</td>- <td class="hidden-sm hidden-xs" style="text-align: right;">+ <td class="text-right hidden-sm hidden-xs">{% for sum in objectGroup.sums %}{{ formatAmountBySymbol(sum.save_per_month, sum.currency_symbol, sum.currency_decimal_places) }}<br />{% endfor %}diff --git a/resources/views/piggy-banks/index.twig b/resources/views/piggy-banks/index.twigindex 29b0acb320..247f8a0468 100644--- a/resources/views/piggy-banks/index.twig+++ b/resources/views/piggy-banks/index.twig@@ -38,30 +38,30 @@<thead><tr><th>{{ 'account'|_ }}</th>- <th style="text-align:right;" class="hidden-sm hidden-xs">{{ 'balance'|_ }}</th>- <th style="text-align:right;">{{ 'left_for_piggy_banks'|_ }}</th>- <th style="text-align:right;" class="hidden-sm hidden-xs">{{ 'sum_of_piggy_banks'|_ }}</th>- <th style="text-align:right;" class="hidden-sm hidden-xs">{{ 'saved_so_far'|_ }}</th>- <th style="text-align:right;" class="hidden-sm hidden-xs">{{ 'left_to_save'|_ }}</th>+ <th class="text-right hidden-sm hidden-xs">{{ 'balance'|_ }}</th>+ <th class="text-right">{{ 'left_for_piggy_banks'|_ }}</th>+ <th class="text-right hidden-sm hidden-xs">{{ 'sum_of_piggy_banks'|_ }}</th>+ <th class="text-right hidden-sm hidden-xs">{{ 'saved_so_far'|_ }}</th>+ <th class="text-right hidden-sm hidden-xs">{{ 'left_to_save'|_ }}</th></tr></thead><tbody>{% for id,info in accounts %}<tr><td><a href="{{ route('accounts.show',id) }}" title="{{ info.name }}">{{ info.name }}</a></td>- <td style="text-align:right;" class="hidden-sm hidden-xs">+ <td class="text-right hidden-sm hidden-xs">{{ formatAmountBySymbol(info.current_balance,info.currency_symbol,info.currency_decimal_places) }}</td>- <td style="text-align:right;">+ <td class="text-right">{{ formatAmountBySymbol(info.left,info.currency_symbol,info.currency_decimal_places) }}</td>- <td style="text-align:right;" class="hidden-sm hidden-xs">+ <td class="text-right hidden-sm hidden-xs">{{ formatAmountBySymbol(info.target,info.currency_symbol,info.currency_decimal_places) }}</td>- <td style="text-align:right;" class="hidden-sm hidden-xs">+ <td class="text-right hidden-sm hidden-xs">{{ formatAmountBySymbol(info.saved,info.currency_symbol,info.currency_decimal_places) }}</td>- <td style="text-align:right;" class="hidden-sm hidden-xs">+ <td class="text-right hidden-sm hidden-xs">{{ formatAmountBySymbol(info.to_save,info.currency_symbol,info.currency_decimal_places) }}</td></tr>diff --git a/resources/views/popup/list/journals.twig b/resources/views/popup/list/journals.twigindex 6a29d08f84..9dec92c1ad 100644--- a/resources/views/popup/list/journals.twig+++ b/resources/views/popup/list/journals.twig@@ -140,7 +140,7 @@</tbody><tfoot><tr>- <td colspan="2" style="text-align: right;"><em>{{ 'sum'|_ }}:</em></td>+ <td colspan="2" class="text-right"><em>{{ 'sum'|_ }}:</em></td><td>{% if sum != 0 %}{{ formatAmountBySymbol(sum, symbol, decimal_places) }}diff --git a/resources/views/reports/budget/month.twig b/resources/views/reports/budget/month.twigindex 194abfb622..dcdf555c1c 100644--- a/resources/views/reports/budget/month.twig+++ b/resources/views/reports/budget/month.twig@@ -56,8 +56,8 @@<h3 class="box-title">{{ 'expense_per_budget'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="budgets-out-pie-chart" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="budgets-out-pie-chart" class="medium-chart" height="250"></canvas></div></div></div>@@ -68,8 +68,8 @@<h3 class="box-title">{{ 'expense_per_category'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="categories-out-pie-chart" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="categories-out-pie-chart" class="medium-chart" height="250"></canvas></div></div></div>@@ -82,8 +82,8 @@<h3 class="box-title">{{ 'expense_per_source_account'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="source-accounts-pie-chart" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="source-accounts-pie-chart" class="medium-chart" height="250"></canvas></div></div></div>@@ -94,8 +94,8 @@<h3 class="box-title">{{ 'expense_per_destination_account'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="dest-accounts-pie-chart" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="dest-accounts-pie-chart" class="medium-chart" height="250"></canvas></div></div></div>diff --git a/resources/views/reports/budget/partials/account-per-budget.twig b/resources/views/reports/budget/partials/account-per-budget.twigindex 0266078590..d2426a79b2 100644--- a/resources/views/reports/budget/partials/account-per-budget.twig+++ b/resources/views/reports/budget/partials/account-per-budget.twig@@ -3,7 +3,7 @@<tr><th data-defaultsign="az">{{ 'name'|_ }}</th>{% for budget in budgets %}- <th data-defaultsign="_19" style="text-align: right;">{{ budget.name }}</th>+ <th data-defaultsign="_19" class="text-right">{{ budget.name }}</th>{% endfor %}</tr></thead>@@ -15,7 +15,7 @@<a href="{{ route('accounts.show', account.id) }}" title="{{ account.iban }}">{{ account.name }} ({{ currency.currency_name }})</a></td>{% for budget in budgets %}- <td style="text-align: right;">+ <td class="text-right">{% if currency.budgets[budget.id] %}{{ formatAmountBySymbol(currency.budgets[budget.id], currency.currency_symbol, currency.currency_decimal_places) }}{% else %}diff --git a/resources/views/reports/budget/partials/accounts.twig b/resources/views/reports/budget/partials/accounts.twigindex cb21e4f5f5..b73a76b844 100644--- a/resources/views/reports/budget/partials/accounts.twig+++ b/resources/views/reports/budget/partials/accounts.twig@@ -2,7 +2,7 @@<thead><tr><th data-defaultsign="az">{{ 'name'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'spent'|_ }}</th></tr></thead><tbody>@@ -12,7 +12,7 @@<td data-value="{{ account.name }} ({{ currency.currency_name }})"><a href="{{ route('accounts.show', account.id) }}" title="{{ account.iban }}">{{ account.name }} ({{ currency.currency_name }})</a></td>- <td data-value="{{ currency.sum }}" style="text-align: right;">+ <td data-value="{{ currency.sum }}" class="text-right">{{ formatAmountBySymbol(currency.sum, currency.currency_symbol, currency.currency_decimal_places) }}</td></tr>@@ -23,7 +23,7 @@{% for sum in sums %}<tr><td>{{ 'sum'|_ }} ({{ sum.currency_name }})</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }}</td></tr>diff --git a/resources/views/reports/budget/partials/avg-expenses.twig b/resources/views/reports/budget/partials/avg-expenses.twigindex b34a2ecc63..69de2720e4 100644--- a/resources/views/reports/budget/partials/avg-expenses.twig+++ b/resources/views/reports/budget/partials/avg-expenses.twig@@ -2,8 +2,8 @@<thead><tr><th data-defaultsign="az">{{ 'account'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'spent_average'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'total'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'spent_average'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'total'|_ }}</th><th data-defaultsign="_19">{{ 'transaction_count'|_ }}</th></tr></thead>@@ -19,11 +19,11 @@{{ row.destination_account_name }}</a></td>- <td data-value="{{ row.avg }}" style="text-align: right;">+ <td data-value="{{ row.avg }}" class="text-right">{{ formatAmountBySymbol(row.avg, row.currency_symbol, row.currency_decimal_places) }}</td>- <td data-value="{{ row.sum }}" style="text-align: right;">+ <td data-value="{{ row.sum }}" class="text-right">{{ formatAmountBySymbol(row.sum, row.currency_symbol, row.currency_decimal_places) }}</td>diff --git a/resources/views/reports/budget/partials/budgets.twig b/resources/views/reports/budget/partials/budgets.twigindex 66dab99ab5..96c701c5b0 100644--- a/resources/views/reports/budget/partials/budgets.twig+++ b/resources/views/reports/budget/partials/budgets.twig@@ -2,7 +2,7 @@<thead><tr><th data-defaultsign="az">{{ 'name'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'spent'|_ }}</th><th data-defaultsign="_19">{{ trans('list.percentage') }}</th></tr></thead>@@ -13,7 +13,7 @@<td data-value="{{ budget.name }}"><a href="{{ route('budgets.show', budget.id) }}" title="{{ budget.name }}">{{ budget.name }}</a></td>- <td style="text-align: right;">—</td>+ <td class="text-right">—</td><td> </td></tr>{% endif %}@@ -22,7 +22,7 @@<td data-value="{{ budget.name }} ({{ currency.currency_name }})"><a href="{{ route('budgets.show', budget.id) }}" title="{{ budget.name }}">{{ budget.name }} ({{ currency.currency_name }})</a></td>- <td data-value="{{ currency.sum }}" style="text-align: right;">+ <td data-value="{{ currency.sum }}" class="text-right">{{ formatAmountBySymbol(currency.sum, currency.currency_symbol, currency.currency_decimal_places) }}</td><td data-value="{{ currency.sum_pct }}">{{ currency.sum_pct }}%</td>@@ -34,7 +34,7 @@{% for sum in sums %}<tr><td>{{ 'sum'|_ }} ({{ sum.currency_name }})</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }}</td><td> </td>diff --git a/resources/views/reports/budget/partials/top-expenses.twig b/resources/views/reports/budget/partials/top-expenses.twigindex 8b5d71bd6b..eb1ffae984 100644--- a/resources/views/reports/budget/partials/top-expenses.twig+++ b/resources/views/reports/budget/partials/top-expenses.twig@@ -5,7 +5,7 @@<th data-defaultsign="month">{{ 'date'|_ }}</th><th data-defaultsign="az">{{ 'account'|_ }}</th><th data-defaultsign="az">{{ 'budget'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'amount'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'amount'|_ }}</th></tr></thead><tbody>@@ -35,7 +35,7 @@</a></td>- <td data-value="{{ row.amount }}" style="text-align: right;">+ <td data-value="{{ row.amount }}" class="text-right">{{ formatAmountBySymbol(row.amount, row.currency_symbol, row.currency_decimal_places) }}</td>diff --git a/resources/views/reports/category/month.twig b/resources/views/reports/category/month.twigindex 14d6d2b706..a6fa9c4cec 100644--- a/resources/views/reports/category/month.twig+++ b/resources/views/reports/category/month.twig@@ -56,8 +56,8 @@<h3 class="box-title">{{ 'expense_per_category'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="category-out-pie-chart" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="category-out-pie-chart" class="medium-chart" height="250"></canvas></div></div></div>@@ -68,8 +68,8 @@<h3 class="box-title">{{ 'income_per_category'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="category-in-pie-chart" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="category-in-pie-chart" class="medium-chart" height="250"></canvas></div></div></div>@@ -80,8 +80,8 @@<h3 class="box-title">{{ 'expense_per_budget'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="budgets-out-pie-chart" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="budgets-out-pie-chart" class="medium-chart" height="250"></canvas></div></div></div>@@ -94,8 +94,8 @@<h3 class="box-title">{{ 'expense_per_source_account'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="source-out-pie-chart" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="source-out-pie-chart" class="medium-chart" height="250"></canvas></div></div></div>@@ -106,8 +106,8 @@<h3 class="box-title">{{ 'income_per_source_account'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="source-in-pie-chart" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="source-in-pie-chart" class="medium-chart" height="250"></canvas></div></div></div>@@ -120,8 +120,8 @@<h3 class="box-title">{{ 'expense_per_destination_account'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="dest-out-pie-chart" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="dest-out-pie-chart" class="medium-chart" height="250"></canvas></div></div></div>@@ -132,8 +132,8 @@<h3 class="box-title">{{ 'income_per_destination_account'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="dest-in-pie-chart" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="dest-in-pie-chart" class="medium-chart" height="250"></canvas></div></div></div>diff --git a/resources/views/reports/category/partials/account-per-category.twig b/resources/views/reports/category/partials/account-per-category.twigindex cb960c33bb..99b4a0e1f0 100644--- a/resources/views/reports/category/partials/account-per-category.twig+++ b/resources/views/reports/category/partials/account-per-category.twig@@ -3,7 +3,7 @@<tr><th data-defaultsign="az">{{ 'name'|_ }}</th>{% for category in categories %}- <th data-defaultsign="_19" style="text-align: right;">{{ category.name }}</th>+ <th data-defaultsign="_19" class="text-right">{{ category.name }}</th>{% endfor %}</tr></thead>@@ -15,7 +15,7 @@<a href="{{ route('accounts.show', account.id) }}" title="{{ account.iban }}">{{ account.name }} ({{ currency.currency_name }})</a></td>{% for category in categories %}- <td style="text-align: right;">+ <td class="text-right">{% if currency.categories[category.id] %}<span title="{{ 'earned'|_ }}: {{ formatAmountBySymbol(currency.categories[category.id].earned, currency.currency_symbol, currency.currency_decimal_places, false) }}, {{ 'spent'|_ }}: {{ formatAmountBySymbol(currency.categories[category.id].spent, currency.currency_symbol, currency.currency_decimal_places, false) }}"{{ formatAmountBySymbol(currency.categories[category.id].sum, currency.currency_symbol, currency.currency_decimal_places) }}diff --git a/resources/views/reports/category/partials/accounts.twig b/resources/views/reports/category/partials/accounts.twigindex 4e9ce9e9a2..c493e6c549 100644--- a/resources/views/reports/category/partials/accounts.twig+++ b/resources/views/reports/category/partials/accounts.twig@@ -2,9 +2,9 @@<thead><tr><th data-defaultsign="az">{{ 'name'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'earned'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'sum'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'spent'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'earned'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'sum'|_ }}</th></tr></thead><tbody>@@ -14,13 +14,13 @@<td data-value="{{ account.name }} ({{ currency.currency_name }})"><a href="{{ route('accounts.show', account.id) }}" title="{{ account.iban }}">{{ account.name }} ({{ currency.currency_name }})</a></td>- <td data-value="{{ currency.spent }}" style="text-align: right;">+ <td data-value="{{ currency.spent }}" class="text-right">{{ formatAmountBySymbol(currency.spent, currency.currency_symbol, currency.currency_decimal_places) }}</td>- <td data-value="{{ currency.earned }}" style="text-align: right;">+ <td data-value="{{ currency.earned }}" class="text-right">{{ formatAmountBySymbol(currency.earned, currency.currency_symbol, currency.currency_decimal_places) }}</td>- <td data-value="{{ currency.sum }}" style="text-align: right;">+ <td data-value="{{ currency.sum }}" class="text-right">{{ formatAmountBySymbol(currency.sum, currency.currency_symbol, currency.currency_decimal_places) }}</td></tr>@@ -31,13 +31,13 @@{% for sum in sums %}<tr><td>{{ 'sum'|_ }} ({{ sum.currency_name }})</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.spent_sum, sum.currency_symbol, sum.currency_decimal_places) }}</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.earned_sum, sum.currency_symbol, sum.currency_decimal_places) }}</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.total_sum, sum.currency_symbol, sum.currency_decimal_places) }}</td></tr>diff --git a/resources/views/reports/category/partials/avg-expenses.twig b/resources/views/reports/category/partials/avg-expenses.twigindex b34a2ecc63..69de2720e4 100644--- a/resources/views/reports/category/partials/avg-expenses.twig+++ b/resources/views/reports/category/partials/avg-expenses.twig@@ -2,8 +2,8 @@<thead><tr><th data-defaultsign="az">{{ 'account'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'spent_average'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'total'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'spent_average'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'total'|_ }}</th><th data-defaultsign="_19">{{ 'transaction_count'|_ }}</th></tr></thead>@@ -19,11 +19,11 @@{{ row.destination_account_name }}</a></td>- <td data-value="{{ row.avg }}" style="text-align: right;">+ <td data-value="{{ row.avg }}" class="text-right">{{ formatAmountBySymbol(row.avg, row.currency_symbol, row.currency_decimal_places) }}</td>- <td data-value="{{ row.sum }}" style="text-align: right;">+ <td data-value="{{ row.sum }}" class="text-right">{{ formatAmountBySymbol(row.sum, row.currency_symbol, row.currency_decimal_places) }}</td>diff --git a/resources/views/reports/category/partials/avg-income.twig b/resources/views/reports/category/partials/avg-income.twigindex f473a8011b..f2ca8553a9 100644--- a/resources/views/reports/category/partials/avg-income.twig+++ b/resources/views/reports/category/partials/avg-income.twig@@ -2,8 +2,8 @@<thead><tr><th data-defaultsign="az">{{ 'account'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'income_average'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'total'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'income_average'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'total'|_ }}</th><th data-defaultsign="_19">{{ 'transaction_count'|_ }}</th></tr></thead>@@ -19,11 +19,11 @@{{ row.source_account_name }}</a></td>- <td data-value="{{ row.avg }}" style="text-align: right;">+ <td data-value="{{ row.avg }}" class="text-right">{{ formatAmountBySymbol(row.avg, row.currency_symbol, row.currency_decimal_places) }}</td>- <td data-value="{{ row.sum }}" style="text-align: right;">+ <td data-value="{{ row.sum }}" class="text-right">{{ formatAmountBySymbol(row.sum, row.currency_symbol, row.currency_decimal_places) }}</td>diff --git a/resources/views/reports/category/partials/categories.twig b/resources/views/reports/category/partials/categories.twigindex 0846294049..4530ab4740 100644--- a/resources/views/reports/category/partials/categories.twig+++ b/resources/views/reports/category/partials/categories.twig@@ -2,9 +2,9 @@<thead><tr><th data-defaultsign="az">{{ 'name'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'earned'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'sum'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'spent'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'earned'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'sum'|_ }}</th></tr></thead><tbody>@@ -14,9 +14,9 @@<td data-value="{{ category.name }}"><a href="{{ route('categories.show', category.id) }}" title="{{ category.name }}">{{ category.name }}</a></td>- <td style="text-align: right;">—</td>- <td style="text-align: right;">—</td>- <td style="text-align: right;">—</td>+ <td class="text-right">—</td>+ <td class="text-right">—</td>+ <td class="text-right">—</td></tr>{% endif %}{% for currency in category.currencies %}@@ -24,13 +24,13 @@<td data-value="{{ category.name }} ({{ currency.currency_name }})"><a href="{{ route('categories.show', category.id) }}" title="{{ category.name }}">{{ category.name }} ({{ currency.currency_name }})</a></td>- <td data-value="{{ currency.spent }}" style="text-align: right;">+ <td data-value="{{ currency.spent }}" class="text-right">{{ formatAmountBySymbol(currency.spent, currency.currency_symbol, currency.currency_decimal_places) }}</td>- <td data-value="{{ currency.earned }}" style="text-align: right;">+ <td data-value="{{ currency.earned }}" class="text-right">{{ formatAmountBySymbol(currency.earned, currency.currency_symbol, currency.currency_decimal_places) }}</td>- <td data-value="{{ currency.sum }}" style="text-align: right;">+ <td data-value="{{ currency.sum }}" class="text-right">{{ formatAmountBySymbol(currency.sum, currency.currency_symbol, currency.currency_decimal_places) }}</td></tr>@@ -41,13 +41,13 @@{% for sum in sums %}<tr><td>{{ 'sum'|_ }} ({{ sum.currency_name }})</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.spent_sum, sum.currency_symbol, sum.currency_decimal_places) }}</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.earned_sum, sum.currency_symbol, sum.currency_decimal_places) }}</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.total_sum, sum.currency_symbol, sum.currency_decimal_places) }}</td></tr>diff --git a/resources/views/reports/category/partials/top-expenses.twig b/resources/views/reports/category/partials/top-expenses.twigindex f435d41189..095e226e0e 100644--- a/resources/views/reports/category/partials/top-expenses.twig+++ b/resources/views/reports/category/partials/top-expenses.twig@@ -5,7 +5,7 @@<th data-defaultsign="month">{{ 'date'|_ }}</th><th data-defaultsign="az">{{ 'account'|_ }}</th><th data-defaultsign="az">{{ 'category'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'amount'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'amount'|_ }}</th></tr></thead><tbody>@@ -35,7 +35,7 @@</a></td>- <td data-value="{{ row.amount }}" style="text-align: right;">+ <td data-value="{{ row.amount }}" class="text-right">{{ formatAmountBySymbol(row.amount, row.currency_symbol, row.currency_decimal_places) }}</td>diff --git a/resources/views/reports/category/partials/top-income.twig b/resources/views/reports/category/partials/top-income.twigindex e5d566d468..07a961d356 100644--- a/resources/views/reports/category/partials/top-income.twig+++ b/resources/views/reports/category/partials/top-income.twig@@ -5,7 +5,7 @@<th data-defaultsign="month">{{ 'date'|_ }}</th><th data-defaultsign="az">{{ 'account'|_ }}</th><th data-defaultsign="az">{{ 'category'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'amount'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'amount'|_ }}</th></tr></thead><tbody>@@ -35,7 +35,7 @@</a></td>- <td data-value="{{ row.amount }}" style="text-align: right;">+ <td data-value="{{ row.amount }}" class="text-right">{{ formatAmountBySymbol(row.amount, row.currency_symbol, row.currency_decimal_places) }}</td>diff --git a/resources/views/reports/double/partials/accounts-per-asset.twig b/resources/views/reports/double/partials/accounts-per-asset.twigindex 6a19774fbf..b0c6cd98c3 100644--- a/resources/views/reports/double/partials/accounts-per-asset.twig+++ b/resources/views/reports/double/partials/accounts-per-asset.twig@@ -2,9 +2,9 @@<thead><tr><th data-defaultsign="az">{{ 'name'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'earned'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'sum'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'spent'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'earned'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'sum'|_ }}</th></tr></thead><tbody>@@ -13,13 +13,13 @@<td><a href="{{ route('accounts.show', [account.account_id]) }}" title="{{ account.account_name }}">{{ account.account_name }}</a></td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(account.spent, account.currency_symbol, account.currency_decimal_places) }}</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(account.earned, account.currency_symbol, account.currency_decimal_places) }}</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(account.sum, account.currency_symbol, account.currency_decimal_places) }}</td></tr>@@ -29,13 +29,13 @@{% for sum in sums %}<tr><td>{{ 'sum'|_ }} ({{ sum.currency_name }})</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.spent, sum.currency_symbol, sum.currency_decimal_places) }}</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.earned, sum.currency_symbol, sum.currency_decimal_places) }}</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }}</td></tr>diff --git a/resources/views/reports/double/partials/accounts.twig b/resources/views/reports/double/partials/accounts.twigindex 7149f2f45e..aa3e20d816 100644--- a/resources/views/reports/double/partials/accounts.twig+++ b/resources/views/reports/double/partials/accounts.twig@@ -2,9 +2,9 @@<thead><tr><th data-defaultsign="az">{{ 'name'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'earned'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'sum'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'spent'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'earned'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'sum'|_ }}</th></tr></thead><tbody>@@ -24,13 +24,13 @@{% endif %}{% endif %}</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(account.spent, account.currency_symbol, account.currency_decimal_places) }}</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(account.earned, account.currency_symbol, account.currency_decimal_places) }}</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(account.sum, account.currency_symbol, account.currency_decimal_places) }}</td></tr>@@ -40,13 +40,13 @@{% for sum in sums %}<tr><td>{{ 'sum'|_ }} ({{ sum.currency_name }})</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.spent, sum.currency_symbol, sum.currency_decimal_places) }}</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.earned, sum.currency_symbol, sum.currency_decimal_places) }}</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }}</td></tr>diff --git a/resources/views/reports/double/partials/avg-expenses.twig b/resources/views/reports/double/partials/avg-expenses.twigindex b859f13a09..e54986d557 100644--- a/resources/views/reports/double/partials/avg-expenses.twig+++ b/resources/views/reports/double/partials/avg-expenses.twig@@ -2,8 +2,8 @@<thead><tr><th data-defaultsign="az">{{ 'account'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'spent_average'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'total'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'spent_average'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'total'|_ }}</th><th data-defaultsign="_19">{{ 'transaction_count'|_ }}</th></tr></thead>@@ -19,11 +19,11 @@{{ row.source_account_name }}</a></td>- <td data-value="{{ row.avg }}" style="text-align: right;">+ <td data-value="{{ row.avg }}" class="text-right">{{ formatAmountBySymbol(row.avg, row.currency_symbol, row.currency_decimal_places) }}</td>- <td data-value="{{ row.sum }}" style="text-align: right;">+ <td data-value="{{ row.sum }}" class="text-right">{{ formatAmountBySymbol(row.sum, row.currency_symbol, row.currency_decimal_places) }}</td>diff --git a/resources/views/reports/double/partials/avg-income.twig b/resources/views/reports/double/partials/avg-income.twigindex b34a2ecc63..69de2720e4 100644--- a/resources/views/reports/double/partials/avg-income.twig+++ b/resources/views/reports/double/partials/avg-income.twig@@ -2,8 +2,8 @@<thead><tr><th data-defaultsign="az">{{ 'account'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'spent_average'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'total'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'spent_average'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'total'|_ }}</th><th data-defaultsign="_19">{{ 'transaction_count'|_ }}</th></tr></thead>@@ -19,11 +19,11 @@{{ row.destination_account_name }}</a></td>- <td data-value="{{ row.avg }}" style="text-align: right;">+ <td data-value="{{ row.avg }}" class="text-right">{{ formatAmountBySymbol(row.avg, row.currency_symbol, row.currency_decimal_places) }}</td>- <td data-value="{{ row.sum }}" style="text-align: right;">+ <td data-value="{{ row.sum }}" class="text-right">{{ formatAmountBySymbol(row.sum, row.currency_symbol, row.currency_decimal_places) }}</td>diff --git a/resources/views/reports/double/partials/top-expenses.twig b/resources/views/reports/double/partials/top-expenses.twigindex 8c957eb6e3..7c15afcf7d 100644--- a/resources/views/reports/double/partials/top-expenses.twig+++ b/resources/views/reports/double/partials/top-expenses.twig@@ -5,7 +5,7 @@<th data-defaultsign="month">{{ 'date'|_ }}</th><th data-defaultsign="az">{{ 'source_account'|_ }}</th><th data-defaultsign="az">{{ 'destination_account'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'amount'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'amount'|_ }}</th></tr></thead><tbody>@@ -36,7 +36,7 @@</td>- <td data-value="{{ row.amount }}" style="text-align: right;">+ <td data-value="{{ row.amount }}" class="text-right">{{ formatAmountBySymbol(row.amount, row.currency_symbol, row.currency_decimal_places) }}</td>diff --git a/resources/views/reports/double/partials/top-income.twig b/resources/views/reports/double/partials/top-income.twigindex 8c957eb6e3..7c15afcf7d 100644--- a/resources/views/reports/double/partials/top-income.twig+++ b/resources/views/reports/double/partials/top-income.twig@@ -5,7 +5,7 @@<th data-defaultsign="month">{{ 'date'|_ }}</th><th data-defaultsign="az">{{ 'source_account'|_ }}</th><th data-defaultsign="az">{{ 'destination_account'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'amount'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'amount'|_ }}</th></tr></thead><tbody>@@ -36,7 +36,7 @@</td>- <td data-value="{{ row.amount }}" style="text-align: right;">+ <td data-value="{{ row.amount }}" class="text-right">{{ formatAmountBySymbol(row.amount, row.currency_symbol, row.currency_decimal_places) }}</td>diff --git a/resources/views/reports/double/report.twig b/resources/views/reports/double/report.twigindex 348eae6b8b..d338b1f76c 100644--- a/resources/views/reports/double/report.twig+++ b/resources/views/reports/double/report.twig@@ -43,8 +43,8 @@<h3 class="box-title">{{ 'expense_per_category'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="category-out-pie-chart" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="category-out-pie-chart" class="medium-chart" height="250"></canvas></div></div></div>@@ -55,8 +55,8 @@<h3 class="box-title">{{ 'income_per_category'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="category-in-pie-chart" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="category-in-pie-chart" class="medium-chart" height="250"></canvas></div></div></div>@@ -67,8 +67,8 @@<h3 class="box-title">{{ 'expense_per_budget'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="budgets-out-pie-chart" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="budgets-out-pie-chart" class="medium-chart" height="250"></canvas></div></div></div>@@ -82,8 +82,8 @@<h3 class="box-title">{{ 'expense_per_tag'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="tag-out-pie-chart" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="tag-out-pie-chart" class="medium-chart" height="250"></canvas></div></div><div class="box-footer">@@ -99,8 +99,8 @@<h3 class="box-title">{{ 'income_per_tag'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="tag-in-pie-chart" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="tag-in-pie-chart" class="medium-chart" height="250"></canvas></div></div><div class="box-footer">diff --git a/resources/views/reports/partials/accounts.twig b/resources/views/reports/partials/accounts.twigindex 53a9e5e0c5..df501c7f3f 100644--- a/resources/views/reports/partials/accounts.twig+++ b/resources/views/reports/partials/accounts.twig@@ -2,9 +2,9 @@<thead><tr><th data-defaultsign="az">{{ 'name'|_ }}</th>- <th data-defaultsign="_19" class="hidden-xs" style="text-align: right;">{{ 'balanceStart'|_ }}</th>- <th data-defaultsign="_19" class="hidden-xs" style="text-align: right;">{{ 'balanceEnd'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'difference'|_ }}</th>+ <th data-defaultsign="_19" class="text-right hidden-xs">{{ 'balanceStart'|_ }}</th>+ <th data-defaultsign="_19" class="text-right hidden-xs">{{ 'balanceEnd'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'difference'|_ }}</th></tr></thead><tbody>@@ -13,13 +13,13 @@<td data-value="{{ account.name }}"><a href="{{ route('accounts.show',account.id) }}" title="{{ account.name }}">{{ account.name }}</a></td>- <td class="hidden-xs" data-value="{{ account.start_balance }}" style="text-align: right;">+ <td class="text-right hidden-xs" data-value="{{ account.start_balance }}">{{ formatAmountBySymbol(account.start_balance, account.currency_symbol, account.currency_decimal_places) }}</td>- <td class="hidden-xs" data-value="{{ account.end_balance }}" style="text-align: right;">+ <td class="text-right hidden-xs" data-value="{{ account.end_balance }}">{{ formatAmountBySymbol(account.end_balance, account.currency_symbol, account.currency_decimal_places) }}</td>- <td style="text-align: right;"+ <td class="text-right"data-value="{{ (account.end_balance - account.start_balance) }}">{{ formatAmountBySymbol(account.end_balance - account.start_balance, account.currency_symbol, account.currency_decimal_places) }}</td>@@ -33,13 +33,13 @@<td> </td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.start, sum.currency_symbol, sum.currency_decimal_places) }}</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.end, sum.currency_symbol, sum.currency_decimal_places) }}</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.difference, sum.currency_symbol, sum.currency_decimal_places) }}</td></tr>diff --git a/resources/views/reports/partials/balance.twig b/resources/views/reports/partials/balance.twigindex 36dc3bb0ca..cea27c7b91 100644--- a/resources/views/reports/partials/balance.twig+++ b/resources/views/reports/partials/balance.twig@@ -4,11 +4,11 @@<th>{{ 'budgets'|_ }}</th>{% for account in report.accounts %}{% if account.sum != 0 %}- <th class="hidden-xs" style="text-align: right;"><a href="{{ route('accounts.show',account.id) }}"+ <th class="text-right hidden-xs"><a href="{{ route('accounts.show',account.id) }}"title="{{ account.iban|default(account.name) }}">{{ account.name }}</a></th>{% endif %}{% endfor %}- <th style="text-align: right;">{{ 'sum'|_ }}</th>+ <th class="text-right">{{ 'sum'|_ }}</th></tr></thead><tbody>@@ -21,7 +21,7 @@</td>{% for account in report.accounts %}{% if budget.spent[account.id] %}- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(budget.spent[account.id].spent, budget.spent[account.id].currency_symbol, budget.spent[account.id].currency_decimal_places) }}<span data-location="budget-entry"data-budget-id="{{ budget.budget_id }}"@@ -36,7 +36,7 @@{% endif %}{% endfor %}- <td style="text-align: right;">+ <td class="text-right">{% for sum in report.sums[budget.budget_id] %}{{ formatAmountBySymbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }}<br/>@@ -51,7 +51,7 @@<td><em>{{ 'sum'|_ }}</em></td>{% for account in report.accounts %}{% if account.sum != 0 %}- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(account.sum, account.currency_symbol, account.currency_decimal_places) }}</td>{% endif %}diff --git a/resources/views/reports/partials/bills.twig b/resources/views/reports/partials/bills.twigindex 2f55e2bd6c..93c410c0b8 100644--- a/resources/views/reports/partials/bills.twig+++ b/resources/views/reports/partials/bills.twig@@ -2,10 +2,10 @@<thead><tr><th data-defaultsign="az">{{ trans('form.name') }}</th>- <th data-defaultsign="_19" class="hidden-xs" style="text-align: right;">{{ trans('form.amount_min') }}</th>- <th data-defaultsign="_19" class="hidden-xs" style="text-align: right;">{{ trans('form.amount_max') }}</th>+ <th data-defaultsign="_19" class="text-right hidden-xs">{{ trans('form.amount_min') }}</th>+ <th data-defaultsign="_19" class="text-right hidden-xs">{{ trans('form.amount_max') }}</th><th data-defaultsign="_19">{{ trans('form.expected_on') }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ trans('form.paid') }}</th>+ <th data-defaultsign="_19" class="text-right">{{ trans('form.paid') }}</th></tr></thead><tbody>@@ -15,10 +15,10 @@<td><a href="{{ route('subscriptions.show',bill.id) }}">{{ bill.name }}</a></td>- <td class="hidden-xs" style="text-align:right;">+ <td class="hidden-xs text-right">{{ formatAmountBySymbol(bill.amount_min, bill.currency_symbol, bill.currency_decimal_places) }}</td>- <td class="hidden-xs" style="text-align:right;">+ <td class="hidden-xs text-right">{{ formatAmountBySymbol(bill.amount_max, bill.currency_symbol, bill.currency_decimal_places) }}</td><td data-value="{{ bill.expected_dates[0].format('Y-m-d')|default('0000-00-00') }}">@@ -26,7 +26,7 @@{{ date.isoFormat(monthAndDayFormat) }}<br/>{% endfor %}</td>- <td style="text-align:right;">+ <td class="text-right">{% set hitCount = 0 %}{% for journals in bill.paid_moments %}{% for journal in journals %}@@ -54,12 +54,12 @@{{ trans('firefly.bill_expected_between', {start: line.getPayDate.isoFormat(monthAndDayFormat), end: line.getEndOfPayDate.isoFormat(monthAndDayFormat) }) }}</small></td>- <td class="hidden-xs" data-value="{{ line.getMin }}" style="text-align: right;">{{ formatAmountByCurrency(line.getCurrency, line.getMin) }}</td>- <td class="hidden-xs" data-value="{{ line.getMax }}" style="text-align: right;">{{ formatAmountByCurrency(line.getCurrency, line.getMax) }}</td>+ <td class="text-right hidden-xs" data-value="{{ line.getMin }}">{{ formatAmountByCurrency(line.getCurrency, line.getMin) }}</td>+ <td class="text-right hidden-xs" data-value="{{ line.getMax }}">{{ formatAmountByCurrency(line.getCurrency, line.getMax) }}</td>{# if bill is hit, show hit amount #}{% if line.isHit %}- <td data-value="{{ line.getAmount }}" style="text-align: right;">+ <td data-value="{{ line.getAmount }}" class="text-right"><a href="{{ route('transactions.show', line.getTransactionJournalId) }}">{{ formatAmountByCurrency(line.getCurrency, line.getAmount) }}</a>@@ -72,7 +72,7 @@{% if not line.isActive and not line.isHit %}<td data-value="-1"> </td>{% endif %}- <td data-value="{{ (line.getMax - line.getAmount) }}" style="text-align: right;" class="hidden-xs">+ <td data-value="{{ (line.getMax - line.getAmount) }}" class="text-right hidden-xs">{% if line.isHit %}{{ formatAmountByCurrency(line.getCurrency, (line.getMax + line.getAmount)) }}{% endif %}diff --git a/resources/views/reports/partials/budget-period.twig b/resources/views/reports/partials/budget-period.twigindex bf672d0ab7..35a41f6ab1 100644--- a/resources/views/reports/partials/budget-period.twig+++ b/resources/views/reports/partials/budget-period.twig@@ -3,10 +3,10 @@<tr><th data-defaultsign="az" colspan="2">{{ 'budget'|_ }}</th>{% for period in periods %}- <th data-defaultsign="_19" style="text-align: right;">{{ period }}</th>+ <th data-defaultsign="_19" class="text-right">{{ period }}</th>{% endfor %}- <th data-defaultsign="_19" style="text-align: right;">{{ 'average'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'sum'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'average'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'sum'|_ }}</th></tr></thead><tbody>@@ -24,20 +24,20 @@</td>{% for key, period in periods %}{% if(info.entries[key]) %}- <td data-value="{{ info.entries[key] }}" style="text-align: right;">+ <td data-value="{{ info.entries[key] }}" class="text-right">{{ formatAmountBySymbol(info.entries[key], info.currency_symbol, info.currency_decimal_places) }}</td>{% else %}- <td data-value="0" style="text-align: right;">+ <td data-value="0" class="text-right">{{ formatAmountBySymbol(0, info.currency_symbol, info.currency_decimal_places) }}</td>{% endif %}{% endfor %}- <td data-value="{{ info.avg }}" style="text-align: right;">+ <td data-value="{{ info.avg }}" class="text-right">{{ formatAmountBySymbol(info.avg, info.currency_symbol, info.currency_decimal_places) }}</td>- <td data-value="{{ info.sum }}" style="text-align: right;">+ <td data-value="{{ info.sum }}" class="text-right">{{ formatAmountBySymbol(info.sum, info.currency_symbol, info.currency_decimal_places) }}</td></tr>diff --git a/resources/views/reports/partials/budgets.twig b/resources/views/reports/partials/budgets.twigindex 86f393cdb2..9225e6db2b 100644--- a/resources/views/reports/partials/budgets.twig+++ b/resources/views/reports/partials/budgets.twig@@ -3,13 +3,13 @@<tr><th data-defaultsign="az">{{ 'budget'|_ }}</th><th data-defaultsign="month" class="hidden-xs">{{ 'date'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;" class="hidden-xs">{{ 'budgeted'|_ }}</th>+ <th data-defaultsign="_19" class="text-right hidden-xs">{{ 'budgeted'|_ }}</th><th data-defaultsign="_19" class="hidden-xs">{{ trans('list.percentage') }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'spent'|_ }}</th><th data-defaultsign="_19" class="hidden-xs">{{ trans('list.percentage') }}</th><th data-defaultsort="disabled" class="hidden-xs"> </th>- <th data-defaultsign="_19" style="text-align: right;" class="hidden-xs">{{ 'left'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'overspent'|_ }}</th>+ <th data-defaultsign="_19" class="text-right hidden-xs">{{ 'left'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'overspent'|_ }}</th></tr></thead><tbody>@@ -37,7 +37,7 @@</td><!-- budgeted, hidden on mobile -->- <td data-value="{{ budget_limit.budgeted|default(0) }}" style="text-align: right;" class="hidden-xs">+ <td data-value="{{ budget_limit.budgeted|default(0) }}" class="text-right hidden-xs">{% if null != budget_limit.budgeted %}{{ formatAmountBySymbol(budget_limit.budgeted, budget_limit.currency_symbol, budget_limit.currency_decimal_places) }}{% endif %}@@ -49,7 +49,7 @@<!-- spent, visible on mobile -->- <td data-value="{{ budget_limit.spent|default(0) }}" style="text-align: right;">+ <td data-value="{{ budget_limit.spent|default(0) }}" class="text-right">{{ formatAmountBySymbol(budget_limit.spent, budget_limit.currency_symbol, budget_limit.currency_decimal_places) }}</td><!-- percentage, hidden -->@@ -67,13 +67,13 @@<!-- left, hidden on mobile -->- <td data-value="{{ budget_limit.left|default(0) }}" style="text-align: right;" class="hidden-xs">+ <td data-value="{{ budget_limit.left|default(0) }}" class="text-right hidden-xs">{% if null != budget_limit.left %}{{ formatAmountBySymbol(budget_limit.left, budget_limit.currency_symbol, budget_limit.currency_decimal_places) }}{% endif %}</td><!-- overspent, visible. -->- <td data-value="{{ budget_limit.overspent|default(0) }}" style="text-align: right;">+ <td data-value="{{ budget_limit.overspent|default(0) }}" class="text-right">{% if null != budget_limit.overspent %}{{ formatAmountBySymbol(budget_limit.overspent, budget_limit.currency_symbol, budget_limit.currency_decimal_places) }}{% endif %}@@ -86,13 +86,13 @@{% for sum in report.sums %}<tr><td colspan="2"><em>{{ 'sum'|_ }} ({{ sum.currency_name }})</em></td>- <td style="text-align: right;">{{ formatAmountBySymbol(sum.budgeted, sum.currency_symbol, sum.currency_decimal_places) }}</td>+ <td class="text-right">{{ formatAmountBySymbol(sum.budgeted, sum.currency_symbol, sum.currency_decimal_places) }}</td><td> </td>- <td style="text-align: right;">{{ formatAmountBySymbol(sum.spent, sum.currency_symbol, sum.currency_decimal_places) }}</td>+ <td class="text-right">{{ formatAmountBySymbol(sum.spent, sum.currency_symbol, sum.currency_decimal_places) }}</td><td> </td><td> </td>- <td style="text-align: right;">{{ formatAmountBySymbol(sum.left, sum.currency_symbol, sum.currency_decimal_places) }}</td>- <td style="text-align: right;">{{ formatAmountBySymbol(sum.overspent, sum.currency_symbol, sum.currency_decimal_places) }}</td>+ <td class="text-right">{{ formatAmountBySymbol(sum.left, sum.currency_symbol, sum.currency_decimal_places) }}</td>+ <td class="text-right">{{ formatAmountBySymbol(sum.overspent, sum.currency_symbol, sum.currency_decimal_places) }}</td></tr>{% endfor %}diff --git a/resources/views/reports/partials/categories.twig b/resources/views/reports/partials/categories.twigindex f45abde45d..acaef15723 100644--- a/resources/views/reports/partials/categories.twig+++ b/resources/views/reports/partials/categories.twig@@ -2,9 +2,9 @@<thead><tr><th data-defaultsign="az">{{ 'category'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'earned'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'sum'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'spent'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'earned'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'sum'|_ }}</th><th data-defaultsort="disabled"> </th></tr></thead>@@ -18,9 +18,9 @@<td data-value="{{ category.title }}"><a href="{{ route('categories.show', category.id) }}">{{ category.title }}</a></td>- <td data-value="{{ category.spent }}" style="text-align: right;">{{ formatAmountBySymbol(category.spent, category.currency_symbol, category.currency_decimal_places, true) }}</td>- <td data-value="{{ category.earned }}" style="text-align: right;">{{ formatAmountBySymbol(category.earned, category.currency_symbol, category.currency_decimal_places, true) }}</td>- <td data-value="{{ category.sum }}" style="text-align: right;">{{ formatAmountBySymbol(category.sum, category.currency_symbol, category.currency_decimal_places, true) }}</td>+ <td data-value="{{ category.spent }}" class="text-right">{{ formatAmountBySymbol(category.spent, category.currency_symbol, category.currency_decimal_places, true) }}</td>+ <td data-value="{{ category.earned }}" class="text-right">{{ formatAmountBySymbol(category.earned, category.currency_symbol, category.currency_decimal_places, true) }}</td>+ <td data-value="{{ category.sum }}" class="text-right">{{ formatAmountBySymbol(category.sum, category.currency_symbol, category.currency_decimal_places, true) }}</td><td style="width:20px;"><span class="fa fa-fw fa-info-circle text-muted firefly-info-button" data-location="category-entry" data-category-id="{{ category.id }}" data-currency-id="{{ category.currency_id }}"></span>@@ -39,13 +39,13 @@{% for sum in report.sums %}<tr><td><em>{{ 'sum'|_ }} ({{ sum.currency_name }})</em></td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.spent, sum.currency_symbol, sum.currency_decimal_places) }}</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.earned, sum.currency_symbol, sum.currency_decimal_places) }}</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }}</td></tr>diff --git a/resources/views/reports/partials/category-period.twig b/resources/views/reports/partials/category-period.twigindex 2660eed70b..0f86503ade 100644--- a/resources/views/reports/partials/category-period.twig+++ b/resources/views/reports/partials/category-period.twig@@ -3,9 +3,9 @@<tr><th data-defaultsign="az" colspan="2">{{ 'category'|_ }}</th>{% for period in periods %}- <th data-defaultsign="_19" style="text-align: right;">{{ period }}</th>+ <th data-defaultsign="_19" class="text-right">{{ period }}</th>{% endfor %}- <th data-defaultsign="_19" style="text-align: right;">{{ 'sum'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'sum'|_ }}</th></tr></thead><tbody>@@ -24,11 +24,11 @@{% for key, period in periods %}{# income first #}{% if(info.entries[key]) %}- <td data-value="{{ info.entries[key] }}" style="text-align: right;">+ <td data-value="{{ info.entries[key] }}" class="text-right">{{ formatAmountBySymbol(info.entries[key], info.currency_symbol, info.currency_decimal_places) }}</td>{% else %}- <td data-value="0" style="text-align: right;">+ <td data-value="0" class="text-right">{{ formatAmountBySymbol(0, info.currency_symbol, info.currency_decimal_places) }}</td>{% endif %}@@ -36,11 +36,11 @@{# if sum of income, display: #}{% if info.sum %}- <td data-value="{{ info.sum }}" style="text-align: right;">+ <td data-value="{{ info.sum }}" class="text-right">{{ formatAmountBySymbol(info.sum, info.currency_symbol, info.currency_decimal_places) }}</td>{% else %}- <td data-value="0" style="text-align: right;">+ <td data-value="0" class="text-right">{{ formatAmountBySymbol(0, info.currency_symbol, info.currency_decimal_places) }}</td>{% endif %}diff --git a/resources/views/reports/partials/income-expenses.twig b/resources/views/reports/partials/income-expenses.twigindex 0bb7c00961..8236914f60 100644--- a/resources/views/reports/partials/income-expenses.twig+++ b/resources/views/reports/partials/income-expenses.twig@@ -2,8 +2,8 @@<thead><tr><th data-defaultsign="az">{{ 'name'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'total'|_ }}</th>- <th data-defaultsign="_19" class="hidden-xs" style="text-align: right;">{{ 'average'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'total'|_ }}</th>+ <th data-defaultsign="_19" class="text-right hidden-xs">{{ 'average'|_ }}</th><th data-defaultsort="disabled"></th></tr></thead>@@ -23,10 +23,10 @@</small>{% endif %}</td>- <td data-value="{{ account.sum }}" style="text-align: right;">+ <td data-value="{{ account.sum }}" class="text-right">{{ formatAmountBySymbol(account.sum, account.currency_symbol, account.currency_decimal_places) }}</td>- <td class="hidden-xs" data-value="{{ account.average }}" style="text-align: right;">+ <td class="text-right hidden-xs" data-value="{{ account.average }}">{% if account.count > 1 %}{{ formatAmountBySymbol(account.average, account.currency_symbol, account.currency_decimal_places) }}{% else %}@@ -52,7 +52,7 @@{% for sum in report.sums %}<tr><td><em>{{ 'sum'|_ }} ({{ sum.currency_name }})</em></td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }}</td><td> </td>diff --git a/resources/views/reports/partials/journals-audit.twig b/resources/views/reports/partials/journals-audit.twigindex 5eb2f71b74..6c7e8695c5 100644--- a/resources/views/reports/partials/journals-audit.twig+++ b/resources/views/reports/partials/journals-audit.twig@@ -5,9 +5,9 @@<th class="hide-icon"> </th><th class="hide-description">{{ trans('list.description') }}</th>- <th class="hide-balance_before" style="text-align: right;">{{ trans('list.balance_before') }}</th>- <th class="hide-amount" style="text-align: right;">{{ trans('list.amount') }}</th>- <th class="hide-balance_after" style="text-align: right;">{{ trans('list.balance_after') }}</th>+ <th class="text-right hide-balance_before">{{ trans('list.balance_before') }}</th>+ <th class="text-right hide-amount">{{ trans('list.amount') }}</th>+ <th class="text-right hide-balance_after">{{ trans('list.balance_after') }}</th><th class="hide-date">{{ trans('list.date') }}</th>{# new optional fields (3x) #}@@ -78,10 +78,10 @@</a></td>- <td class="hide-balance_before" style="text-align: right;">+ <td class="text-right hide-balance_before">{{ formatAmountBySymbol(journal.balance_before, auditData[account.id].currency.symbol, auditData[account.id].currency.decimal_places) }}</td>- <td class="hide-amount" style="text-align: right;">+ <td class="text-right hide-amount">{% if auditData[account.id].currency.id == journal.currency_id %}{% if account.id == journal.destination_account_id and journal.transaction_type_type == 'Opening balance' %}@@ -109,7 +109,7 @@</td>- <td class="hide-balance_after" style="text-align: right;">+ <td class="text-right hide-balance_after">{{ formatAmountBySymbol(journal.balance_after, auditData[account.id].currency.symbol, auditData[account.id].currency.decimal_places) }}</td>diff --git a/resources/views/reports/partials/top-transactions.twig b/resources/views/reports/partials/top-transactions.twigindex 8d0a835be0..a28bd8bfac 100644--- a/resources/views/reports/partials/top-transactions.twig+++ b/resources/views/reports/partials/top-transactions.twig@@ -18,7 +18,7 @@{{ transaction.date.isoFormat(monthAndDayFormat) }}</td><!-- TODO i dont think transactionAmount will work. -->- <td style="text-align: right;" data-value="{{ transaction.amount}}"><span+ <td class="text-right" data-value="{{ transaction.amount}}"><spanstyle="margin-right:5px;">{{ formatAmountBySymbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}diff --git a/resources/views/reports/tag/month.twig b/resources/views/reports/tag/month.twigindex b906a0c6ed..a296dab4fc 100644--- a/resources/views/reports/tag/month.twig+++ b/resources/views/reports/tag/month.twig@@ -56,8 +56,8 @@<h3 class="box-title">{{ 'expense_per_tag'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="tag-out-pie-chart" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="tag-out-pie-chart" class="medium-chart" height="250"></canvas></div></div></div>@@ -68,8 +68,8 @@<h3 class="box-title">{{ 'income_per_tag'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="tag-in-pie-chart" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="tag-in-pie-chart" class="medium-chart" height="250"></canvas></div></div></div>@@ -82,8 +82,8 @@<h3 class="box-title">{{ 'expense_per_category'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="category-out-pie-chart" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="category-out-pie-chart" class="medium-chart" height="250"></canvas></div></div></div>@@ -94,8 +94,8 @@<h3 class="box-title">{{ 'income_per_category'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="category-in-pie-chart" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="category-in-pie-chart" class="medium-chart" height="250"></canvas></div></div></div>@@ -106,8 +106,8 @@<h3 class="box-title">{{ 'expense_per_budget'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="budgets-out-pie-chart" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="budgets-out-pie-chart" class="medium-chart" height="250"></canvas></div></div></div>@@ -120,8 +120,8 @@<h3 class="box-title">{{ 'expense_per_source_account'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="source-out-pie-chart" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="source-out-pie-chart" class="medium-chart" height="250"></canvas></div></div></div>@@ -132,8 +132,8 @@<h3 class="box-title">{{ 'income_per_source_account'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="source-in-pie-chart" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="source-in-pie-chart" class="medium-chart" height="250"></canvas></div></div></div>@@ -146,8 +146,8 @@<h3 class="box-title">{{ 'expense_per_destination_account'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="dest-out-pie-chart" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="dest-out-pie-chart" class="medium-chart" height="250"></canvas></div></div></div>@@ -158,8 +158,8 @@<h3 class="box-title">{{ 'income_per_destination_account'|_ }}</h3></div><div class="box-body">- <div style="width:100%;margin:0 auto;">- <canvas id="dest-in-pie-chart" style="width:100%;height:250px;" height="250"></canvas>+ <div class="center-chart">+ <canvas id="dest-in-pie-chart" class="medium-chart" height="250"></canvas></div></div></div>diff --git a/resources/views/reports/tag/partials/account-per-tag.twig b/resources/views/reports/tag/partials/account-per-tag.twigindex 871cf05d71..26fa65d6f1 100644--- a/resources/views/reports/tag/partials/account-per-tag.twig+++ b/resources/views/reports/tag/partials/account-per-tag.twig@@ -3,7 +3,7 @@<tr><th data-defaultsign="az">{{ 'name'|_ }}</th>{% for tag in tags %}- <th data-defaultsign="_19" style="text-align: right;">{{ tag.tag }}</th>+ <th data-defaultsign="_19" class="text-right">{{ tag.tag }}</th>{% endfor %}</tr></thead>@@ -15,7 +15,7 @@<a href="{{ route('accounts.show', account.id) }}" title="{{ account.iban }}">{{ account.name }} ({{ currency.currency_name }})</a></td>{% for tag in tags %}- <td style="text-align: right;">+ <td class="text-right">{% if currency.tags[tag.id] %}<span title="{{ 'earned'|_ }}: {{ formatAmountBySymbol(currency.tags[tag.id].earned, currency.currency_symbol, currency.currency_decimal_places, false) }}, {{ 'spent'|_ }}: {{ formatAmountBySymbol(currency.tags[tag.id].spent, currency.currency_symbol, currency.currency_decimal_places, false) }}"{{ formatAmountBySymbol(currency.tags[tag.id].sum, currency.currency_symbol, currency.currency_decimal_places) }}diff --git a/resources/views/reports/tag/partials/accounts.twig b/resources/views/reports/tag/partials/accounts.twigindex 4e9ce9e9a2..c493e6c549 100644--- a/resources/views/reports/tag/partials/accounts.twig+++ b/resources/views/reports/tag/partials/accounts.twig@@ -2,9 +2,9 @@<thead><tr><th data-defaultsign="az">{{ 'name'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'earned'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'sum'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'spent'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'earned'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'sum'|_ }}</th></tr></thead><tbody>@@ -14,13 +14,13 @@<td data-value="{{ account.name }} ({{ currency.currency_name }})"><a href="{{ route('accounts.show', account.id) }}" title="{{ account.iban }}">{{ account.name }} ({{ currency.currency_name }})</a></td>- <td data-value="{{ currency.spent }}" style="text-align: right;">+ <td data-value="{{ currency.spent }}" class="text-right">{{ formatAmountBySymbol(currency.spent, currency.currency_symbol, currency.currency_decimal_places) }}</td>- <td data-value="{{ currency.earned }}" style="text-align: right;">+ <td data-value="{{ currency.earned }}" class="text-right">{{ formatAmountBySymbol(currency.earned, currency.currency_symbol, currency.currency_decimal_places) }}</td>- <td data-value="{{ currency.sum }}" style="text-align: right;">+ <td data-value="{{ currency.sum }}" class="text-right">{{ formatAmountBySymbol(currency.sum, currency.currency_symbol, currency.currency_decimal_places) }}</td></tr>@@ -31,13 +31,13 @@{% for sum in sums %}<tr><td>{{ 'sum'|_ }} ({{ sum.currency_name }})</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.spent_sum, sum.currency_symbol, sum.currency_decimal_places) }}</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.earned_sum, sum.currency_symbol, sum.currency_decimal_places) }}</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.total_sum, sum.currency_symbol, sum.currency_decimal_places) }}</td></tr>diff --git a/resources/views/reports/tag/partials/avg-expenses.twig b/resources/views/reports/tag/partials/avg-expenses.twigindex b34a2ecc63..69de2720e4 100644--- a/resources/views/reports/tag/partials/avg-expenses.twig+++ b/resources/views/reports/tag/partials/avg-expenses.twig@@ -2,8 +2,8 @@<thead><tr><th data-defaultsign="az">{{ 'account'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'spent_average'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'total'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'spent_average'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'total'|_ }}</th><th data-defaultsign="_19">{{ 'transaction_count'|_ }}</th></tr></thead>@@ -19,11 +19,11 @@{{ row.destination_account_name }}</a></td>- <td data-value="{{ row.avg }}" style="text-align: right;">+ <td data-value="{{ row.avg }}" class="text-right">{{ formatAmountBySymbol(row.avg, row.currency_symbol, row.currency_decimal_places) }}</td>- <td data-value="{{ row.sum }}" style="text-align: right;">+ <td data-value="{{ row.sum }}" class="text-right">{{ formatAmountBySymbol(row.sum, row.currency_symbol, row.currency_decimal_places) }}</td>diff --git a/resources/views/reports/tag/partials/avg-income.twig b/resources/views/reports/tag/partials/avg-income.twigindex b859f13a09..e54986d557 100644--- a/resources/views/reports/tag/partials/avg-income.twig+++ b/resources/views/reports/tag/partials/avg-income.twig@@ -2,8 +2,8 @@<thead><tr><th data-defaultsign="az">{{ 'account'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'spent_average'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'total'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'spent_average'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'total'|_ }}</th><th data-defaultsign="_19">{{ 'transaction_count'|_ }}</th></tr></thead>@@ -19,11 +19,11 @@{{ row.source_account_name }}</a></td>- <td data-value="{{ row.avg }}" style="text-align: right;">+ <td data-value="{{ row.avg }}" class="text-right">{{ formatAmountBySymbol(row.avg, row.currency_symbol, row.currency_decimal_places) }}</td>- <td data-value="{{ row.sum }}" style="text-align: right;">+ <td data-value="{{ row.sum }}" class="text-right">{{ formatAmountBySymbol(row.sum, row.currency_symbol, row.currency_decimal_places) }}</td>diff --git a/resources/views/reports/tag/partials/tags.twig b/resources/views/reports/tag/partials/tags.twigindex ed535d43ee..69c8b956ba 100644--- a/resources/views/reports/tag/partials/tags.twig+++ b/resources/views/reports/tag/partials/tags.twig@@ -2,9 +2,9 @@<thead><tr><th data-defaultsign="az">{{ 'name'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'spent'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'earned'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'sum'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'spent'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'earned'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'sum'|_ }}</th></tr></thead><tbody>@@ -14,9 +14,9 @@<td data-value="{{ tag.name }}"><a href="{{ route('tags.show', [tag.id]) }}" title="{{ tag.name }}">{{ tag.name }}</a></td>- <td style="text-align: right;">—</td>- <td style="text-align: right;">—</td>- <td style="text-align: right;">—</td>+ <td class="text-right">—</td>+ <td class="text-right">—</td>+ <td class="text-right">—</td></tr>{% endif %}{% for currency in tag.currencies %}@@ -24,13 +24,13 @@<td data-value="{{ tag.name }} ({{ currency.currency_name }})"><a href="{{ route('tags.show', [tag.id]) }}" title="{{ tag.name }}">{{ tag.name }} ({{ currency.currency_name }})</a></td>- <td data-value="{{ currency.spent }}" style="text-align: right;">+ <td data-value="{{ currency.spent }}" class="text-right">{{ formatAmountBySymbol(currency.spent, currency.currency_symbol, currency.currency_decimal_places) }}</td>- <td data-value="{{ currency.earned }}" style="text-align: right;">+ <td data-value="{{ currency.earned }}" class="text-right">{{ formatAmountBySymbol(currency.earned, currency.currency_symbol, currency.currency_decimal_places) }}</td>- <td data-value="{{ currency.sum }}" style="text-align: right;">+ <td data-value="{{ currency.sum }}" class="text-right">{{ formatAmountBySymbol(currency.sum, currency.currency_symbol, currency.currency_decimal_places) }}</td></tr>@@ -41,13 +41,13 @@{% for sum in sums %}<tr><td>{{ 'sum'|_ }} ({{ sum.currency_name }})</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.spent_sum, sum.currency_symbol, sum.currency_decimal_places) }}</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.earned_sum, sum.currency_symbol, sum.currency_decimal_places) }}</td>- <td style="text-align: right;">+ <td class="text-right">{{ formatAmountBySymbol(sum.total_sum, sum.currency_symbol, sum.currency_decimal_places) }}</td></tr>diff --git a/resources/views/reports/tag/partials/top-expenses.twig b/resources/views/reports/tag/partials/top-expenses.twigindex 1e88ec350b..afd849a71b 100644--- a/resources/views/reports/tag/partials/top-expenses.twig+++ b/resources/views/reports/tag/partials/top-expenses.twig@@ -5,7 +5,7 @@<th data-defaultsign="month">{{ 'date'|_ }}</th><th data-defaultsign="az">{{ 'account'|_ }}</th><th data-defaultsign="az">{{ 'tag'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'amount'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'amount'|_ }}</th></tr></thead><tbody>@@ -35,7 +35,7 @@</a></td>- <td data-value="{{ row.amount }}" style="text-align: right;">+ <td data-value="{{ row.amount }}" class="text-right">{{ formatAmountBySymbol(row.amount, row.currency_symbol, row.currency_decimal_places) }}</td>diff --git a/resources/views/reports/tag/partials/top-income.twig b/resources/views/reports/tag/partials/top-income.twigindex 12dc972911..4142553e48 100644--- a/resources/views/reports/tag/partials/top-income.twig+++ b/resources/views/reports/tag/partials/top-income.twig@@ -5,7 +5,7 @@<th data-defaultsign="month">{{ 'date'|_ }}</th><th data-defaultsign="az">{{ 'account'|_ }}</th><th data-defaultsign="az">{{ 'tag'|_ }}</th>- <th data-defaultsign="_19" style="text-align: right;">{{ 'amount'|_ }}</th>+ <th data-defaultsign="_19" class="text-right">{{ 'amount'|_ }}</th></tr></thead><tbody>@@ -35,7 +35,7 @@</a></td>- <td data-value="{{ row.amount }}" style="text-align: right;">+ <td data-value="{{ row.amount }}" class="text-right">{{ formatAmountBySymbol(row.amount, row.currency_symbol, row.currency_decimal_places) }}</td>diff --git a/resources/views/tags/show.twig b/resources/views/tags/show.twigindex 98e5696b1d..e0fc62ad54 100644--- a/resources/views/tags/show.twig+++ b/resources/views/tags/show.twig@@ -195,7 +195,7 @@</div><div class="box-body">{% if(location) %}- <div id="location_map" style="width:100%;height:300px;"></div>+ <div id="location_map" class="map-size"></div>{% else %}<p>{{ 'no_location_set'|_ }}</p>{% endif %}diff --git a/resources/views/transactions/index.twig b/resources/views/transactions/index.twigindex 7f6017a33e..3b74516d2c 100644--- a/resources/views/transactions/index.twig+++ b/resources/views/transactions/index.twig@@ -26,7 +26,7 @@<h3 class="box-title">{{ 'categories'|_ }}</h3></div><div class="box-body">- <canvas id="category_chart" style="width:100%;height:250px;" height="250"></canvas>+ <canvas id="category_chart" class="medium-chart" height="250"></canvas></div></div></div>@@ -38,7 +38,7 @@<h3 class="box-title">{{ 'budgets'|_ }}</h3></div><div class="box-body">- <canvas id="budget_chart" style="width:100%;height:250px;" height="250"></canvas>+ <canvas id="budget_chart" class="medium-chart" height="250"></canvas></div></div></div>@@ -50,7 +50,7 @@<h3 class="box-title">{{ 'all_source_accounts'|_ }}</h3></div><div class="box-body">- <canvas id="source_chart" style="width:100%;height:250px;" height="250"></canvas>+ <canvas id="source_chart" class="medium-chart" height="250"></canvas></div></div></div>@@ -62,7 +62,7 @@<h3 class="box-title">{{ 'all_destination_accounts'|_ }}</h3></div><div class="box-body">- <canvas id="destination_chart" style="width:100%;height:250px;" height="250"></canvas>+ <canvas id="destination_chart" class="medium-chart" height="250"></canvas></div></div></div>diff --git a/resources/views/v2/partials/form/transaction/location.blade.php b/resources/views/v2/partials/form/transaction/location.blade.phpindex 6d76fd516a..159b9236e1 100644--- a/resources/views/v2/partials/form/transaction/location.blade.php+++ b/resources/views/v2/partials/form/transaction/location.blade.php@@ -14,7 +14,7 @@data-latitude="{{ $latitude }}"data-longitude="{{ $longitude }}"data-zoom-level="{{ $zoomLevel }}"- id="location_map" style="height:300px;" :data-index="index"></div>+ id="location_map" class="map-size" :data-index="index"></div><span class="muted small"><template x-if="!transaction.hasLocation"><span>{{ __('firefly.click_tap_location') }}</span>