mirror/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-24 21:40:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1149 from Calvein/2.0-wip

Browse Source 
[base-css] Fixed a nasty "mailto" typo and added jquery.tablesorter
This commit is contained in:
Mark Otto 2012-01-24 16:08:09 -08:00
commit 03d2128f50
2 changed files with 3 additions and 2 deletions
Show Stats 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() window.prettyPrint && prettyPrint()
// table sort example // table sort example
if ($.fn.tableSorter) { if ($.fn.tablesorter) {
$("#sortTableExample").tablesorter( { sortList: [[ 1, 0 ]] } ) $("#sortTableExample").tablesorter( { sortList: [[ 1, 0 ]] } )
$(".tablesorter-example").tablesorter({ sortList: [[1,0]] }) $(".tablesorter-example").tablesorter({ sortList: [[1,0]] })
} }

3
docs/base-css.html
View File

@ -181,7 +181,7 @@
</address> </address>
<address> <address>
<strong>Full Name</strong><br> <strong>Full Name</strong><br>
<a mailto="#">first.last@gmail.com</a> <a href="mailto:#">first.last@gmail.com</a>
</address> </address>
</div> </div>
<div class="span4"> <div class="span4">
@ -1510,6 +1510,7 @@
<!-- <script src="http://code.jquery.com/jquery-1.7.min.js"></script> --> <!-- <script src="http://code.jquery.com/jquery-1.7.min.js"></script> -->
<script src="../js/tests/vendor/jquery.js"></script> <script src="../js/tests/vendor/jquery.js"></script>
<script src="assets/js/google-code-prettify/prettify.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-transition.js"></script>
<script src="../js/bootstrap-alert.js"></script> <script src="../js/bootstrap-alert.js"></script>
<script src="../js/bootstrap-modal.js"></script> <script src="../js/bootstrap-modal.js"></script>