github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-04-24 03:00:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Browse Source 
Conflicts:
	docs/index.html
	docs/templates/pages/index.mustache
This commit is contained in:
Mark Otto
2012-01-24 16:09:32 -08:00
parent 8ff621aa26 03d2128f50
commit 7e6797880a
5 changed files with 346 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/assets/js/application.js
View File

@@ -22,7 +22,7 @@ $(function(){
window.prettyPrint && prettyPrint()
// table sort example
if ($.fn.tableSorter) {
if ($.fn.tablesorter) {
$("#sortTableExample").tablesorter( { sortList: [[ 1, 0 ]] } )
$(".tablesorter-example").tablesorter({ sortList: [[1,0]] })
}