mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-11-15 22:28:14 +00:00
Some layout and file updates.
This commit is contained in:
@@ -7,7 +7,7 @@
|
|||||||
* Built for http://www.improvely.com
|
* Built for http://www.improvely.com
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.daterangepicker.dropdown-menu {
|
.daterangepicker.dropdown-menu {
|
||||||
max-width: none;
|
max-width: none;
|
||||||
z-index: 3000;
|
z-index: 3000;
|
||||||
}
|
}
|
||||||
@@ -54,7 +54,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.daterangepicker .calendar th, .daterangepicker .calendar td {
|
.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;
|
white-space: nowrap;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
min-width: 32px;
|
min-width: 32px;
|
||||||
@@ -219,6 +219,22 @@
|
|||||||
content: '';
|
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 {
|
.daterangepicker table {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ var defaultLineChartOptions = {
|
|||||||
color: 'transparent'
|
color: 'transparent'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
fontName: 'Roboto',
|
|
||||||
fontSize: 11,
|
fontSize: 11,
|
||||||
vAxis: {
|
vAxis: {
|
||||||
textStyle: {
|
textStyle: {
|
||||||
@@ -61,7 +60,6 @@ var defaultAreaChartOptions = {
|
|||||||
color: 'transparent'
|
color: 'transparent'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
fontName: 'Roboto',
|
|
||||||
fontSize: 11,
|
fontSize: 11,
|
||||||
vAxis: {
|
vAxis: {
|
||||||
textStyle: {
|
textStyle: {
|
||||||
@@ -85,7 +83,6 @@ var defaultBarChartOptions = {
|
|||||||
format: '\u20AC #'
|
format: '\u20AC #'
|
||||||
|
|
||||||
},
|
},
|
||||||
fontName: 'Roboto',
|
|
||||||
fontSize: 11,
|
fontSize: 11,
|
||||||
colors: ["#357ca5", "#008d4c", "#db8b0b", "#ca195a", "#555299", "#4285f4", "#db4437", "#f4b400", "#0f9d58", "#ab47bc", "#00acc1", "#ff7043", "#9e9d24", "#5c6bc0", "#f06292", "#00796b", "#c2185b"],
|
colors: ["#357ca5", "#008d4c", "#db8b0b", "#ca195a", "#555299", "#4285f4", "#db4437", "#f4b400", "#0f9d58", "#ab47bc", "#00acc1", "#ff7043", "#9e9d24", "#5c6bc0", "#f06292", "#00796b", "#c2185b"],
|
||||||
vAxis: {
|
vAxis: {
|
||||||
@@ -123,7 +120,6 @@ var defaultComboChartOptions = {
|
|||||||
minValue: 0,
|
minValue: 0,
|
||||||
format: '\u20AC #'
|
format: '\u20AC #'
|
||||||
},
|
},
|
||||||
fontName: 'Roboto',
|
|
||||||
colors: ["#357ca5", "#008d4c", "#db8b0b", "#ca195a", "#555299", "#4285f4", "#db4437", "#f4b400", "#0f9d58", "#ab47bc", "#00acc1", "#ff7043", "#9e9d24", "#5c6bc0", "#f06292", "#00796b", "#c2185b"],
|
colors: ["#357ca5", "#008d4c", "#db8b0b", "#ca195a", "#555299", "#4285f4", "#db4437", "#f4b400", "#0f9d58", "#ab47bc", "#00acc1", "#ff7043", "#9e9d24", "#5c6bc0", "#f06292", "#00796b", "#c2185b"],
|
||||||
fontSize: 11,
|
fontSize: 11,
|
||||||
legend: {
|
legend: {
|
||||||
@@ -145,7 +141,6 @@ var defaultColumnChartOptions = {
|
|||||||
width: '85%',
|
width: '85%',
|
||||||
height: '80%'
|
height: '80%'
|
||||||
},
|
},
|
||||||
fontName: 'Roboto',
|
|
||||||
fontSize: 11,
|
fontSize: 11,
|
||||||
hAxis: {
|
hAxis: {
|
||||||
textStyle: {
|
textStyle: {
|
||||||
@@ -181,7 +176,6 @@ var defaultStackedColumnChartOptions = {
|
|||||||
legend: {
|
legend: {
|
||||||
position: 'none'
|
position: 'none'
|
||||||
},
|
},
|
||||||
fontName: 'Roboto',
|
|
||||||
fontSize: 11,
|
fontSize: 11,
|
||||||
isStacked: true,
|
isStacked: true,
|
||||||
colors: ["#357ca5", "#008d4c", "#db8b0b", "#ca195a", "#555299", "#4285f4", "#db4437", "#f4b400", "#0f9d58", "#ab47bc", "#00acc1", "#ff7043", "#9e9d24", "#5c6bc0", "#f06292", "#00796b", "#c2185b"],
|
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%',
|
width: '100%',
|
||||||
height: '100%'
|
height: '100%'
|
||||||
},
|
},
|
||||||
fontName: 'Roboto',
|
|
||||||
fontSize: 11,
|
fontSize: 11,
|
||||||
height: 200,
|
height: 200,
|
||||||
legend: {
|
legend: {
|
||||||
|
|||||||
@@ -23,11 +23,9 @@
|
|||||||
|
|
||||||
<div class="form-group has-feedback">
|
<div class="form-group has-feedback">
|
||||||
<input type="email" name="email" class="form-control" placeholder="Email"/>
|
<input type="email" name="email" class="form-control" placeholder="Email"/>
|
||||||
<span class="glyphicon glyphicon-envelope form-control-feedback"></span>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group has-feedback">
|
<div class="form-group has-feedback">
|
||||||
<input type="password" name="password" class="form-control" placeholder="Password"/>
|
<input type="password" name="password" class="form-control" placeholder="Password"/>
|
||||||
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-xs-8">
|
<div class="col-xs-8">
|
||||||
|
|||||||
@@ -28,7 +28,6 @@
|
|||||||
|
|
||||||
<div class="form-group has-feedback">
|
<div class="form-group has-feedback">
|
||||||
<input type="email" class="form-control" name="email" placeholder="Email"/>
|
<input type="email" class="form-control" name="email" placeholder="Email"/>
|
||||||
<span class="glyphicon glyphicon-envelope form-control-feedback"></span>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|||||||
@@ -23,15 +23,12 @@
|
|||||||
|
|
||||||
<div class="form-group has-feedback">
|
<div class="form-group has-feedback">
|
||||||
<input type="email" name="email" class="form-control" placeholder="Email"/>
|
<input type="email" name="email" class="form-control" placeholder="Email"/>
|
||||||
<span class="glyphicon glyphicon-envelope form-control-feedback"></span>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group has-feedback">
|
<div class="form-group has-feedback">
|
||||||
<input type="password" class="form-control" placeholder="Password" name="password"/>
|
<input type="password" class="form-control" placeholder="Password" name="password"/>
|
||||||
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group has-feedback">
|
<div class="form-group has-feedback">
|
||||||
<input type="password" class="form-control" placeholder="Retype password" name="password_confirmation"/>
|
<input type="password" class="form-control" placeholder="Retype password" name="password_confirmation"/>
|
||||||
<span class="glyphicon glyphicon-log-in form-control-feedback"></span>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-xs-12">
|
<div class="col-xs-12">
|
||||||
|
|||||||
@@ -20,8 +20,8 @@
|
|||||||
</td>
|
</td>
|
||||||
<td style="text-align:right;width:40px;">
|
<td style="text-align:right;width:40px;">
|
||||||
{% if piggyBank.savedSoFar > 0 %}
|
{% if piggyBank.savedSoFar > 0 %}
|
||||||
<a href="{{ route('piggy-banks.removeMoney', piggyBank.id) }}" class="btn btn-default btn-xs removeMoney" data-id="{{ piggyBank.id }}"><span
|
<a href="{{ route('piggy-banks.removeMoney', piggyBank.id) }}" class="btn btn-default btn-xs removeMoney" data-id="{{ piggyBank.id }}">
|
||||||
data-id="{{ piggyBank.id }}" class="glyphicon glyphicon-minus"></span></a>
|
<i data-id="{{ piggyBank.id }}" class="fa fa-minus"></i></a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
@@ -43,8 +43,8 @@
|
|||||||
|
|
||||||
<td style="width:40px;">
|
<td style="width:40px;">
|
||||||
{% if piggyBank.leftToSave > 0 %}
|
{% if piggyBank.leftToSave > 0 %}
|
||||||
<a href="{{ route('piggy-banks.addMoney', piggyBank.id) }}" class="btn btn-default btn-xs addMoney" data-id="{{ piggyBank.id }}"><span
|
<a href="{{ route('piggy-banks.addMoney', piggyBank.id) }}" class="btn btn-default btn-xs addMoney" data-id="{{ piggyBank.id }}">
|
||||||
data-id="{{ piggyBank.id }}" class="glyphicon glyphicon-plus"></span></a>
|
<i data-id="{{ piggyBank.id }}" class="fa fa-plus"></i></a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
<td style="width:200px;">
|
<td style="width:200px;">
|
||||||
|
|||||||
Reference in New Issue
Block a user