From a7555bcce30021e70c65f9e80ec4a755ac719630 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Tue, 23 Jun 2015 19:07:37 +0200
Subject: [PATCH] Some layout and file updates.

---
 public/css/daterangepicker-bs3.css        | 372 +++++++++++-----------
 public/js/gcharts.options.js              |   7 -
 resources/twig/auth/login.twig            |   2 -
 resources/twig/auth/password.twig         |   1 -
 resources/twig/auth/register.twig         |   3 -
 resources/twig/errors/404.twig            |   2 +-
 resources/twig/layout/default.twig        |   2 +-
 resources/twig/list/piggy-banks.twig      |   8 +-
 resources/twig/new-user/index.twig        |   2 +-
 resources/twig/partials/boxes.twig        |   2 +-
 resources/twig/partials/menu-sidebar.twig |   2 +-
 resources/twig/partials/page-header.twig  |   2 +-
 12 files changed, 204 insertions(+), 201 deletions(-)

diff --git a/public/css/daterangepicker-bs3.css b/public/css/daterangepicker-bs3.css
index 5ced259f40..431c2e6bc7 100755
--- a/public/css/daterangepicker-bs3.css
+++ b/public/css/daterangepicker-bs3.css
@@ -7,42 +7,42 @@
  * Built for http://www.improvely.com
  */
 
- .daterangepicker.dropdown-menu {
-  max-width: none;
-  z-index: 3000;
+.daterangepicker.dropdown-menu {
+    max-width: none;
+    z-index: 3000;
 }
 
 .daterangepicker.opensleft .ranges, .daterangepicker.opensleft .calendar {
-  float: left;
-  margin: 4px;
+    float: left;
+    margin: 4px;
 }
 
 .daterangepicker.opensright .ranges, .daterangepicker.opensright .calendar,
 .daterangepicker.openscenter .ranges, .daterangepicker.openscenter .calendar {
-  float: right;
-  margin: 4px;
+    float: right;
+    margin: 4px;
 }
 
 .daterangepicker.single .ranges, .daterangepicker.single .calendar {
-  float: none;
+    float: none;
 }
 
 .daterangepicker .ranges {
-  width: 160px;
-  text-align: left;
+    width: 160px;
+    text-align: left;
 }
 
 .daterangepicker .ranges .range_inputs>div {
-  float: left;
+    float: left;
 }
 
 .daterangepicker .ranges .range_inputs>div:nth-child(2) {
-  padding-left: 11px;
+    padding-left: 11px;
 }
 
 .daterangepicker .calendar {
-  display: none;
-  max-width: 270px;
+    display: none;
+    max-width: 270px;
 }
 
 .daterangepicker.show-calendar .calendar {
@@ -50,270 +50,286 @@
 }
 
 .daterangepicker .calendar.single .calendar-date {
-  border: none;
+    border: none;
 }
 
 .daterangepicker .calendar th, .daterangepicker .calendar td {
-  font-family: Roboto, 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  white-space: nowrap;
-  text-align: center;
-  min-width: 32px;
+    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+    white-space: nowrap;
+    text-align: center;
+    min-width: 32px;
 }
 
 .daterangepicker .daterangepicker_start_input label,
 .daterangepicker .daterangepicker_end_input label {
-  color: #333;
-  display: block;
-  font-size: 11px;
-  font-weight: normal;
-  height: 20px;
-  line-height: 20px;
-  margin-bottom: 2px;
-  text-shadow: #fff 1px 1px 0px;
-  text-transform: uppercase;
-  width: 74px;
+    color: #333;
+    display: block;
+    font-size: 11px;
+    font-weight: normal;
+    height: 20px;
+    line-height: 20px;
+    margin-bottom: 2px;
+    text-shadow: #fff 1px 1px 0px;
+    text-transform: uppercase;
+    width: 74px;
 }
 
 .daterangepicker .ranges input {
-  font-size: 11px;
+    font-size: 11px;
 }
 
 .daterangepicker .ranges .input-mini {
-  border: 1px solid #ccc;
-  border-radius: 4px;
-  color: #555;
-  display: block;
-  font-size: 11px;
-  height: 30px;
-  line-height: 30px;
-  vertical-align: middle;
-  margin: 0 0 10px 0;
-  padding: 0 6px;
-  width: 74px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    color: #555;
+    display: block;
+    font-size: 11px;
+    height: 30px;
+    line-height: 30px;
+    vertical-align: middle;
+    margin: 0 0 10px 0;
+    padding: 0 6px;
+    width: 74px;
 }
 
 .daterangepicker .ranges ul {
-  list-style: none;
-  margin: 0;
-  padding: 0;
+    list-style: none;
+    margin: 0;
+    padding: 0;
 }
 
 .daterangepicker .ranges li {
-  font-size: 13px;
-  background: #f5f5f5;
-  border: 1px solid #f5f5f5;
-  color: #08c;
-  padding: 3px 12px;
-  margin-bottom: 8px;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-  cursor: pointer;
+    font-size: 13px;
+    background: #f5f5f5;
+    border: 1px solid #f5f5f5;
+    color: #08c;
+    padding: 3px 12px;
+    margin-bottom: 8px;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    cursor: pointer;
 }
 
 .daterangepicker .ranges li.active, .daterangepicker .ranges li:hover {
-  background: #08c;
-  border: 1px solid #08c;
-  color: #fff;
+    background: #08c;
+    border: 1px solid #08c;
+    color: #fff;
 }
 
 .daterangepicker .calendar-date {
-  border: 1px solid #ddd;
-  padding: 4px;
-  border-radius: 4px;
-  background: #fff;
+    border: 1px solid #ddd;
+    padding: 4px;
+    border-radius: 4px;
+    background: #fff;
 }
 
 .daterangepicker .calendar-time {
-  text-align: center;
-  margin: 8px auto 0 auto;
-  line-height: 30px;
+    text-align: center;
+    margin: 8px auto 0 auto;
+    line-height: 30px;
 }
 
 .daterangepicker {
-  position: absolute;
-  background: #fff;
-  top: 100px;
-  left: 20px;
-  padding: 4px;
-  margin-top: 1px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
+    position: absolute;
+    background: #fff;
+    top: 100px;
+    left: 20px;
+    padding: 4px;
+    margin-top: 1px;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
 }
 
 .daterangepicker.opensleft:before {
-  position: absolute;
-  top: -7px;
-  right: 9px;
-  display: inline-block;
-  border-right: 7px solid transparent;
-  border-bottom: 7px solid #ccc;
-  border-left: 7px solid transparent;
-  border-bottom-color: rgba(0, 0, 0, 0.2);
-  content: '';
+    position: absolute;
+    top: -7px;
+    right: 9px;
+    display: inline-block;
+    border-right: 7px solid transparent;
+    border-bottom: 7px solid #ccc;
+    border-left: 7px solid transparent;
+    border-bottom-color: rgba(0, 0, 0, 0.2);
+    content: '';
 }
 
 .daterangepicker.opensleft:after {
-  position: absolute;
-  top: -6px;
-  right: 10px;
-  display: inline-block;
-  border-right: 6px solid transparent;
-  border-bottom: 6px solid #fff;
-  border-left: 6px solid transparent;
-  content: '';
+    position: absolute;
+    top: -6px;
+    right: 10px;
+    display: inline-block;
+    border-right: 6px solid transparent;
+    border-bottom: 6px solid #fff;
+    border-left: 6px solid transparent;
+    content: '';
 }
 
 .daterangepicker.openscenter:before {
-  position: absolute;
-  top: -7px;
-  left: 0;  
-  right: 0;
-  width: 0;
-  margin-left: auto;
-  margin-right: auto;
-  display: inline-block;
-  border-right: 7px solid transparent;
-  border-bottom: 7px solid #ccc;
-  border-left: 7px solid transparent;
-  border-bottom-color: rgba(0, 0, 0, 0.2);
-  content: '';
+    position: absolute;
+    top: -7px;
+    left: 0;
+    right: 0;
+    width: 0;
+    margin-left: auto;
+    margin-right: auto;
+    display: inline-block;
+    border-right: 7px solid transparent;
+    border-bottom: 7px solid #ccc;
+    border-left: 7px solid transparent;
+    border-bottom-color: rgba(0, 0, 0, 0.2);
+    content: '';
 }
 
 .daterangepicker.openscenter:after {
-  position: absolute;
-  top: -6px;
-  left: 0;  
-  right: 0;  
-  width: 0;
-  margin-left: auto;
-  margin-right: auto;
-  display: inline-block;
-  border-right: 6px solid transparent;
-  border-bottom: 6px solid #fff;
-  border-left: 6px solid transparent;
-  content: '';
+    position: absolute;
+    top: -6px;
+    left: 0;
+    right: 0;
+    width: 0;
+    margin-left: auto;
+    margin-right: auto;
+    display: inline-block;
+    border-right: 6px solid transparent;
+    border-bottom: 6px solid #fff;
+    border-left: 6px solid transparent;
+    content: '';
 }
 
 .daterangepicker.opensright:before {
-  position: absolute;
-  top: -7px;
-  left: 9px;
-  display: inline-block;
-  border-right: 7px solid transparent;
-  border-bottom: 7px solid #ccc;
-  border-left: 7px solid transparent;
-  border-bottom-color: rgba(0, 0, 0, 0.2);
-  content: '';
+    position: absolute;
+    top: -7px;
+    left: 9px;
+    display: inline-block;
+    border-right: 7px solid transparent;
+    border-bottom: 7px solid #ccc;
+    border-left: 7px solid transparent;
+    border-bottom-color: rgba(0, 0, 0, 0.2);
+    content: '';
 }
 
 .daterangepicker.opensright:after {
-  position: absolute;
-  top: -6px;
-  left: 10px;
-  display: inline-block;
-  border-right: 6px solid transparent;
-  border-bottom: 6px solid #fff;
-  border-left: 6px solid transparent;
-  content: '';
+    position: absolute;
+    top: -6px;
+    left: 10px;
+    display: inline-block;
+    border-right: 6px solid transparent;
+    border-bottom: 6px solid #fff;
+    border-left: 6px solid transparent;
+    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;
+    width: 100%;
+    margin: 0;
 }
 
 .daterangepicker td, .daterangepicker th {
-  text-align: center;
-  width: 20px;
-  height: 20px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  cursor: pointer;
-  white-space: nowrap;
+    text-align: center;
+    width: 20px;
+    height: 20px;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    cursor: pointer;
+    white-space: nowrap;
 }
 
 .daterangepicker td.off {
-  color: #999;
+    color: #999;
 }
 
 .daterangepicker td.disabled, .daterangepicker option.disabled {
-  color: #999;
+    color: #999;
 }
 
 .daterangepicker td.available:hover, .daterangepicker th.available:hover {
-  background: #eee;
+    background: #eee;
 }
 
 .daterangepicker td.in-range {
-  background: #ebf4f8;
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
+    background: #ebf4f8;
+    -webkit-border-radius: 0;
+    -moz-border-radius: 0;
+    border-radius: 0;
 }
 
 .daterangepicker td.start-date {
-  -webkit-border-radius: 4px 0 0 4px;
-  -moz-border-radius: 4px 0 0 4px;
-  border-radius: 4px 0 0 4px;
+    -webkit-border-radius: 4px 0 0 4px;
+    -moz-border-radius: 4px 0 0 4px;
+    border-radius: 4px 0 0 4px;
 }
 
 .daterangepicker td.end-date {
-  -webkit-border-radius: 0 4px 4px 0;
-  -moz-border-radius: 0 4px 4px 0;
-  border-radius: 0 4px 4px 0;
+    -webkit-border-radius: 0 4px 4px 0;
+    -moz-border-radius: 0 4px 4px 0;
+    border-radius: 0 4px 4px 0;
 }
 
 .daterangepicker td.start-date.end-date {
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
 }
 
 .daterangepicker td.active, .daterangepicker td.active:hover {
-  background-color: #357ebd;
-  border-color: #3071a9;
-  color: #fff;
+    background-color: #357ebd;
+    border-color: #3071a9;
+    color: #fff;
 }
 
 .daterangepicker td.week, .daterangepicker th.week {
-  font-size: 80%;
-  color: #ccc;
+    font-size: 80%;
+    color: #ccc;
 }
 
 .daterangepicker select.monthselect, .daterangepicker select.yearselect {
-  font-size: 12px;
-  padding: 1px;
-  height: auto;
-  margin: 0;
-  cursor: default;
+    font-size: 12px;
+    padding: 1px;
+    height: auto;
+    margin: 0;
+    cursor: default;
 }
 
 .daterangepicker select.monthselect {
-  margin-right: 2%;
-  width: 56%;
+    margin-right: 2%;
+    width: 56%;
 }
 
 .daterangepicker select.yearselect {
-  width: 40%;
+    width: 40%;
 }
 
 .daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.secondselect, .daterangepicker select.ampmselect {
-  width: 50px;
-  margin-bottom: 0;
+    width: 50px;
+    margin-bottom: 0;
 }
 
 .daterangepicker_start_input {
-  float: left;
+    float: left;
 }
 
 .daterangepicker_end_input {
-  float: left; 
-  padding-left: 11px
+    float: left;
+    padding-left: 11px
 }
 
 .daterangepicker th.month {
-  width: auto;
-}
+    width: auto;
+}
\ No newline at end of file
diff --git a/public/js/gcharts.options.js b/public/js/gcharts.options.js
index 5c85cfa711..7d23c26fda 100644
--- a/public/js/gcharts.options.js
+++ b/public/js/gcharts.options.js
@@ -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: {
diff --git a/resources/twig/auth/login.twig b/resources/twig/auth/login.twig
index 59b52f7a25..56afdcc0c4 100644
--- a/resources/twig/auth/login.twig
+++ b/resources/twig/auth/login.twig
@@ -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">
diff --git a/resources/twig/auth/password.twig b/resources/twig/auth/password.twig
index a0af6bfcac..b7b8b43b0c 100644
--- a/resources/twig/auth/password.twig
+++ b/resources/twig/auth/password.twig
@@ -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">
diff --git a/resources/twig/auth/register.twig b/resources/twig/auth/register.twig
index ab329d2bee..7b1ca9a6ae 100644
--- a/resources/twig/auth/register.twig
+++ b/resources/twig/auth/register.twig
@@ -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">
diff --git a/resources/twig/errors/404.twig b/resources/twig/errors/404.twig
index 00a360d391..41e88394a5 100644
--- a/resources/twig/errors/404.twig
+++ b/resources/twig/errors/404.twig
@@ -71,4 +71,4 @@
 
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/resources/twig/layout/default.twig b/resources/twig/layout/default.twig
index a1f16b48a6..750e8b33f2 100644
--- a/resources/twig/layout/default.twig
+++ b/resources/twig/layout/default.twig
@@ -161,4 +161,4 @@
 
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/resources/twig/list/piggy-banks.twig b/resources/twig/list/piggy-banks.twig
index 47e1b7c9d9..12a864bf04 100644
--- a/resources/twig/list/piggy-banks.twig
+++ b/resources/twig/list/piggy-banks.twig
@@ -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;">
diff --git a/resources/twig/new-user/index.twig b/resources/twig/new-user/index.twig
index 42b0cf6a4d..7dbb572dcc 100644
--- a/resources/twig/new-user/index.twig
+++ b/resources/twig/new-user/index.twig
@@ -47,4 +47,4 @@
     </form>
 
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/resources/twig/partials/boxes.twig b/resources/twig/partials/boxes.twig
index dfc2b964a9..11f159ba38 100644
--- a/resources/twig/partials/boxes.twig
+++ b/resources/twig/partials/boxes.twig
@@ -48,4 +48,4 @@
             </div><!-- /.info-box-content -->
         </div><!-- /.info-box -->
     </div><!-- /.col -->
-</div><!-- /.row -->
\ No newline at end of file
+</div><!-- /.row -->
diff --git a/resources/twig/partials/menu-sidebar.twig b/resources/twig/partials/menu-sidebar.twig
index 5ae477bc1b..5fd0f077be 100644
--- a/resources/twig/partials/menu-sidebar.twig
+++ b/resources/twig/partials/menu-sidebar.twig
@@ -140,4 +140,4 @@
         </a>
     </li>
 
-</ul>
\ No newline at end of file
+</ul>
diff --git a/resources/twig/partials/page-header.twig b/resources/twig/partials/page-header.twig
index 4f05424a56..a5f296d721 100644
--- a/resources/twig/partials/page-header.twig
+++ b/resources/twig/partials/page-header.twig
@@ -11,4 +11,4 @@
             {{ subTitle }}
         </small>
     {% endif %}
-</h1>
\ No newline at end of file
+</h1>