IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-28 09:51:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update font options in charts.

Browse Source
This commit is contained in:
James Cole 2015-03-20 15:54:40 +01:00
parent 461cbcbc28
commit 4361cc69d4
2 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
public/js/gcharts.options.js
View File

@ -16,19 +16,17 @@ var defaultLineChartOptions = {
hAxis: {
textStyle: {
color: '#838383',
fontName: 'Roboto',
fontSize: '12'
},
baselineColor: '#aaaaaa',
gridlines: {
color: 'transparent'
}
},
fontName: 'Roboto',
fontSize: 11,
vAxis: {
textStyle: {
color: '#838383',
fontName: 'Roboto',
fontSize: '12'
},
baselineColor: '#aaaaaa',
format: '\u20AC #'
@ -43,19 +41,17 @@ var defaultBarChartOptions = {
hAxis: {
textStyle: {
color: '#838383',
fontName: 'Roboto',
fontSize: '12'
},
baselineColor: '#aaaaaa',
format: '\u20AC #'
},
fontName: 'Roboto',
fontSize: 11,
colors: ["#4285f4", "#db4437", "#f4b400", "#0f9d58", "#ab47bc", "#00acc1", "#ff7043", "#9e9d24", "#5c6bc0", "#f06292", "#00796b", "#c2185b"],
vAxis: {
textStyle: {
color: '#838383',
fontName: 'Roboto',
fontSize: '11'
},
textPosition: 'in',
gridlines: {
@ -88,6 +84,8 @@ var defaultComboChartOptions = {
minValue: 0,
format: '\u20AC #'
},
fontName: 'Roboto',
fontSize: 11,
legend: {
position: 'none'
},
@ -107,11 +105,11 @@ var defaultColumnChartOptions = {
width: '85%',
height: '80%'
},
fontName: 'Roboto',
fontSize: 11,
hAxis: {
textStyle: {
color: '#838383',
fontName: 'Roboto',
fontSize: '12'
},
gridlines: {
color: 'transparent'
@ -123,8 +121,6 @@ var defaultColumnChartOptions = {
vAxis: {
textStyle: {
color: '#838383',
fontName: 'Roboto',
fontSize: '12'
},
baselineColor: '#aaaaaa',
format: '\u20AC #'
@ -145,13 +141,13 @@ var defaultStackedColumnChartOptions = {
legend: {
position: 'none'
},
fontName: 'Roboto',
fontSize: 11,
isStacked: true,
colors: ["#4285f4", "#db4437", "#f4b400", "#0f9d58", "#ab47bc", "#00acc1", "#ff7043", "#9e9d24", "#5c6bc0", "#f06292", "#00796b", "#c2185b"],
hAxis: {
textStyle: {
color: '#838383',
fontName: 'Roboto',
fontSize: '12'
},
gridlines: {
color: 'transparent'
@ -160,8 +156,6 @@ var defaultStackedColumnChartOptions = {
vAxis: {
textStyle: {
color: '#838383',
fontName: 'Roboto',
fontSize: '12'
},
format: '\u20AC #'
}
@ -174,6 +168,8 @@ var defaultPieChartOptions = {
width: '100%',
height: '100%'
},
fontName: 'Roboto',
fontSize: 11,
height: 200,
legend: {
position: 'none'

7
resources/views/layouts/default.blade.php
View File

@ -14,7 +14,7 @@
// {{{$subTitle}}}
@endif
</title>
<link href='http://fonts.googleapis.com/css?family=Roboto:300' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Roboto:300,700,300italic' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="bootstrap/css/bootstrap.min.css" type="text/css" media="all" />
<link rel="stylesheet" href="bootstrap/css/bootstrap-theme.min.css" type="text/css" media="all" />
<link rel="stylesheet" href="css/metisMenu.min.css" type="text/css" media="all" />
@ -28,11 +28,6 @@
@yield('styles')
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
<![endif]-->
<link rel="apple-touch-icon" sizes="57x57" href="/apple-touch-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="/apple-touch-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="/apple-touch-icon-72x72.png">