kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-15 22:28:14 +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

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

@@ -7,42 +7,42 @@
* 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;
} }
.daterangepicker.opensleft .ranges, .daterangepicker.opensleft .calendar { .daterangepicker.opensleft .ranges, .daterangepicker.opensleft .calendar {
float: left; float: left;
margin: 4px; margin: 4px;
} }
.daterangepicker.opensright .ranges, .daterangepicker.opensright .calendar, .daterangepicker.opensright .ranges, .daterangepicker.opensright .calendar,
.daterangepicker.openscenter .ranges, .daterangepicker.openscenter .calendar { .daterangepicker.openscenter .ranges, .daterangepicker.openscenter .calendar {
float: right; float: right;
margin: 4px; margin: 4px;
} }
.daterangepicker.single .ranges, .daterangepicker.single .calendar { .daterangepicker.single .ranges, .daterangepicker.single .calendar {
float: none; float: none;
} }
.daterangepicker .ranges { .daterangepicker .ranges {
width: 160px; width: 160px;
text-align: left; text-align: left;
} }
.daterangepicker .ranges .range_inputs>div { .daterangepicker .ranges .range_inputs>div {
float: left; float: left;
} }
.daterangepicker .ranges .range_inputs>div:nth-child(2) { .daterangepicker .ranges .range_inputs>div:nth-child(2) {
padding-left: 11px; padding-left: 11px;
} }
.daterangepicker .calendar { .daterangepicker .calendar {
display: none; display: none;
max-width: 270px; max-width: 270px;
} }
.daterangepicker.show-calendar .calendar { .daterangepicker.show-calendar .calendar {
@@ -50,270 +50,286 @@
} }
.daterangepicker .calendar.single .calendar-date { .daterangepicker .calendar.single .calendar-date {
border: none; border: none;
} }
.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;
} }
.daterangepicker .daterangepicker_start_input label, .daterangepicker .daterangepicker_start_input label,
.daterangepicker .daterangepicker_end_input label { .daterangepicker .daterangepicker_end_input label {
color: #333; color: #333;
display: block; display: block;
font-size: 11px; font-size: 11px;
font-weight: normal; font-weight: normal;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
margin-bottom: 2px; margin-bottom: 2px;
text-shadow: #fff 1px 1px 0px; text-shadow: #fff 1px 1px 0px;
text-transform: uppercase; text-transform: uppercase;
width: 74px; width: 74px;
} }
.daterangepicker .ranges input { .daterangepicker .ranges input {
font-size: 11px; font-size: 11px;
} }
.daterangepicker .ranges .input-mini { .daterangepicker .ranges .input-mini {
border: 1px solid #ccc; border: 1px solid #ccc;
border-radius: 4px; border-radius: 4px;
color: #555; color: #555;
display: block; display: block;
font-size: 11px; font-size: 11px;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
vertical-align: middle; vertical-align: middle;
margin: 0 0 10px 0; margin: 0 0 10px 0;
padding: 0 6px; padding: 0 6px;
width: 74px; width: 74px;
} }
.daterangepicker .ranges ul { .daterangepicker .ranges ul {
list-style: none; list-style: none;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
.daterangepicker .ranges li { .daterangepicker .ranges li {
font-size: 13px; font-size: 13px;
background: #f5f5f5; background: #f5f5f5;
border: 1px solid #f5f5f5; border: 1px solid #f5f5f5;
color: #08c; color: #08c;
padding: 3px 12px; padding: 3px 12px;
margin-bottom: 8px; margin-bottom: 8px;
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
-moz-border-radius: 5px; -moz-border-radius: 5px;
border-radius: 5px; border-radius: 5px;
cursor: pointer; cursor: pointer;
} }
.daterangepicker .ranges li.active, .daterangepicker .ranges li:hover { .daterangepicker .ranges li.active, .daterangepicker .ranges li:hover {
background: #08c; background: #08c;
border: 1px solid #08c; border: 1px solid #08c;
color: #fff; color: #fff;
} }
.daterangepicker .calendar-date { .daterangepicker .calendar-date {
border: 1px solid #ddd; border: 1px solid #ddd;
padding: 4px; padding: 4px;
border-radius: 4px; border-radius: 4px;
background: #fff; background: #fff;
} }
.daterangepicker .calendar-time { .daterangepicker .calendar-time {
text-align: center; text-align: center;
margin: 8px auto 0 auto; margin: 8px auto 0 auto;
line-height: 30px; line-height: 30px;
} }
.daterangepicker { .daterangepicker {
position: absolute; position: absolute;
background: #fff; background: #fff;
top: 100px; top: 100px;
left: 20px; left: 20px;
padding: 4px; padding: 4px;
margin-top: 1px; margin-top: 1px;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
} }
.daterangepicker.opensleft:before { .daterangepicker.opensleft:before {
position: absolute; position: absolute;
top: -7px; top: -7px;
right: 9px; right: 9px;
display: inline-block; display: inline-block;
border-right: 7px solid transparent; border-right: 7px solid transparent;
border-bottom: 7px solid #ccc; border-bottom: 7px solid #ccc;
border-left: 7px solid transparent; border-left: 7px solid transparent;
border-bottom-color: rgba(0, 0, 0, 0.2); border-bottom-color: rgba(0, 0, 0, 0.2);
content: ''; content: '';
} }
.daterangepicker.opensleft:after { .daterangepicker.opensleft:after {
position: absolute; position: absolute;
top: -6px; top: -6px;
right: 10px; right: 10px;
display: inline-block; display: inline-block;
border-right: 6px solid transparent; border-right: 6px solid transparent;
border-bottom: 6px solid #fff; border-bottom: 6px solid #fff;
border-left: 6px solid transparent; border-left: 6px solid transparent;
content: ''; content: '';
} }
.daterangepicker.openscenter:before { .daterangepicker.openscenter:before {
position: absolute; position: absolute;
top: -7px; top: -7px;
left: 0; left: 0;
right: 0; right: 0;
width: 0; width: 0;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
display: inline-block; display: inline-block;
border-right: 7px solid transparent; border-right: 7px solid transparent;
border-bottom: 7px solid #ccc; border-bottom: 7px solid #ccc;
border-left: 7px solid transparent; border-left: 7px solid transparent;
border-bottom-color: rgba(0, 0, 0, 0.2); border-bottom-color: rgba(0, 0, 0, 0.2);
content: ''; content: '';
} }
.daterangepicker.openscenter:after { .daterangepicker.openscenter:after {
position: absolute; position: absolute;
top: -6px; top: -6px;
left: 0; left: 0;
right: 0; right: 0;
width: 0; width: 0;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
display: inline-block; display: inline-block;
border-right: 6px solid transparent; border-right: 6px solid transparent;
border-bottom: 6px solid #fff; border-bottom: 6px solid #fff;
border-left: 6px solid transparent; border-left: 6px solid transparent;
content: ''; content: '';
} }
.daterangepicker.opensright:before { .daterangepicker.opensright:before {
position: absolute; position: absolute;
top: -7px; top: -7px;
left: 9px; left: 9px;
display: inline-block; display: inline-block;
border-right: 7px solid transparent; border-right: 7px solid transparent;
border-bottom: 7px solid #ccc; border-bottom: 7px solid #ccc;
border-left: 7px solid transparent; border-left: 7px solid transparent;
border-bottom-color: rgba(0, 0, 0, 0.2); border-bottom-color: rgba(0, 0, 0, 0.2);
content: ''; content: '';
} }
.daterangepicker.opensright:after { .daterangepicker.opensright:after {
position: absolute; position: absolute;
top: -6px; top: -6px;
left: 10px; left: 10px;
display: inline-block; display: inline-block;
border-right: 6px solid transparent; border-right: 6px solid transparent;
border-bottom: 6px solid #fff; border-bottom: 6px solid #fff;
border-left: 6px solid transparent; border-left: 6px solid transparent;
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;
} }
.daterangepicker td, .daterangepicker th { .daterangepicker td, .daterangepicker th {
text-align: center; text-align: center;
width: 20px; width: 20px;
height: 20px; height: 20px;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
cursor: pointer; cursor: pointer;
white-space: nowrap; white-space: nowrap;
} }
.daterangepicker td.off { .daterangepicker td.off {
color: #999; color: #999;
} }
.daterangepicker td.disabled, .daterangepicker option.disabled { .daterangepicker td.disabled, .daterangepicker option.disabled {
color: #999; color: #999;
} }
.daterangepicker td.available:hover, .daterangepicker th.available:hover { .daterangepicker td.available:hover, .daterangepicker th.available:hover {
background: #eee; background: #eee;
} }
.daterangepicker td.in-range { .daterangepicker td.in-range {
background: #ebf4f8; background: #ebf4f8;
-webkit-border-radius: 0; -webkit-border-radius: 0;
-moz-border-radius: 0; -moz-border-radius: 0;
border-radius: 0; border-radius: 0;
} }
.daterangepicker td.start-date { .daterangepicker td.start-date {
-webkit-border-radius: 4px 0 0 4px; -webkit-border-radius: 4px 0 0 4px;
-moz-border-radius: 4px 0 0 4px; -moz-border-radius: 4px 0 0 4px;
border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px;
} }
.daterangepicker td.end-date { .daterangepicker td.end-date {
-webkit-border-radius: 0 4px 4px 0; -webkit-border-radius: 0 4px 4px 0;
-moz-border-radius: 0 4px 4px 0; -moz-border-radius: 0 4px 4px 0;
border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0;
} }
.daterangepicker td.start-date.end-date { .daterangepicker td.start-date.end-date {
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
} }
.daterangepicker td.active, .daterangepicker td.active:hover { .daterangepicker td.active, .daterangepicker td.active:hover {
background-color: #357ebd; background-color: #357ebd;
border-color: #3071a9; border-color: #3071a9;
color: #fff; color: #fff;
} }
.daterangepicker td.week, .daterangepicker th.week { .daterangepicker td.week, .daterangepicker th.week {
font-size: 80%; font-size: 80%;
color: #ccc; color: #ccc;
} }
.daterangepicker select.monthselect, .daterangepicker select.yearselect { .daterangepicker select.monthselect, .daterangepicker select.yearselect {
font-size: 12px; font-size: 12px;
padding: 1px; padding: 1px;
height: auto; height: auto;
margin: 0; margin: 0;
cursor: default; cursor: default;
} }
.daterangepicker select.monthselect { .daterangepicker select.monthselect {
margin-right: 2%; margin-right: 2%;
width: 56%; width: 56%;
} }
.daterangepicker select.yearselect { .daterangepicker select.yearselect {
width: 40%; width: 40%;
} }
.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.secondselect, .daterangepicker select.ampmselect { .daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.secondselect, .daterangepicker select.ampmselect {
width: 50px; width: 50px;
margin-bottom: 0; margin-bottom: 0;
} }
.daterangepicker_start_input { .daterangepicker_start_input {
float: left; float: left;
} }
.daterangepicker_end_input { .daterangepicker_end_input {
float: left; float: left;
padding-left: 11px padding-left: 11px
} }
.daterangepicker th.month { .daterangepicker th.month {
width: auto; width: auto;
} }

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

@@ -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: {

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

@@ -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">

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

@@ -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">

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

@@ -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">

2
resources/twig/errors/404.twig
View File

@@ -71,4 +71,4 @@
</div> </div>
</body> </body>
</html> </html>

2
resources/twig/layout/default.twig
View File

@@ -161,4 +161,4 @@
</body> </body>
</html> </html>

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

@@ -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;">

2
resources/twig/new-user/index.twig
View File

@@ -47,4 +47,4 @@
</form> </form>
{% endblock %} {% endblock %}

2
resources/twig/partials/boxes.twig
View File

@@ -48,4 +48,4 @@
</div><!-- /.info-box-content --> </div><!-- /.info-box-content -->
</div><!-- /.info-box --> </div><!-- /.info-box -->
</div><!-- /.col --> </div><!-- /.col -->
</div><!-- /.row --> </div><!-- /.row -->

2
resources/twig/partials/menu-sidebar.twig
View File

@@ -140,4 +140,4 @@
</a> </a>
</li> </li>
</ul> </ul>

2
resources/twig/partials/page-header.twig
View File

@@ -11,4 +11,4 @@
{{ subTitle }} {{ subTitle }}
</small> </small>
{% endif %} {% endif %}
</h1> </h1>