mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-28 23:59:53 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Otto
2012-01-28 11:22:07 -08:00
parent 28ba9d69c8 c2c02d104c
commit 2452768259
13 changed files with 44 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/assets/css/bootstrap.css vendored
View File

@@ -1983,7 +1983,7 @@ table .span12 {
.navbar-search .search-query :-moz-placeholder {
color: #eeeeee;
}
.navbar-search .search-query ::-webkit-input-placeholder {
.navbar-search .search-query::-webkit-input-placeholder {
color: #eeeeee;
}
.navbar-search .search-query:hover {

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

@@ -14,12 +14,6 @@
// make code pretty
window.prettyPrint && prettyPrint()
// table sort example
if ($.fn.tablesorter) {
$("#sortTableExample").tablesorter({ sortList: [[1,0]] })
$(".tablesorter-example").tablesorter({ sortList: [[1,0]] })
}
// add-ons
$('.add-on :checkbox').on('click', function () {
var $this = $(this)