Skip to content

Firefly III: a personal finances manager

Various layout fixes.

James Cole8d1f8c17d8a1
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 5b9343f480..f250b97054 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -2,7 +2,7 @@
@section('content')
@if(true===$IS_DEMO_SITE)
- <div class="card mb-3">
+ <div class="card mb-2">
<div class="card-body">
<p>
Welcome to the Firefly III demo!<br/>
diff --git a/resources/views/components/lists/piggy-banks.blade.php b/resources/views/components/lists/piggy-banks.blade.php
index 915a0e5695..52784cd224 100644
--- a/resources/views/components/lists/piggy-banks.blade.php
+++ b/resources/views/components/lists/piggy-banks.blade.php
@@ -1,19 +1,25 @@
+
@foreach($piggyBanks as $objectGroupOrder => $objectGroup)
- <h5 class="m-3">{{ $objectGroup['object_group_title'] }}</h5>
+ <div class="row">
+ <div class="col-lg-12 col-md-12 col-sm-12">
+ <div class="card mb-2">
+ <x-elements.card-header-with-menu :cardTitle="$objectGroup['object_group_title']" :route="route('piggy-banks.create')" :linkTitle="__('firefly.create_new_piggy_bank')" />
+ <div class="card-body p-0">
+
<table class="table table-hover table-sm table-sm" id="piggy-sortable">
<thead>
<tr>
- <th style="width:50px;" class="d-none d-md-table-cell">&nbsp;</th>
- <th class="d-table-cell d-md-none"></th>
- <th style="width:50px;"></th>
- <th style="width:30%;">{{ __('firefly.piggy_bank') }}</th>
- <th style="width:10%;" class="text-end">{{ __('firefly.saved_so_far') }}</th>
+ <th class="w-4 d-none d-md-table-cell">&nbsp;</th>
+ <th class="w-4 d-table-cell d-md-none"></th>
+ <th class="w-4"></th>
+ <th class="w-25" style="width:30%;">{{ __('firefly.piggy_bank') }}</th>
+ <th class="w-10 text-end">{{ __('firefly.saved_so_far') }}</th>
<th class="d-none d-md-table-cell"></th>
<th class="d-none d-md-table-cell"></th>
<th class="d-none d-md-table-cell"></th>
- <th style="width:10%;" class="text-end">{{ __('firefly.target_amount') }}</th>
- <th style="width:10%;" class="d-none d-md-table-cell text-end">{{ __('firefly.left_to_save') }}</th>
- <th style="width:15%;" class="d-none d-md-table-cell text-end">{{ __('firefly.suggested_savings_per_month') }}</th>
+ <th class="w-10 text-end">{{ __('firefly.target_amount') }}</th>
+ <th class="w-10 d-none d-md-table-cell text-end">{{ __('firefly.left_to_save') }}</th>
+ <th class="w-15 d-none d-md-table-cell text-end">{{ __('firefly.suggested_savings_per_month') }}</th>
</tr>
</thead>
@if(count($objectGroup['piggy_banks']) > 0)
@@ -142,4 +148,10 @@
</tbody>
@endif
</table>
+ </div>
+ <x-elements.card-footer-with-menu :route="route('piggy-banks.create')" :linkTitle="__('firefly.create_new_piggy_bank')" />
+ </div>
+ </div>
+ </div>
+
@endforeach
diff --git a/resources/views/piggy-banks/edit.blade.php b/resources/views/piggy-banks/edit.blade.php
index a278c29f76..1eed3b0c45 100644
--- a/resources/views/piggy-banks/edit.blade.php
+++ b/resources/views/piggy-banks/edit.blade.php
@@ -10,7 +10,7 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- <div class="card mb-3">
+ <div class="card mb-2">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.mandatoryFields') }}</h3>
</div>
@@ -25,7 +25,7 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
- <div class="card mb-3">
+ <div class="card mb-2">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.optionalFields') }}</h3>
</div>
diff --git a/resources/views/piggy-banks/index.blade.php b/resources/views/piggy-banks/index.blade.php
index 32bcc1f2b1..7084a96cfa 100644
--- a/resources/views/piggy-banks/index.blade.php
+++ b/resources/views/piggy-banks/index.blade.php
@@ -4,21 +4,10 @@
<x-empty-page :route="route('piggy-banks.create')" type="piggies" object-type="default" />
@endif
@if(count($piggyBanks) > 0)
+ <x-lists.piggy-banks :piggyBanks="$piggyBanks" />
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
- <div class="card mb-3">
- <x-elements.card-header-with-menu :cardTitle="__('firefly.piggyBanks')" :route="route('piggy-banks.create')" :linkTitle="__('firefly.create_new_piggy_bank')" />
- <div class="card-body p-0">
- <x-lists.piggy-banks :piggyBanks="$piggyBanks" />
- </div>
- <x-elements.card-footer-with-menu :route="route('piggy-banks.create')" :linkTitle="__('firefly.create_new_piggy_bank')" />
- </div>
- </div>
- </div>
-
- <div class="row">
- <div class="col-lg-12 col-md-12 col-sm-12">
- <div class="card mb-3">
+ <div class="card mb-2">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.account_status') }}</h3>
</div>