IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix chart heights.

Browse Source
This commit is contained in:
James Cole 2016-04-10 10:20:15 +02:00
parent b74c1c8cf9
commit 2dddc843ce
11 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/js/global/charts.js
View File

@ -60,6 +60,9 @@ for (var i = 0; i < colourSet.length; i++) {
Chart.defaults.global.legend.display = false;
Chart.defaults.global.animation.duration = 0;
Chart.defaults.global.responsive = true;
Chart.defaults.global.maintainAspectRatio = false;
/*
Set default options:
*/

2
resources/views/accounts/show.twig
View File

@ -24,7 +24,7 @@
</div>
</div>
<div class="box-body">
<canvas id="overview-chart" style="width:100%;height:400px;"></canvas>
<canvas id="overview-chart" style="width:100%;" height="400"></canvas>
</div>
</div>
</div>

2
resources/views/bills/show.twig
View File

@ -85,7 +85,7 @@
<h3 class="box-title">Chart</h3>
</div>
<div class="box-body">
<canvas id="bill-overview" style="width:100%;height:400px;"></canvas>
<canvas id="bill-overview" style="width:100%;" height="400"></canvas>
</div>
</div>
</div>

2
resources/views/budgets/show.twig
View File

@ -27,7 +27,7 @@
</div>
</div>
<div class="box-body">
<canvas id="budgetOverview" style="width:100%;height:400px;"></canvas>
<canvas id="budgetOverview" style="width:100%;" height="400"></canvas>
</div>
</div>

4
resources/views/categories/show.twig
View File

@ -12,7 +12,7 @@
<h3 class="box-title">{{ 'overview'|_ }} (month)</h3>
</div>
<div class="box-body">
<canvas id="period" style="width:100%;height:350px;"></canvas>
<canvas id="period" style="width:100%" height="350"></canvas>
</div>
</div>
</div>
@ -22,7 +22,7 @@
<h3 class="box-title">{{ 'overview'|_ }} (all)</h3>
</div>
<div class="box-body">
<canvas id="all" style="width:100%;height:350px;"></canvas>
<canvas id="all" style="width:100%;" height="350"></canvas>
</div>
</div>
</div>

2
resources/views/categories/show_with_date.twig
View File

@ -13,7 +13,7 @@
<h3 class="box-title">{{ 'overview'|_ }} (period)</h3>
</div>
<div class="box-body">
<canvas id="period-specific-period" style="width:100%;height:350px;"></canvas>
<canvas id="period-specific-period" style="width:100%;height:350px;" height="350"></canvas>
</div>
</div>
</div>

10
resources/views/index.twig
View File

@ -22,7 +22,7 @@
</div>
</div>
<div class="box-body">
<canvas id="accounts-chart" style="width:100%;height:400px;"></canvas>
<canvas id="accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
</div>
</div>
@ -36,7 +36,7 @@
</div>
</div>
<div class="box-body">
<canvas id="budgets-chart" style="width:100%;height:400px;"></canvas>
<canvas id="budgets-chart" style="width:100%;" height="400"></canvas>
</div>
</div>
<!-- CATEGORIES -->
@ -49,7 +49,7 @@
</div>
</div>
<div class="box-body">
<canvas id="categories-chart" style="width:100%;height:400px;"></canvas>
<canvas id="categories-chart" style="width:100%;" height="400"></canvas>
</div>
</div>
</div>
@ -65,7 +65,7 @@
</div>
</div>
<div class="box-body">
<canvas id="bills-chart" style="width:100%;height:250px;"></canvas>
<canvas id="bills-chart" style="width:100%;" height="250"></canvas>
</div>
</div>
@ -116,7 +116,7 @@
</div>
</div>
<div class="box-body">
<canvas id="expense-accounts-chart" style="width:100%;height:400px;"></canvas>
<canvas id="expense-accounts-chart" style="width:100%;" height="400"></canvas>
</div>
</div>
</div>

2
resources/views/piggy-banks/show.twig
View File

@ -12,7 +12,7 @@
<h3 class="box-title">{{ 'events'|_ }}</h3>
</div>
<div class="box-body">
<canvas id="piggy-bank-history" style="width:100%;height:400px;"></canvas>
<canvas id="piggy-bank-history" style="width:100%;height:400px;" height="400"></canvas>
</div>
</div>
</div>

2
resources/views/reports/default/month.twig
View File

@ -13,7 +13,7 @@
<h3 class="box-title">{{ 'accountBalances'|_ }}</h3>
</div>
<div class="box-body">
<canvas id="account-balances-chart" style="width:100%;height:400px;"></canvas>
<canvas id="account-balances-chart" style="width:100%;height:400px;" height="400"></canvas>
</div>
</div>
</div>

12
resources/views/reports/default/multi-year.twig
View File

@ -13,7 +13,7 @@
<h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
</div>
<div class="box-body">
<canvas id="income-expenses-chart" style="width:100%;height:400px;"></canvas>
<canvas id="income-expenses-chart" style="width:100%;height:400px;" height="400"></canvas>
</div>
</div>
</div>
@ -23,7 +23,7 @@
<h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
</div>
<div class="box-body">
<canvas id="income-expenses-sum-chart" style="width:100%;height:400px;"></canvas>
<canvas id="income-expenses-sum-chart" style="width:100%;height:400px;" height="400"></canvas>
</div>
</div>
</div>
@ -62,7 +62,7 @@
<h3 class="box-title">{{ 'Asset account'|_ }}: {{ account.name }}</h3>
</div>
<div class="box-body">
<canvas id="account-chart-{{ account.id }}" class="account-chart" data-id="{{ account.id }}" style="width:100%;height:400px;"></canvas>
<canvas id="account-chart-{{ account.id }}" class="account-chart" data-id="{{ account.id }}" style="width:100%;height:400px;" height="400"></canvas>
</div>
</div>
</div>
@ -76,7 +76,7 @@
<h3 class="box-title">{{ 'net_worth'|_ }}</h3>
</div>
<div class="box-body">
<canvas id="net-worth" style="width:100%;height:400px;"></canvas>
<canvas id="net-worth" style="width:100%;height:400px;" height="400"></canvas>
</div>
</div>
</div>
@ -94,7 +94,7 @@
<p class="well" id="budgets-chart-message" style="display:none;">
Select one or more budgets to generate this chart. Insofar possible, your selection will be saved.
</p>
<canvas id="budgets-chart" class="budgets-chart" style="width:100%;height:400px;"></canvas>
<canvas id="budgets-chart" class="budgets-chart" style="width:100%;height:400px;" height="400"></canvas>
</div>
</div>
<div class="row">
@ -126,7 +126,7 @@
<p class="well" id="categories-chart-message" style="display:none;">
Select one or more categories to generate this chart. Insofar possible, your selection will be saved.
</p>
<canvas id="categories-chart" class="categories-chart" style="width:100%;height:400px;"></canvas>
<canvas id="categories-chart" class="categories-chart" style="width:100%;height:400px;" height="400"></canvas>
</div>
</div>
<div class="row">

12
resources/views/reports/default/year.twig
View File

@ -13,7 +13,7 @@
<h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
</div>
<div class="box-body">
<canvas id="income-expenses-chart" style="width:100%;height:400px;"></canvas>
<canvas height="400" id="income-expenses-chart" style="width:100%;height:400px;"></canvas>
</div>
</div>
</div>
@ -23,7 +23,7 @@
<h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
</div>
<div class="box-body">
<canvas id="income-expenses-sum-chart" style="width:100%;height:400px;"></canvas>
<canvas height="400" id="income-expenses-sum-chart" style="width:100%;height:400px;"></canvas>
</div>
</div>
</div>
@ -55,7 +55,7 @@
<h3 class="box-title">{{ 'net_worth'|_ }}</h3>
</div>
<div class="box-body">
<canvas id="net-worth" style="width:100%;height:400px;"></canvas>
<canvas height="400" id="net-worth" style="width:100%;height:400px;"></canvas>
</div>
</div>
</div>
@ -68,7 +68,7 @@
<h3 class="box-title">{{ 'categories_spent_in_year'|_ }}</h3>
</div>
<div class="box-body">
<canvas id="categories-spent-in-period" style="width:100%;height:400px;"></canvas>
<canvas height="400" id="categories-spent-in-period" style="width:100%;height:400px;"></canvas>
</div>
</div>
</div>
@ -81,7 +81,7 @@
<h3 class="box-title">{{ 'categories_earned_in_year'|_ }}</h3>
</div>
<div class="box-body">
<canvas id="categories-earned-in-period" style="width:100%;height:400px;"></canvas>
<canvas height="400" id="categories-earned-in-period" style="width:100%;height:400px;"></canvas>
</div>
</div>
</div>
@ -94,7 +94,7 @@
<h3 class="box-title">{{ 'budgets'|_ }}</h3>
</div>
<div class="box-body">
<canvas id="budgets" style="width:100%;height:400px;"></canvas>
<canvas height="400" id="budgets" style="width:100%;height:400px;"></canvas>
</div>
</div>
</div>