Commit b2cc506d authored by Leo Iannacone's avatar Leo Iannacone

Merge remote-tracking branch 'github/master' into portable

parents 1e660d8a 2ba8f2e3
...@@ -77,7 +77,7 @@ function Page_History() { ...@@ -77,7 +77,7 @@ function Page_History() {
function _sort_table() { function _sort_table() {
// create the theme for tablesorter // create the theme for tablesorter
$.extend($.tablesorter.themes.bootstrap, { $.extend($.tablesorter.themes.bootstrap, {
table: 'table table-condensed table-bordered table-striped', table: 'table table-condensed table-bordered',
caption: 'caption', caption: 'caption',
header: 'bootstrap-header', header: 'bootstrap-header',
sortNone: 'bootstrap-icon-unsorted', sortNone: 'bootstrap-icon-unsorted',
...@@ -90,10 +90,13 @@ function Page_History() { ...@@ -90,10 +90,13 @@ function Page_History() {
theme: "bootstrap", theme: "bootstrap",
widthFixed: true, widthFixed: true,
headerTemplate: '{content} {icon}', headerTemplate: '{content} {icon}',
widgets: ["uitheme", "filter"],
sortList: [ sortList: [
[3, 1] [3, 1]
] ],
widgets: ["uitheme", "filter", "zebra"],
widgetOptions: {
zebra: ["normal-row", "alt-row"],
}
}); });
// add some fancy class to input fields // add some fancy class to input fields
......
...@@ -280,6 +280,10 @@ footer .info { ...@@ -280,6 +280,10 @@ footer .info {
margin-top: 15px; margin-top: 15px;
} }
#history .alt-row {
background: #F9F9F9;
}
/* add more colors to graphs */ /* add more colors to graphs */
.ct-series-e .ct-bar, .ct-series-e .ct-bar,
.ct-chart .ct-series.ct-series-e .ct-line, .ct-chart .ct-series.ct-series-e .ct-line,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment