diff options
| author | Mark Otto <[email protected]> | 2012-01-28 11:22:07 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-28 11:22:07 -0800 |
| commit | 245276825924acd0cfe5f4fd57b0f8b9970b64c3 (patch) | |
| tree | 5d803eec9195de7e19dac304f05eddd1895bc914 /docs | |
| parent | 28ba9d69c82895bbd9a1d66cea855119f4aba349 (diff) | |
| parent | c2c02d104c5e5a96330cf00a727d62687d863e02 (diff) | |
| download | bootstrap-245276825924acd0cfe5f4fd57b0f8b9970b64c3.tar.xz bootstrap-245276825924acd0cfe5f4fd57b0f8b9970b64c3.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/css/bootstrap.css | 2 | ||||
| -rw-r--r-- | docs/assets/js/application.js | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index bc4961b05..5265b14df 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -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 { diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index f4edd6861..8fd672bb3 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -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) |