Skip to content

Commit

Permalink
Merge branch 'PR-827_tablesorter_update' into development
Browse files Browse the repository at this point in the history
* PR-827_tablesorter_update: closes gh-827
  Upgrade tablesorter 2.14 -> 2.16.3 Fix IE css bug on table
  • Loading branch information
Patrick Vos committed May 5, 2014
2 parents d4d3698 + 83c1d9b commit 4b0fced
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 25 deletions.
4 changes: 3 additions & 1 deletion data/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,9 @@ thead.tablesorter-stickyHeader {
background-color: #dfdacf;
}
/* filter widget */
.tablesorter .filtered {
display: none;
}
.tablesorter input.tablesorter-filter {
width: 98%;
height: auto;
Expand Down Expand Up @@ -981,7 +984,6 @@ td.tvShow a {
text-decoration: none;
display: block;
width: 100%;
height: 100%;
}
td.tvShow:hover a {
color:#000;
Expand Down
4 changes: 2 additions & 2 deletions data/interfaces/default/inc_top.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@
<script type="text/javascript" src="$sbRoot/js/lib/jquery-ui-1.10.4.custom.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.cookie.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.selectboxes.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.tablesorter-2.14.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.tablesorter.widgets-2.14.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.tablesorter-2.16.3.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.tablesorter.widgets-2.16.3.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.qtip-2012-04-26.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.pnotify-1.2.2.min.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.form-3.50.js?$sbPID"></script>
Expand Down
5 changes: 0 additions & 5 deletions data/js/lib/jquery.tablesorter-2.14.min.js

This file was deleted.

5 changes: 5 additions & 0 deletions data/js/lib/jquery.tablesorter-2.16.3.min.js

Large diffs are not rendered by default.

17 changes: 0 additions & 17 deletions data/js/lib/jquery.tablesorter.widgets-2.14.min.js

This file was deleted.

17 changes: 17 additions & 0 deletions data/js/lib/jquery.tablesorter.widgets-2.16.3.min.js

Large diffs are not rendered by default.

0 comments on commit 4b0fced

Please sign in to comment.