IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-08-18 17:04:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove and replace inline styles.

Browse Source
This commit is contained in:
James Cole
2026-03-14 06:16:53 +01:00
parent 654f2ee489
commit fea89c5231
19 changed files with 59 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/v1/css/firefly.css
+13
View File
@@ -35,9 +35,22 @@
/* install box border */
.install-box-border {border:1px #ddd solid;}
.install-box-title {font-family: monospace;font-size:16pt;}
/* some borders and lines */
.top-light-border {border-top:1px #aaa solid;}
.top-dark-border {border-top:1px #777 solid;}
.bottom-light-border {border-bottom:1px #aaa solid;}
/* misc */
.calendar-display {max-width: 400px;margin: 0 auto;}
.empty-high-block {height:400px;}
.fw-normal {font-weight: normal;}
/** tables **/
th.ten {width:10%;}
td.twenty th.twenty {width:25%;}
td.onetwenty {width:120px;}
td.quarter th.quarter {width:25%;}
td.thirty th.thirty {width:30%;}
td.third th.third {width:33%;}
resources/views/layout/default.twig
+1 -1
View File
@@ -290,7 +290,7 @@
</script>
<noscript><p><img
src="//{{ config('firefly.tracker_url') }}/matomo.php?idsite={{ config('firefly.tracker_site_id') }}&amp;rec=1"
style="border:0;" alt=""/></p></noscript>
class="no-border" alt=""/></p></noscript>
{% endif %}
<form id="logout-form" action="{{ route('logout') }}" method="POST" class="hidden">
resources/views/layout/empty.twig
+1 -1
View File
@@ -84,7 +84,7 @@
s.parentNode.insertBefore(g, s);
})();
</script>
<noscript><p><img src="//{{ config('firefly.tracker_url') }}/matomo.php?idsite={{ config('firefly.tracker_site_id') }}&amp;rec=1" style="border:0;" alt=""/></p></noscript>
<noscript><p><img src="//{{ config('firefly.tracker_url') }}/matomo.php?idsite={{ config('firefly.tracker_site_id') }}&amp;rec=1" class="no-border" alt=""/></p></noscript>
{% endif %}
</body>
resources/views/layout/guest.twig
+1 -1
View File
@@ -98,7 +98,7 @@
s.parentNode.insertBefore(g, s);
})();
</script>
<noscript><p><img src="//{{ config('firefly.tracker_url') }}/matomo.php?idsite={{ config('firefly.tracker_site_id') }}&amp;rec=1" style="border:0;" alt=""/></p></noscript>
<noscript><p><img src="//{{ config('firefly.tracker_url') }}/matomo.php?idsite={{ config('firefly.tracker_site_id') }}&amp;rec=1" class="no-border" alt=""/></p></noscript>
{% endif %}
</body>
resources/views/layout/install.twig
+2 -2
View File
@@ -26,7 +26,7 @@
<div class="login-box">
<div class="login-logo">
<strong>Firefly</strong>III<br/>
<span style="font-family: monospace;font-size:16pt;">installation and upgrade</span>
<span class="install-box-title">installation and upgrade</span>
</div>
{% block content %}{% endblock %}
</div>
@@ -57,7 +57,7 @@
s.parentNode.insertBefore(g, s);
})();
</script>
<noscript><p><img src="//{{ config('firefly.tracker_url') }}/matomo.php?idsite={{ config('firefly.tracker_site_id') }}&amp;rec=1" style="border:0;" alt=""/></p></noscript>
<noscript><p><img src="//{{ config('firefly.tracker_url') }}/matomo.php?idsite={{ config('firefly.tracker_site_id') }}&amp;rec=1" class="no-border" alt=""/></p></noscript>
{% endif %}
</body>
resources/views/list/ale.twig
+2 -2
View File
@@ -7,7 +7,7 @@
<tbody>
{% for logEntry in logEntries %}
<tr>
<th style="width:20%;" scope="row">
<th class="twenty" scope="row">
{# link to object: #}
{% if 'FireflyIII\\Models\\Rule' == logEntry.changer_type %}
<a href="{{ route('rules.edit', [logEntry.changer_id] ) }}">
@@ -18,7 +18,7 @@
{{ logEntry.changer_type|replace({"FireflyIII\\Models\\": ""})|replace({"FireflyIII\\": ""}) }} #{{ logEntry.changer_id }}
</a>
</th>
<td style="width:30%;" title="{{ logEntry.created_at.isoFormat(dateTimeFormat) }}">
<td class="thirty" title="{{ logEntry.created_at.isoFormat(dateTimeFormat) }}">
{{ trans('firefly.ale_action_'~logEntry.action) }}
</td>
<td>
resources/views/list/attachments.twig
+1 -1
View File
@@ -1,7 +1,7 @@
<table class="table table-responsive table-hover">
{% for attachment in attachments %}
<tr>
<td style="width:120px;">
<td class="onetwenty">
<div class="btn-group btn-group-xs">
<a href="{{ route('attachments.edit', attachment.id) }}" class="btn btn-default"><span
class="fa fa-pencil"></span></a>
resources/views/list/bills.twig
+4 -6
View File
@@ -1,4 +1,4 @@
<div style="padding-left:8px;">
<div class="pl-2">
{{ paginator.links('pagination.bootstrap-4')|raw }}
</div>
<table class="table table-responsive table-hover" id="bill-sortable">
@@ -63,9 +63,7 @@
{% endif %}
</td>
<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 }}"
>
<span class="mr-2" 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 }}">
~ {{ formatAmountBySymbol((entry.amount_max + entry.amount_min)/2, entry.currency_symbol, entry.currency_decimal_places) }}
{% if '0' != entry.pc_amount_max and null != entry.pc_amount_max %}
@@ -227,7 +225,7 @@
{% if totals|length > 0 %}
<tfoot>
<tr>
<td colspan="8" style="border-top:1px #777 solid;"></td>
<td colspan="8" class="top-dark-border"></td>
</tr>
{% for sum in totals %}
{% if '0' != sum.avg %}
@@ -266,6 +264,6 @@
{% endif %}
</table>
<div style="padding-left:8px;">
<div class="pl-2">
{{ paginator.links('pagination.bootstrap-4')|raw }}
</div>
resources/views/list/groups.twig
+21 -21
View File
@@ -52,14 +52,14 @@
<tbody>
{% for group in groups %}
{% if group.count > 1 %}
<tr style="border-top:1px #aaa solid;">
<td colspan="2" style="border-top:1px #aaa solid;">
<tr class="top-light-border">
<td colspan="2" class="top-light-border">
<small><strong>
<a href="{{ route('transactions.show', [group.id]) }}"
title="{{ group.title }}">{{ group.title }}</a>
</strong></small>
</td>
<td colspan="1" class="text-right" style="border-top:1px #aaa solid;">
<td colspan="1" class="text-right top-light-border">
{% for sum in group.sums %}
{% if group.transaction_type == 'Deposit' %}
{{ formatAmountBySymbol(sum.amount*-1, sum.currency_symbol, sum.currency_decimal_places) }}
@@ -87,11 +87,11 @@
</td>
<!-- column to span accounts + extra fields -->
{% if showCategory or showBudget %}
<td style="border-top:1px #aaa solid;" colspan="3">&nbsp;</td>
<td class="top-light-border" colspan="3">&nbsp;</td>
{% else %}
<td style="border-top:1px #aaa solid;" colspan="2">&nbsp;</td>
<td class="top-light-border" colspan="2">&nbsp;</td>
{% endif %}
<td style="border-top:1px #aaa solid;" colspan="2" class="hidden-xs">
<td class="top-light-border hidden-xs" colspan="2">
<div class="btn-group btn-group-xs pull-right">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
@@ -108,17 +108,17 @@
</ul>
</div>
</td>
<td style="border-top:1px #aaa solid;" class="hidden-xs">&nbsp;</td>
<td class="top-light-border hidden-xs">&nbsp;</td>
</tr>
{% endif %}
{% for index, transaction in group.transactions %}
{% set style="" %}
{% set className="" %}
{% if group.transactions|length == loop.index and group.count > 1 %}
{% set style="border-bottom:1px #aaa solid;" %}
{% set className="bottom-light-border" %}
{% endif %}
<tr data-date="{{ transaction.date.format('Y-m-d') }}" data-count="{{ group.count }}"
data-id="{{ group.id }}">
<td style=" {{ style|raw }}" class="hidden-xs">
<td class="hidden-xs {{ className }}">
{% if transaction.transaction_type_type == 'Withdrawal' %}
<span class="fa fa-long-arrow-left fa-fw"
title="{{ trans('firefly.Withdrawal') }}"></span>
@@ -147,7 +147,7 @@
{% endif %}
</td>
<td style=" {{ style|raw }}">
<td class="{{ className }}">
{% if transaction.reconciled %}
<span class="fa fa-check"></span>
{% endif %}
@@ -162,7 +162,7 @@
</a>
{% endif %}
</td>
<td style="{{ style|raw }};" class="text-right">
<td class="{{ className }} text-right">
{# deposit #}
{% if transaction.transaction_type_type == 'Deposit' %}
@@ -275,7 +275,7 @@
{% endif %}
</td>
{% if (fireflyiiiconfig('use_running_balance', true)) %}
<td style="{{ style|raw }};text-align:right">
<td class=" {{ className }} text-right">
{# RUNNING BALANCE #}
{% if (null == transaction.balance_dirty or false == transaction.balance_dirty) and null != transaction.destination_balance_after and null != transaction.source_balance_after %}
{% if transaction.transaction_type_type == 'Deposit' %}
@@ -335,10 +335,10 @@
{% endif %}
</td>
{% endif %}
<td style=" {{ style|raw }}">
<td class="{{ className }}">
{{ transaction.date.isoFormat(monthAndDayFormat) }}
</td>
<td style=" {{ style|raw }}">
<td class="{{ className }}">
{% if 'Cash account' == transaction.source_account_type %}
<span class="text-success">({{ 'cash'|_ }})</span>
{% else %}
@@ -346,7 +346,7 @@
title="{{ transaction.source_account_iban|default(transaction.source_account_name) }}">{{ transaction.source_account_name }}</a>
{% endif %}
</td>
<td style=" {{ style|raw }}">
<td class="{{ className }}">
{% if 'Cash account' == transaction.destination_account_type %}
<span class="text-success">({{ 'cash'|_ }})</span>
{% else %}
@@ -355,7 +355,7 @@
{% endif %}
</td>
{% if showCategory %}
<td style=" {{ style|raw }}" class="hidden-xs">
<td class="hidden-xs {{ className }}">
{% if transaction.category_id %}
<a href="{{ route('categories.show', [transaction.category_id]) }}"
title="{{ transaction.category_name }}">{{ transaction.category_name }}</a>
@@ -363,7 +363,7 @@
</td>
{% endif %}
{% if showBudget %}
<td style=" {{ style|raw }}" class="hidden-xs">
<td class="hidden-xs {{ className }}">
{% if transaction.budget_id %}
<a href="{{ route('budgets.show', [transaction.budget_id]) }}"
title="{{ transaction.budget_name }}">{{ transaction.budget_name }}</a>
@@ -372,7 +372,7 @@
{% endif %}
{% if group.count == 1 %}
<td style=" {{ style|raw }};" class="hidden-xs">
<td class="hidden-xs {{ className }}">
<div class="btn-group btn-group-xs pull-right">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
@@ -400,11 +400,11 @@
{% endif %}
{% if group.count != 1 %}
<td style=" {{ style|raw }};" class="hidden-xs">
<td class="hidden-xs {{ className }}">
&nbsp;
</td>
{% endif %}
<td style="{{ style|raw }}" class="hidden-xs">
<td class="hidden-xs {{ className }}">
{% if transaction.transaction_type_type != 'Reconciliation' and transaction.transaction_type_type != 'Opening balance' and transaction.transaction_type_type != 'Liability credit' %}
<div class="pull-right">
<input id="list_{{ transaction.transaction_journal_id }}"
resources/views/partials/empty.twig
+1 -1
View File
@@ -13,7 +13,7 @@
{{ ('no_'~type~'_imperative_'~objectType)|_ }}
</p>
<p style="text-align: center;">
<p class="text-center">
<a class="btn btn-lg btn-success" href="{{ route }}">{{ ('no_'~type~'_create_'~objectType)|_ }}</a>
</p>
</div>
resources/views/partials/journal-row.twig
-1
View File
@@ -1 +0,0 @@
<h1 style="color:red;">REPLACE ME</h1>
resources/views/partials/transaction-row.twig
-1
View File
@@ -1 +0,0 @@
<h1 style="color:red;">REPLACE ME</h1>
resources/views/piggy-banks/index.twig
+1 -1
View File
@@ -15,7 +15,7 @@
<h3 class="box-title">{{ 'piggyBanks'|_ }}</h3>
</div>
<div class="box-body no-padding">
<div style="padding:8px;">
<div class="p-2">
<a class="btn btn-success" href="{{ route('piggy-banks.create') }}"><span class="fa fa-plus fa-fw"></span> {{ 'create_new_piggy_bank'|_ }}</a>
</div>
{% include 'list/piggy-banks' %}
resources/views/recurring/create.twig
+1 -1
View File
@@ -192,7 +192,7 @@
<h4 class="modal-title">{{ 'recurring_calendar_view'|_ }}</h4>
</div>
<div class="modal-body">
<div id="recurring_calendar" style="max-width: 400px;margin: 0 auto;">
<div id="recurring_calendar" class="calendar-display">
</div>
resources/views/recurring/edit.twig
+1 -1
View File
@@ -191,7 +191,7 @@
<h4 class="modal-title">{{ 'recurring_calendar_view'|_ }}</h4>
</div>
<div class="modal-body">
<div id="recurring_calendar" style="max-width: 400px;margin: 0 auto;">
<div id="recurring_calendar" class="calendar-display">
</div>
resources/views/recurring/index.twig
+3 -3
View File
@@ -25,13 +25,13 @@
</div>
<div class="box-body no-padding">
<div style="padding:8px;">
<div class="p-2">
<a href="{{ route('recurring.create') }}" class="btn btn-success"><span class="fa fa-plus fa-fw"></span> {{ ('make_new_recurring')|_ }}
</a>
</div>
<!-- list of recurring here -->
<div style="padding-left:8px;">
<div class="pl-2">
{{ paginator.links('pagination.bootstrap-4')|raw }}
</div>
<table class="table table-responsive table-hover sortable">
@@ -141,7 +141,7 @@
{% endfor %}
</tbody>
</table>
<div style="padding-left:8px;">
<div class="pl-2">
{{ paginator.links('pagination.bootstrap-4')|raw }}
</div>
</div>
resources/views/reports/audit/report.twig
+4 -4
View File
@@ -17,8 +17,8 @@
{% for hide in hideable %}
<li><input
{% if hide in defaultShow %}checked{% endif %}
type="checkbox" class="audit-option-checkbox" name="option[]" value="{{ hide }}" id="option_{{ hide }}"/> <label
for="option_{{ hide }}" style="font-weight:normal;">{{ trans('list.'~hide) }}</label></li>
type="checkbox" class="fw-normal audit-option-checkbox" name="option[]" value="{{ hide }}" id="option_{{ hide }}"/> <label
for="option_{{ hide }}">{{ trans('list.'~hide) }}</label></li>
{% endfor %}
</ul>
@@ -52,7 +52,7 @@
</div>
{% else %}
<div class="box-body no-padding">
<p style="padding:10px;">
<p class="p-4">
{{ trans('firefly.audit_end_balance',
{
account_name: account.name|escape,
@@ -63,7 +63,7 @@
</p>
{% include 'reports.partials.journals-audit' with {'journals': auditData[account.id].journals,'account':account} %}
<p style="padding:10px;">
<p class="p-4">
{{ trans('firefly.audit_end_balance',
{
resources/views/reports/index.twig
+1 -1
View File
@@ -184,7 +184,7 @@
</div>
</div>
<div style="height:400px;">&nbsp;</div>
<div class="empty-high-block">&nbsp;</div>
{% endblock %}
resources/views/v2/errors/FireflyException.blade.php
+1 -1
View File
@@ -52,7 +52,7 @@
<h4>
{{ trans('errors.stacktrace') }}
</h4>
<div style="font-family: monospace;font-size:11px;">
<div class="monospace">
{!! nl2br($exception->getTraceAsString()) !!}
</div>
</div>