Skip to content

Firefly III: a personal finances manager

Clean up boxes and fix #12822

James Cole97e0433e40aa
diff --git a/changelog.md b/changelog.md
index 83cee898b9..12b95b5f10 100644
--- a/changelog.md
+++ b/changelog.md
@@ -26,6 +26,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Fixed
- [Issue 12819](https://github.com/firefly-iii/firefly-iii/issues/12819) (Suscriptions with attachement in show page returns 500 error page) reported by @jsaneu
+- #12822
### Security
diff --git a/resources/assets/v3/sass/app.scss b/resources/assets/v3/sass/app.scss
index 6e552588ce..d1133b8593 100644
--- a/resources/assets/v3/sass/app.scss
+++ b/resources/assets/v3/sass/app.scss
@@ -55,9 +55,11 @@ $success: #64b624; // original
html[data-bs-theme="light"] .money-negative {
color: #993b1e !important;
}
+
html[data-bs-theme="light"] .money-positive {
color: #356114 !important;
}
+
html[data-bs-theme="light"] .money-transfer {
color: #065e6f !important;
}
@@ -66,9 +68,11 @@ html[data-bs-theme="light"] .money-transfer {
html[data-bs-theme="dark"] .money-negative {
color: #e69f89 !important;
}
+
html[data-bs-theme="dark"] .money-positive {
color: #6bc427 !important;
}
+
html[data-bs-theme="dark"] .money-transfer {
color: #0bc1e5 !important;
}
@@ -92,6 +96,7 @@ html[data-bs-theme="dark"] .money-transfer {
background-repeat: no-repeat;
background-position: center center;
}
+
.empty-chart-error {
min-height: 250px;
text-align: center;
@@ -105,22 +110,27 @@ html[data-bs-theme="dark"] .money-transfer {
body.sidebar-collapse .search-xl {
display: none;
}
+
body.sidebar-collapse .search-xs {
display: block !important;
}
+
// show search
ul.nav:nth-child(1) > li:nth-child(2) .piggy-handle {
cursor: move;
}
+
.object-handle {
cursor: move;
touch-action: none;
}
+
.rule-handle {
cursor: move;
touch-action: none;
}
+
.bill-handle {
cursor: move;
touch-action: none;
@@ -138,9 +148,11 @@ body.waiting * {
.top-light-border {
border-top: 1px #aaa solid;
}
+
.top-dark-border {
border-top: 1px #777 solid;
}
+
.bottom-light-border {
border-bottom: 1px #aaa solid;
}
@@ -150,18 +162,22 @@ body.waiting * {
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;
@@ -171,9 +187,11 @@ body.waiting * {
td.quarter th.quarter {
width: 25%;
}
+
td.forty th.forty {
width: 40%;
}
+
td.thirty th.thirty {
width: 30%;
}
@@ -191,303 +209,403 @@ td.thirty th.thirty {
.w-0 {
width: 0 !important;
}
+
.w-1 {
width: 1% !important;
}
+
.w-2 {
width: 2% !important;
}
+
.w-3 {
width: 3% !important;
}
+
.w-4 {
width: 4% !important;
}
+
.w-5 {
width: 5% !important;
}
+
.w-6 {
width: 6% !important;
}
+
.w-7 {
width: 7% !important;
}
+
.w-8 {
width: 8% !important;
}
+
.w-9 {
width: 9% !important;
}
+
.w-10 {
width: 10% !important;
}
+
.w-11 {
width: 11% !important;
}
+
.w-12 {
width: 12% !important;
}
+
.w-13 {
width: 13% !important;
}
+
.w-14 {
width: 14% !important;
}
+
.w-15 {
width: 15% !important;
}
+
.w-16 {
width: 16% !important;
}
+
.w-17 {
width: 17% !important;
}
+
.w-18 {
width: 18% !important;
}
+
.w-19 {
width: 19% !important;
}
+
.w-20 {
width: 20% !important;
}
+
.w-21 {
width: 21% !important;
}
+
.w-22 {
width: 22% !important;
}
+
.w-23 {
width: 23% !important;
}
+
.w-24 {
width: 24% !important;
}
+
.w-25 {
width: 25% !important;
}
+
.w-26 {
width: 26% !important;
}
+
.w-27 {
width: 27% !important;
}
+
.w-28 {
width: 28% !important;
}
+
.w-29 {
width: 29% !important;
}
+
.w-30 {
width: 30% !important;
}
+
.w-31 {
width: 31% !important;
}
+
.w-32 {
width: 32% !important;
}
+
.w-33 {
width: 33% !important;
}
+
.w-34 {
width: 34% !important;
}
+
.w-35 {
width: 35% !important;
}
+
.w-36 {
width: 36% !important;
}
+
.w-37 {
width: 37% !important;
}
+
.w-38 {
width: 38% !important;
}
+
.w-39 {
width: 39% !important;
}
+
.w-40 {
width: 40% !important;
}
+
.w-41 {
width: 41% !important;
}
+
.w-42 {
width: 42% !important;
}
+
.w-43 {
width: 43% !important;
}
+
.w-44 {
width: 44% !important;
}
+
.w-45 {
width: 45% !important;
}
+
.w-46 {
width: 46% !important;
}
+
.w-47 {
width: 47% !important;
}
+
.w-48 {
width: 48% !important;
}
+
.w-49 {
width: 49% !important;
}
+
.w-50 {
width: 50% !important;
}
+
.w-51 {
width: 51% !important;
}
+
.w-52 {
width: 52% !important;
}
+
.w-53 {
width: 53% !important;
}
+
.w-54 {
width: 54% !important;
}
+
.w-55 {
width: 55% !important;
}
+
.w-56 {
width: 56% !important;
}
+
.w-57 {
width: 57% !important;
}
+
.w-58 {
width: 58% !important;
}
+
.w-59 {
width: 59% !important;
}
+
.w-60 {
width: 60% !important;
}
+
.w-61 {
width: 61% !important;
}
+
.w-62 {
width: 62% !important;
}
+
.w-63 {
width: 63% !important;
}
+
.w-64 {
width: 64% !important;
}
+
.w-65 {
width: 65% !important;
}
+
.w-66 {
width: 66% !important;
}
+
.w-67 {
width: 67% !important;
}
+
.w-68 {
width: 68% !important;
}
+
.w-69 {
width: 69% !important;
}
+
.w-70 {
width: 70% !important;
}
+
.w-71 {
width: 71% !important;
}
+
.w-72 {
width: 72% !important;
}
+
.w-73 {
width: 73% !important;
}
+
.w-74 {
width: 74% !important;
}
+
.w-75 {
width: 75% !important;
}
+
.w-76 {
width: 76% !important;
}
+
.w-77 {
width: 77% !important;
}
+
.w-78 {
width: 78% !important;
}
+
.w-79 {
width: 79% !important;
}
+
.w-80 {
width: 80% !important;
}
+
.w-81 {
width: 81% !important;
}
+
.w-82 {
width: 82% !important;
}
+
.w-83 {
width: 83% !important;
}
+
.w-84 {
width: 84% !important;
}
+
.w-85 {
width: 85% !important;
}
+
.w-86 {
width: 86% !important;
}
+
.w-87 {
width: 87% !important;
}
+
.w-88 {
width: 88% !important;
}
+
.w-89 {
width: 89% !important;
}
+
.w-90 {
width: 90% !important;
}
+
.w-91 {
width: 91% !important;
}
+
.w-92 {
width: 92% !important;
}
+
.w-93 {
width: 93% !important;
}
+
.w-94 {
width: 94% !important;
}
+
.w-95 {
width: 95% !important;
}
+
.w-96 {
width: 96% !important;
}
+
.w-97 {
width: 97% !important;
}
+
.w-98 {
width: 98% !important;
}
+
.w-99 {
width: 99% !important;
}
+
.w-100 {
width: 100% !important;
}
diff --git a/resources/views/components/dashboard/boxes.blade.php b/resources/views/components/dashboard/boxes.blade.php
index 3c9ae2cdc5..3cd7747a9e 100644
--- a/resources/views/components/dashboard/boxes.blade.php
+++ b/resources/views/components/dashboard/boxes.blade.php
@@ -3,9 +3,6 @@
<div class="small-box text-bg-primary">
<div class="inner balance-box">
<h4 class="hover-expand">
- <template x-if="0 === balanceBox.amounts.length">
- <span>&nbsp;</span>
- </template>
<template x-for="(amount, index) in balanceBox.amounts" :key="index">
<span>
<span x-text="amount"></span><span
@@ -50,13 +47,10 @@
<!--end::Small Box Widget 1-->
</div>
<!--end::Col-->
- <div class="col-xl-3 col-lg-6 col-md-6 col-sm-6" style="flex-grow: 1;">
+ <div class="col-xl-3 col-lg-6 col-md-6 col-sm-6" >
<!--begin::Small Box Widget 2-->
<div class="small-box text-bg-warning">
<div class="inner">
- <template x-if="0 === billBox.unpaid.length">
- <h4>&nbsp;</h4>
- </template>
<template x-if="billBox.unpaid.length > 0">
<h4 class="hover-expand">
<template x-for="(amount, index) in billBox.unpaid" :key="index">
@@ -105,14 +99,11 @@
<!--end::Small Box Widget 2-->
</div>
<!--end::Col-->
- <div class="col-xl-3 col-lg-6 col-md-6 col-sm-6" style="flex-grow: 1;">
+ <div class="col-xl-3 col-lg-6 col-md-6 col-sm-6">
<!--begin::Small Box Widget 3-->
<div x-bind:class="{'small-box': true, 'text-bg-success': !noMoneyLeft, 'text-bg-danger': noMoneyLeft}">
<div class="inner">
<h4 class="hover-expand">
- <template x-if="0 === leftBox.left.length">
- <span>&nbsp;</span>
- </template>
<template x-for="(amount, index) in leftBox.left" :key="index">
<span>
<span x-text="amount"></span><span
@@ -157,7 +148,7 @@
<!--end::Small Box Widget 3-->
</div>
<!--end::Col-->
- <div class="col-xl-3 col-lg-6 col-md-6 col-sm-6" style="flex-grow: 1;">
+ <div class="col-xl-3 col-lg-6 col-md-6 col-sm-6">
<!--begin::Small Box Widget 4-->
<div class="small-box text-bg-primary">
<div class="inner">