aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-24 16:08:09 -0800
committerMark Otto <[email protected]>2012-01-24 16:08:09 -0800
commit03d2128f5072791ca4578a4e50a4540df7c9d121 (patch)
treeec0f9f09b3240ad7e853c6819238e210fbece1ff
parent655a96869c9ba1c678eddc961332b9dd0fccb8af (diff)
parent5fb31670af6df88afb0a82872b6f7935486f91c2 (diff)
downloadbootstrap-03d2128f5072791ca4578a4e50a4540df7c9d121.tar.xz
bootstrap-03d2128f5072791ca4578a4e50a4540df7c9d121.zip
Merge pull request #1149 from Calvein/2.0-wip
[base-css] Fixed a nasty "mailto" typo and added jquery.tablesorter
-rw-r--r--docs/assets/js/application.js2
-rw-r--r--docs/base-css.html3
2 files changed, 3 insertions, 2 deletions
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index 2da4ab8e2..95caa0f31 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -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]] })
}
diff --git a/docs/base-css.html b/docs/base-css.html
index 92117b80e..0f24e0bb7 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -181,7 +181,7 @@
</address>
<address>
<strong>Full Name</strong><br>
- <a mailto="#">[email protected]</a>
+ <a href="mailto:#">[email protected]</a>
</address>
</div>
<div class="span4">
@@ -1510,6 +1510,7 @@
<!-- <script src="http://code.jquery.com/jquery-1.7.min.js"></script> -->
<script src="../js/tests/vendor/jquery.js"></script>
<script src="assets/js/google-code-prettify/prettify.js"></script>
+ <script src="assets/js/jquery.tablesorter.js"></script>
<script src="../js/bootstrap-transition.js"></script>
<script src="../js/bootstrap-alert.js"></script>
<script src="../js/bootstrap-modal.js"></script>