Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Remove CSS and unused files.
James Coleac8dbbff6cc3
diff --git a/public/v1/css/firefly.css b/public/v1/css/firefly.cssindex 0708c582e4..53e101a3d3 100644--- a/public/v1/css/firefly.css+++ b/public/v1/css/firefly.css@@ -46,9 +46,11 @@.calendar-display {max-width: 400px;margin: 0 auto;}.empty-high-block {height:400px;}.fw-normal {font-weight: normal;}+.position-relative {position: relative;}/** tables **/th.ten {width:10%;}+th.fifteen td.fifteen {width:15%;}td.twenty th.twenty {width:25%;}td.onetwenty {width:120px;}td.quarter th.quarter {width:25%;}@@ -56,6 +58,11 @@ td.thirty th.thirty {width:30%;}td.third th.third {width:33%;}td.forty th.forty {width:40%;}td.half th.half {width:50%;}+td.sixty-six th.sixty-six {width:66%;}+td.twenty-px {width:20px;}+td.forty-px {width:40px;}+td.sixty-px {width:60px;}+td.hundred-px {width:100px;}/** width for progress bar **/.width-0 {width:0;}diff --git a/resources/views/list/accounts.twig b/resources/views/list/accounts.twigindex d301584fe4..f7af6c1962 100644--- a/resources/views/list/accounts.twig+++ b/resources/views/list/accounts.twig@@ -28,7 +28,7 @@{% if objectType != 'liabilities' %}<th class="hidden-sm hidden-xs hidden-md">{{ trans('list.lastActivity') }}</th>{% endif %}- <th style="width:15%;"+ <th class="fifteen"class="hidden-sm hidden-xs hidden-md">{{ trans('list.balanceDiff') }}</th><th class="hidden-sm hidden-xs"> </th></tr>@@ -65,7 +65,7 @@<td class="hidden-sm hidden-xs">{{ account.iban }}{% if account.iban == '' %}{{ accountGetMetaField(account, 'account_number') }}{% endif %}</td>{% if objectType != 'liabilities' %}<td class="text-right">- <span style="margin-right:5px;">+ <span class="mr-2">{% for key, balance in account.endBalances %}<span title="{{ key }}">{% if 'balance' == key %}@@ -114,7 +114,7 @@{% endif %}{% endif %}<td class="text-right hidden-sm hidden-xs hidden-md">- <span style="margin-right:5px;">+ <span class="mr-1">{% for key, balance in account.differences %}<span title="{{ key }}">{% if 'balance' == key or 'pc_balance' == key %}@@ -145,6 +145,6 @@{% endfor %}</tbody></table>-<div style="padding-left:8px;">+<div class="pl-3">{{ accounts.links('pagination.bootstrap-4')|raw }}</div>diff --git a/resources/views/list/categories.twig b/resources/views/list/categories.twigindex 81686e662d..43b7c677e3 100644--- a/resources/views/list/categories.twig+++ b/resources/views/list/categories.twig@@ -1,4 +1,4 @@-<div style="padding-left:8px;">+<div class="pl-3">{{ categories.links('pagination.bootstrap-4')|raw }}</div><table class="table table-hover sortable">@@ -42,6 +42,6 @@{% endfor %}</tbody></table>-<div style="padding-left:8px;">+<div class="pl-3">{{ categories.links('pagination.bootstrap-4')|raw }}</div>diff --git a/resources/views/list/piggy-banks.twig b/resources/views/list/piggy-banks.twigindex 83354f6198..a46d59236b 100644--- a/resources/views/list/piggy-banks.twig+++ b/resources/views/list/piggy-banks.twig@@ -29,11 +29,11 @@<a href="{{ route('piggy-banks.add-money-mobile', piggy.id) }}" class="btn btn-default btn-xs"><span class="fa fa-plus"></span></a></div></td>- <td style="width:60px;" class="hidden-sm hidden-xs">+ <td class="hidden-sm hidden-xs sixty-px"><span class="fa fa-fw fa-bars piggy-handle"></span><span class="loadSpin"></span></td>- <td style="width:100px;" class="hidden-sm hidden-xs">+ <td class="hidden-sm hidden-xs hundred-px"><div class="btn-group btn-group-xs"><a href="{{ route('piggy-banks.edit', piggy.id) }}" class="btn btn-default btn-xs"><span class="fa fa-pencil fa-fw"></span></a><a href="{{ route('piggy-banks.delete', piggy.id) }}" class="btn btn-danger btn-xs"><span class="fa fa-trash fa-fw"></span></a>@@ -53,7 +53,7 @@{% endif %}</span></td>- <td class="hidden-sm hidden-xs text-right" style="width:40px;">+ <td class="hidden-sm hidden-xs text-right forty-px">{% 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>@@ -62,17 +62,16 @@<td class="hidden-sm hidden-xs piggyBar">{% if null != piggy.percentage %}- <div class="progress progress" style="margin-bottom:0;">+ <div class="progress progress mb-0"><div{% if piggy.percentage == 100 %}- class="progress-bar progress-bar-success"+ class="progress-bar progress-bar-success width-{{ max(30, piggy.percentage)|round }}"{% elseif piggy.percentage == 0 %}- class="progress-bar progress-bar-warning"+ class="progress-bar progress-bar-warning width-{{ max(30, piggy.percentage)|round }}"{% else %}- class="progress-bar progress-bar-info"+ class="progress-bar progress-bar-info width-{{ max(30, piggy.percentage)|round }}"{% endif %}- role="progressbar" aria-valuenow="{{ piggy.percentage }}" aria-valuemin="0" aria-valuemax="100"- style="min-width: 30px;width: {{ piggy.percentage }}%;">+ role="progressbar" aria-valuenow="{{ piggy.percentage }}" aria-valuemin="0" aria-valuemax="100">{{ piggy.percentage }}%</div></div>@@ -80,7 +79,7 @@</td>- <td class="hidden-sm hidden-xs" style="width:40px;">+ <td class="hidden-sm hidden-xs forty-px">{% if piggy.left_to_save > 0 or null == piggy.left_to_save %}<a href="{{ route('piggy-banks.add-money', piggy.id) }}" class="btn btn-default btn-xs addMoney" data-id="{{ piggy.id }}">diff --git a/resources/views/reports/partials/categories.twig b/resources/views/reports/partials/categories.twigindex acaef15723..1aa3a99044 100644--- a/resources/views/reports/partials/categories.twig+++ b/resources/views/reports/partials/categories.twig@@ -21,7 +21,7 @@<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;">+ <td class="twenty-px"><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></td>diff --git a/resources/views/reports/partials/exp-budgets.twig b/resources/views/reports/partials/exp-budgets.twigindex d1cc577e1d..4467ed77b4 100644--- a/resources/views/reports/partials/exp-budgets.twig+++ b/resources/views/reports/partials/exp-budgets.twig@@ -1,8 +1,8 @@<table class="table table-hover sortable"><thead><tr>- <th style="width:66%;" data-defaultsign="az" data-defaultsort="asc">{{ 'category'|_ }}</th>- <th style="width:34%;" data-defaultsign="_19">{{ 'spent'|_ }}</th>+ <th class="sixty-six" data-defaultsign="az" data-defaultsort="asc">{{ 'category'|_ }}</th>+ <th class="third" data-defaultsign="_19">{{ 'spent'|_ }}</th></tr></thead><tbody>diff --git a/resources/views/reports/partials/exp-categories.twig b/resources/views/reports/partials/exp-categories.twigindex bfa38f242b..c3078206b0 100644--- a/resources/views/reports/partials/exp-categories.twig+++ b/resources/views/reports/partials/exp-categories.twig@@ -1,9 +1,9 @@<table class="table table-hover sortable"><thead><tr>- <th style="width:50%;" data-defaultsign="az" data-defaultsort="asc">{{ 'category'|_ }}</th>- <th style="width:25%;" data-defaultsign="_19">{{ 'spent'|_ }}</th>- <th style="width:25%;" data-defaultsign="_19">{{ 'earned'|_ }}</th>+ <th class="half" data-defaultsign="az" data-defaultsort="asc">{{ 'category'|_ }}</th>+ <th class="quarter" data-defaultsign="_19">{{ 'spent'|_ }}</th>+ <th class="quarter" data-defaultsign="_19">{{ 'earned'|_ }}</th></tr></thead><tbody>diff --git a/resources/views/reports/partials/exp-not-grouped.twig b/resources/views/reports/partials/exp-not-grouped.twigindex ec26868ce6..c7a8899983 100644--- a/resources/views/reports/partials/exp-not-grouped.twig+++ b/resources/views/reports/partials/exp-not-grouped.twig@@ -1,9 +1,9 @@<table class="table table-hover sortable"><thead><tr>- <th style="width:50%;" data-defaultsign="az">{{ 'name'|_ }}</th>- <th style="width:25%;" class="hidden-xs" data-defaultsign="_19">{{ 'spent'|_ }}</th>- <th style="width:25%;" class="hidden-xs" data-defaultsign="_19">{{ 'earned'|_ }}</th>+ <th class="half" data-defaultsign="az">{{ 'name'|_ }}</th>+ <th class="quarter" class="hidden-xs" data-defaultsign="_19">{{ 'spent'|_ }}</th>+ <th class="quarter" class="hidden-xs" data-defaultsign="_19">{{ 'earned'|_ }}</th></tr></thead><tbody>diff --git a/resources/views/reports/partials/tags.twig b/resources/views/reports/partials/tags.twigdeleted file mode 100644index 7a4bc259c2..0000000000--- a/resources/views/reports/partials/tags.twig+++ /dev/null@@ -1,23 +0,0 @@-{% if tags|length > 0 %}- <div class="box">- <div class="box-header with-border">- <h3 class="box-title">{{ 'tags'|_ }}</h3>- </div>- <div class="box-body">-- {% if tags|length == 1 %}- {% set multiplier = 12 %}- {% else %}- {% set multiplier = 30 %}- {% endif %}-- {% for tag in tags %}- <span title="{{ tag.amount|formatAmountPlain }}"- style="font-size: {{ tag.fontsize * multiplier }}px"-- > <a href="{{ route('tags.show', tag.id) }}">{{ tag.tag }}</a> </span>- {% endfor %}- </div>- </div>--{% endif %}diff --git a/resources/views/transactions/index.twig b/resources/views/transactions/index.twigindex 3b74516d2c..23ea2c8e83 100644--- a/resources/views/transactions/index.twig+++ b/resources/views/transactions/index.twig@@ -77,7 +77,7 @@<h3 class="box-title">{{ subTitle }}</h3></div><div class="box-body no-padding">- <div style="padding:8px;">+ <div class="p-2"><a href="{{ route('transactions.create', [objectType]) }}" class="btn btn-success"><span class="fa fa-plus fa-fw"></span> {{ 'create_new_transaction'|_ }}</a></div>{# actual list #}diff --git a/resources/views/transactions/mass/edit.twig b/resources/views/transactions/mass/edit.twigindex f5bbb6fb20..47b7f943da 100644--- a/resources/views/transactions/mass/edit.twig+++ b/resources/views/transactions/mass/edit.twig@@ -97,7 +97,7 @@<!-- {{ journal.transaction_type_type }} --><!-- Source: {{ journal.source_account_name }} ({{ journal.source_account_id }}) --><!-- Destination: {{ journal.destination_account_name }} ({{ journal.destination_account_id }}) -->- <td style="position: relative;">+ <td class="position-relative">{% if journal.reconciled == true %}<a href="{{ route('accounts.show', [journal.source_account_id]) }}">{{ journal.source_account_name }}</a>{% endif %}@@ -122,7 +122,7 @@{% endif %}{% endif %}</td>- <td style="position: relative;">+ <td class="position-relative">{% if journal.reconciled == true %}<a href="{{ route('accounts.show', [journal.destination_account_id]) }}">{{ journal.destination_account_name }}</a>{% endif %}@@ -148,7 +148,7 @@{% endif %}</td>{# category #}- <td style="position: relative;">+ <td class="position-relative"><input class="form-control input-sm" placeholder="{{ journal.category_name }}" autocomplete="off" spellcheck="false"name="category[{{ journal.transaction_journal_id }}]" type="text" value="{{ journal.category_name }}"></td>