Skip to content

Firefly III: a personal finances manager

Remove styles.

James Colee504ee204ad1
diff --git a/app/Http/Middleware/SecureHeaders.php b/app/Http/Middleware/SecureHeaders.php
index db8c7b9b30..54f53370d1 100644
--- a/app/Http/Middleware/SecureHeaders.php
+++ b/app/Http/Middleware/SecureHeaders.php
@@ -74,7 +74,7 @@ class SecureHeaders
"default-src 'none'",
"object-src 'none'",
sprintf("script-src 'unsafe-eval' 'strict-dynamic' 'nonce-%1s'", $nonce),
- // sprintf("style-src 'self' 'nonce-%1s' https://10.0.0.15:5173/", $nonce), // safe varian
+// sprintf("style-src 'self' 'nonce-%1s' https://10.0.0.15:5173/", $nonce), // safe variant
"style-src 'self' 'unsafe-inline' https://10.0.0.15:5173/", // unsafe variant
"base-uri 'self'",
"form-action 'self'",
diff --git a/public/v1/css/firefly.css b/public/v1/css/firefly.css
index 13c63b8c5b..9937ed1ae2 100644
--- a/public/v1/css/firefly.css
+++ b/public/v1/css/firefly.css
@@ -22,6 +22,10 @@
.no-margin-pagination {padding-bottom:0;padding-top:0;}
.no-margin-pagination ul.pagination {margin:0 !important;}
+/* date range */
+.date-range-holder {color:#fff;padding: 15px;display: block;line-height: 20px;}
+.dropdown-holder {cursor:default;color:#fff;padding: 15px;display: block;line-height: 20px;}
+
/** new classes because of CSP */
.wide-chart {width:100%;height:400px;}
.low-chart {width:100%;height:200px;}
@@ -30,10 +34,12 @@
.map-size {width:100%;height:300px;}
/** tables **/
+th.ten {width:10%;}
td.quarter th.quarter {width:25%;}
td.thirty th.thirty {width:30%;}
td.third th.third {width:33%;}
td.forty th.forty {width:40%;}
+td.half th.half {width:50%;}
/* spacing and padding */
.m-0 { margin:0!important; }
diff --git a/resources/views/accounts/reconcile/index.twig b/resources/views/accounts/reconcile/index.twig
index 54cb0abe28..9e81a96bb4 100644
--- a/resources/views/accounts/reconcile/index.twig
+++ b/resources/views/accounts/reconcile/index.twig
@@ -16,7 +16,7 @@
<table class="table table-hover">
<thead>
<tr>
- <th colspan="2" style="width:50%;">{{ 'start_balance'|_ }}</th>
+ <th colspan="2" class="half">{{ 'start_balance'|_ }}</th>
<th colspan="2">{{ 'end_balance'|_ }}</th>
</tr>
</thead>
diff --git a/resources/views/bills/show.twig b/resources/views/bills/show.twig
index fa625bfed5..82093bb760 100644
--- a/resources/views/bills/show.twig
+++ b/resources/views/bills/show.twig
@@ -42,7 +42,7 @@
</tr>
<tr>
- <td style="width:50%;">{{ 'bill_is_active'|_ }}</td>
+ <td class="half">{{ 'bill_is_active'|_ }}</td>
<td>
{% if object.data.active %}
<span class="fa fa-check fa-fw" title="{{ 'active'|_ }}"></span> {{ 'yes'|_ }}
diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twig
index 61cd1b4756..1085a51643 100644
--- a/resources/views/budgets/index.twig
+++ b/resources/views/budgets/index.twig
@@ -24,7 +24,7 @@
</select>
</div>
<div class="col-lg-8 col-md-4 col-sm-12 col-xs-12 text-center">
- <div class="btn btn-group btn-group-lg" style="padding-top:0;">
+ <div class="btn btn-group btn-group-lg pt-0">
<a href="{{ route('budgets.index', [prevLoop[0].start.format('Y-m-d'), prevLoop[0].end.format('Y-m-d')]) }}"
class="btn btn-default" title="{{ prevLoop[0].title }}">&larr;</a>
<a title="{{ start.isoFormat(monthAndDayFormat) }} - {{ end.isoFormat(monthAndDayFormat) }}"
@@ -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 text-right" style="margin-bottom:3px;">
+ <div class="col-lg-9 col-md-9 col-sm-9 col-xs-9 text-right mb-1">
<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 text-right" style="margin-bottom:3px;">
+ <div class="col-lg-9 col-md-9 col-sm-9 col-xs-9 text-right mb-1">
<small class="available_bar"
data-id="{{ budget.id }}">{{ trans('firefly.available_between', {start: budget.start_date.isoFormat(monthAndDayFormat), end: budget.end_date.isoFormat(monthAndDayFormat) }) }}
:
@@ -146,17 +146,17 @@
{# red: the exact amount of the available budget, if more has budgeted. #}
<div class="progress-bar progress-bar-danger" data-id="{{ budget.id }}" role="progressbar" aria-valuenow="10"
aria-valuemin="0"
- aria-valuemax="100" style="width: 0;"></div>
+ aria-valuemax="100"></div>
{# orange: overbudgeted amount #}
<div class="progress-bar progress-bar-warning" data-id="{{ budget.id }}" role="progressbar" aria-valuenow="0"
aria-valuemin="0"
- aria-valuemax="100" style="width: 0;"></div>
+ aria-valuemax="100"></div>
{# budgeted amount if enough or les #}
<div class="progress-bar progress-bar-info" data-id="{{ budget.id }}" role="progressbar" aria-valuenow="0"
aria-valuemin="0"
- aria-valuemax="100" style="width: 0;"></div>
+ aria-valuemax="100"></div>
</div>
</div>
</div>
@@ -179,12 +179,9 @@
<div class="progress spent_bar" data-id="{{ budget.id }}" data-budgeted="{{ budget.budgeted }}"
data-spent="{{ budget.spent }}">
<div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="0" aria-valuemin="0"
- aria-valuemax="100"
- style="width: 0;"></div>
- <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"
- style="width: 0;"></div>
- <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"
- style="width: 0;"></div>
+ aria-valuemax="100"></div>
+ <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
+ <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
</div>
</div>
</div>
@@ -213,7 +210,7 @@
<table class="table table-bordered sortable-table table-striped sortable" id="budgetList">
<thead>
<tr>
- <th class="hidden-sm hidden-xs" style="width:10%;">&nbsp;</th>
+ <th class="hidden-sm hidden-xs ten">&nbsp;</th>
<th>{{ 'budget'|_ }}</th>
<th class="quarter">{{ 'budgeted'|_ }}</th>
<th class="hidden-sm hidden-xs">{{ 'spent'|_ }} ({{ 'per_day'|_|lower }})</th>
diff --git a/resources/views/json/piggy-banks.twig b/resources/views/json/piggy-banks.twig
index 0d51d6e7ea..cd5750c43d 100644
--- a/resources/views/json/piggy-banks.twig
+++ b/resources/views/json/piggy-banks.twig
@@ -8,7 +8,7 @@
<strong>{{ entry.name }}</strong><br/>
<div class="progress">
<div class="progress-bar" role="progressbar" aria-valuenow="{{ entry.percentage }}" aria-valuemin="0" aria-valuemax="100"
- style="width: {{ entry.percentage }}%;">
+ style="width: {{ entry.percentage|round }}%;">
{% if entry.percentage >=20 %}
{% if convertToPrimary and 0 != avg.pc_amount %}
{{ formatAmountBySymbol(entry.pc_amount, entry.primary_currency_symbol, entry.primary_currency_decimal_places, false) }}
diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig
index 9925f67d47..8719bdf8be 100644
--- a/resources/views/layout/default.twig
+++ b/resources/views/layout/default.twig
@@ -131,13 +131,13 @@
</li>
<li>
- <span nonce="{{ JS_NONCE }}" style="color:#fff;padding: 15px;display: block;line-height: 20px;">
+ <span class="date-range-holder">
<span id="daterange"></span>
</span>
</li>
<li class="dropdown user user-menu">
- <span nonce="{{ JS_NONCE }}" style="cursor:default;color:#fff;padding: 15px;display: block;line-height: 20px;">
+ <span class="dropdown-holder">
<span class="hidden-xs">{{ Auth.user.email }}</span>
</span>
</li>
diff --git a/resources/views/partials/boxes.twig b/resources/views/partials/boxes.twig
index 27385c5697..f93e0a1799 100644
--- a/resources/views/partials/boxes.twig
+++ b/resources/views/partials/boxes.twig
@@ -10,7 +10,7 @@
<span class="info-box-number" id="box-balance-sums"></span>
<div class="progress" id="box-balance-progress">
- <div class="progress-bar" style="width: 0%"></div>
+ <div class="progress-bar"></div>
</div>
<span class="progress-description">
<span id="box-balance-list" ></span>
@@ -29,7 +29,7 @@
<span class="info-box-number" id="box-bills-unpaid"></span>
<div class="progress">
- <div class="progress-bar" style="width: 0%"></div>
+ <div class="progress-bar"></div>
</div>
<span class="progress-description">
{{ 'paid'|_ }}:
@@ -48,7 +48,7 @@
<span class="info-box-number" id="box-left-to-spend"></span>
<div class="progress">
- <div class="progress-bar" style="width: 0%"></div>
+ <div class="progress-bar"></div>
</div>
<span class="progress-description">
{{ 'per_day'|_ }}:
@@ -69,7 +69,7 @@
<span class="info-box-number" id="box-net-worth"></span>
<div class="progress">
- <div class="progress-bar" style="width: 0%"></div>
+ <div class="progress-bar"></div>
</div>
<span class="progress-description"></span>
</div>
diff --git a/resources/views/rules/index.twig b/resources/views/rules/index.twig
index 44afe1e706..2c3fff1d65 100644
--- a/resources/views/rules/index.twig
+++ b/resources/views/rules/index.twig
@@ -75,8 +75,8 @@
<thead>
<tr>
<th style="width:5%;">&nbsp;</th>
- <th style="width:10%;">&nbsp;</th>
- <th style="width:10%;">&nbsp;</th>
+ <th class="ten">&nbsp;</th>
+ <th class="ten">&nbsp;</th>
<th class="quarter">{{ 'rule_name'|_ }}</th>
<th style="width:25%;" class="hidden-xs">{{ 'rule_triggers'|_ }}</th>
<th style="width:25%;" class="hidden-xs">{{ 'rule_actions'|_ }}</th>
diff --git a/resources/views/transactions/convert.twig b/resources/views/transactions/convert.twig
index c8dd995f3c..b44b3210ab 100644
--- a/resources/views/transactions/convert.twig
+++ b/resources/views/transactions/convert.twig
@@ -57,7 +57,7 @@
<table class="table">
<tr>
- <th style="width:10%;">ID</th>
+ <th class="ten">ID</th>
<th class="quarter">Description</th>
<th class="quarter">Source account</th>
<th class="quarter">Destination account</th>
diff --git a/resources/views/v2/transactions/show.blade.php b/resources/views/v2/transactions/show.blade.php
index ebaa9e87f4..a921e2641a 100644
--- a/resources/views/v2/transactions/show.blade.php
+++ b/resources/views/v2/transactions/show.blade.php
@@ -16,7 +16,7 @@
<table class="table table-x table-hover">
<tbody>
<tr>
- <th style="width:10%;">
+ <th class="ten">
<template x-if="'withdrawal' === groupProperties.transactionType">
<em class="fa fa-solid fa-arrow-left"
:title="groupProperties.transactionTypeTranslated"></em>
@@ -78,7 +78,7 @@
<table class="table table-x table-hover">
<tbody>
<tr>
- <th style="width:10%;">
+ <th class="ten">
<em class="fa-solid fa-money-bill-wave" title="{{ __('firefly.amount') }}"></em>
</th>
<td>
@@ -213,7 +213,7 @@
</tr>
<template x-if="null !== entry.category_name">
<tr>
- <th style="width:10%;">
+ <th class="ten">
<em title="{{ __('firefly.category') }}"
class="fa-solid fa-bookmark"></em>
</th>