Skip to content

Commit

Permalink
Merge pull request jdorn#72 from uded/gui/bootstrap-upgrade
Browse files Browse the repository at this point in the history
Full Bootstrap 3 migration with couple of optimizations
  • Loading branch information
uded committed Sep 3, 2013
2 parents ae095c6 + 422b65c commit d5f8057
Show file tree
Hide file tree
Showing 33 changed files with 1,339 additions and 936 deletions.
3 changes: 3 additions & 0 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@
});

Flight::route('/set-environment',function() {
header("Content-Type: application/json");
$_SESSION['environment'] = $_REQUEST['environment'];

echo '{ "status": "OK" }';
});

//email report
Expand Down
9 changes: 9 additions & 0 deletions public/css/bootstrap.amelia.min.css

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/css/bootstrap.cerulean.min.css

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/css/bootstrap.cosmo.min.css

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/css/bootstrap.cyborg.min.css

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/css/bootstrap.defualt.min.css

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/css/bootstrap.flatly.min.css

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/css/bootstrap.journal.min.css

Large diffs are not rendered by default.

9 changes: 0 additions & 9 deletions public/css/bootstrap.min.css

This file was deleted.

9 changes: 9 additions & 0 deletions public/css/bootstrap.readable.min.css

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/css/bootstrap.simplex.min.css

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/css/bootstrap.slate.min.css

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/css/bootstrap.spacelab.min.css

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/css/bootstrap.united.min.css

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
.daterangepicker.dropdown-menu {
/*!
* Stylesheet for the Date Range Picker, for use with Bootstrap 3.x
*
* Copyright 2013 Dan Grossman ( http://www.dangrossman.info )
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Built for http://www.improvely.com
*/

.daterangepicker.dropdown-menu {
max-width: none;
}

Expand Down Expand Up @@ -27,27 +37,48 @@

.daterangepicker .calendar {
display: none;
max-width: 230px;
max-width: 270px;
}

.daterangepicker .calendar th, .daterangepicker .calendar td {
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
white-space: nowrap;
text-align: center;
min-width: 32px;
}

.daterangepicker .ranges 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;
text-shadow: 1px 1px 0 #fff;
width: 74px;
}

.daterangepicker .ranges input {
font-size: 11px;
}

.daterangepicker .ranges .input-mini {
background-color: #eee;
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;
Expand All @@ -73,13 +104,19 @@
color: #fff;
}

.daterangepicker .calendar {
.daterangepicker .calendar-date {
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;
}

.daterangepicker {
position: absolute;
background: #fff;
Expand Down Expand Up @@ -157,6 +194,7 @@
.daterangepicker td.off {
color: #999;
}

.daterangepicker td.disabled {
color: #999;
}
Expand All @@ -173,23 +211,34 @@
}

.daterangepicker td.active, .daterangepicker td.active:hover {
background-color: #006dcc;
background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
background-image: -o-linear-gradient(top, #0088cc, #0044cc);
background-image: linear-gradient(top, #0088cc, #0044cc);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
border-color: #0044cc #0044cc #002a80;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-color: #357ebd;
border-color: #3071a9;
color: #fff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
}

.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;
}

.daterangepicker select.monthselect {
margin-right: 2%;
width: 56%;
}

.daterangepicker select.yearselect {
width: 40%;
}

.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.ampmselect {
width: 50px;
margin-bottom: 0;
}
25 changes: 7 additions & 18 deletions public/css/report.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ body {
.database_message {
color: #999;
}
h1 {
margin: 10px 0;
padding: 0;
}
#result_table td .bar{
height: 18px;
display:inline-block;
Expand Down Expand Up @@ -35,10 +31,7 @@ h1 {
.center {
text-align:center;
}
.show_query, #show_time_estimate {
font-size: .8em;
}
#query_holder {
.show_query, #show_time_estimate, #query_holder {
font-size: .8em;
}
.waiting div {
Expand All @@ -61,16 +54,12 @@ pre {
body {
padding-top: 0 !important;
}
.navbar-fixed-top {
display: none !important;
}
#variable_form .btn-primary {
display: none !important;
}
#content .export_links {
display: none !important;
}
#report_content a[data-role="button"] {
.navbar-fixed-top ,
#variable_form .btn-primary,
#content .export_links,
#report_content a[data-role="button"],
a[data-role="button"][data-target="#time_estimate_holder"],
#report_content .dataTables_filter {
display: none !important;
}
}
6 changes: 6 additions & 0 deletions public/js/bootstrap-3.0.min.js

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions public/js/bootstrap.min.js

This file was deleted.

Loading

0 comments on commit d5f8057

Please sign in to comment.