kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-14 08:11:20 +00:00
Code Issues Projects Releases Wiki Activity

Some layout and file updates.

Browse Source
This commit is contained in:
James Cole
2015-06-23 19:07:37 +02:00
parent 6b5c4fd3f4
commit a7555bcce3
12 changed files with 204 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
public/css/daterangepicker-bs3.css
View File

@@ -54,7 +54,7 @@
}
.daterangepicker .calendar th, .daterangepicker .calendar td {
font-family: Roboto, 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
white-space: nowrap;
text-align: center;
min-width: 32px;
@@ -219,6 +219,22 @@
content: '';
}
.daterangepicker.dropup{
margin-top: -5px;
}
.daterangepicker.dropup:before{
top: initial;
bottom:-7px;
border-bottom: initial;
border-top: 7px solid #ccc;
}
.daterangepicker.dropup:after{
top: initial;
bottom:-6px;
border-bottom: initial;
border-top: 6px solid #fff;
}
.daterangepicker table {
width: 100%;
margin: 0;

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

@@ -24,7 +24,6 @@ var defaultLineChartOptions = {
color: 'transparent'
}
},
fontName: 'Roboto',
fontSize: 11,
vAxis: {
textStyle: {
@@ -61,7 +60,6 @@ var defaultAreaChartOptions = {
color: 'transparent'
}
},
fontName: 'Roboto',
fontSize: 11,
vAxis: {
textStyle: {
@@ -85,7 +83,6 @@ var defaultBarChartOptions = {
format: '\u20AC #'
},
fontName: 'Roboto',
fontSize: 11,
colors: ["#357ca5", "#008d4c", "#db8b0b", "#ca195a", "#555299", "#4285f4", "#db4437", "#f4b400", "#0f9d58", "#ab47bc", "#00acc1", "#ff7043", "#9e9d24", "#5c6bc0", "#f06292", "#00796b", "#c2185b"],
vAxis: {
@@ -123,7 +120,6 @@ var defaultComboChartOptions = {
minValue: 0,
format: '\u20AC #'
},
fontName: 'Roboto',
colors: ["#357ca5", "#008d4c", "#db8b0b", "#ca195a", "#555299", "#4285f4", "#db4437", "#f4b400", "#0f9d58", "#ab47bc", "#00acc1", "#ff7043", "#9e9d24", "#5c6bc0", "#f06292", "#00796b", "#c2185b"],
fontSize: 11,
legend: {
@@ -145,7 +141,6 @@ var defaultColumnChartOptions = {
width: '85%',
height: '80%'
},
fontName: 'Roboto',
fontSize: 11,
hAxis: {
textStyle: {
@@ -181,7 +176,6 @@ var defaultStackedColumnChartOptions = {
legend: {
position: 'none'
},
fontName: 'Roboto',
fontSize: 11,
isStacked: true,
colors: ["#357ca5", "#008d4c", "#db8b0b", "#ca195a", "#555299", "#4285f4", "#db4437", "#f4b400", "#0f9d58", "#ab47bc", "#00acc1", "#ff7043", "#9e9d24", "#5c6bc0", "#f06292", "#00796b", "#c2185b"],
@@ -208,7 +202,6 @@ var defaultPieChartOptions = {
width: '100%',
height: '100%'
},
fontName: 'Roboto',
fontSize: 11,
height: 200,
legend: {

2
resources/twig/auth/login.twig
View File

@@ -23,11 +23,9 @@
<div class="form-group has-feedback">
<input type="email" name="email" class="form-control" placeholder="Email"/>
<span class="glyphicon glyphicon-envelope form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<input type="password" name="password" class="form-control" placeholder="Password"/>
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
</div>
<div class="row">
<div class="col-xs-8">

1
resources/twig/auth/password.twig
View File

@@ -28,7 +28,6 @@
<div class="form-group has-feedback">
<input type="email" class="form-control" name="email" placeholder="Email"/>
<span class="glyphicon glyphicon-envelope form-control-feedback"></span>
</div>
<div class="row">

3
resources/twig/auth/register.twig
View File

@@ -23,15 +23,12 @@
<div class="form-group has-feedback">
<input type="email" name="email" class="form-control" placeholder="Email"/>
<span class="glyphicon glyphicon-envelope form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<input type="password" class="form-control" placeholder="Password" name="password"/>
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<input type="password" class="form-control" placeholder="Retype password" name="password_confirmation"/>
<span class="glyphicon glyphicon-log-in form-control-feedback"></span>
</div>
<div class="row">
<div class="col-xs-12">

8
resources/twig/list/piggy-banks.twig
View File

@@ -20,8 +20,8 @@
</td>
<td style="text-align:right;width:40px;">
{% if piggyBank.savedSoFar > 0 %}
<a href="{{ route('piggy-banks.removeMoney', piggyBank.id) }}" class="btn btn-default btn-xs removeMoney" data-id="{{ piggyBank.id }}"><span
data-id="{{ piggyBank.id }}" class="glyphicon glyphicon-minus"></span></a>
<a href="{{ route('piggy-banks.removeMoney', piggyBank.id) }}" class="btn btn-default btn-xs removeMoney" data-id="{{ piggyBank.id }}">
<i data-id="{{ piggyBank.id }}" class="fa fa-minus"></i></a>
{% endif %}
</td>
@@ -43,8 +43,8 @@
<td style="width:40px;">
{% if piggyBank.leftToSave > 0 %}
<a href="{{ route('piggy-banks.addMoney', piggyBank.id) }}" class="btn btn-default btn-xs addMoney" data-id="{{ piggyBank.id }}"><span
data-id="{{ piggyBank.id }}" class="glyphicon glyphicon-plus"></span></a>
<a href="{{ route('piggy-banks.addMoney', piggyBank.id) }}" class="btn btn-default btn-xs addMoney" data-id="{{ piggyBank.id }}">
<i data-id="{{ piggyBank.id }}" class="fa fa-plus"></i></a>
{% endif %}
</td>
<td style="width:200px;">