From: Jacob Thornton Date: Fri, 23 Dec 2011 03:15:09 +0000 (-0800) Subject: Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip X-Git-Tag: v2.0.0~6^2~387^2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35fdbad24b908714ff1a1221945598527a641863;p=thirdparty%2Fbootstrap.git Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip Conflicts: bootstrap.css docs/assets/js/application.js docs/base-css.html docs/components.html docs/index.html docs/javascript.html docs/less.html docs/scaffolding.html docs/upgrading.html --- 35fdbad24b908714ff1a1221945598527a641863 diff --cc bootstrap.css index ee80000c2b,354f534b28..eb7b656783 --- a/bootstrap.css +++ b/bootstrap.css @@@ -6,7 -6,7 +6,11 @@@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. ++<<<<<<< HEAD + * Date: Thu Dec 22 19:09:49 PST 2011 ++======= + * Date: Wed Dec 21 18:38:56 CST 2011 ++>>>>>>> 9fb380151d477f1741b7609ade7a9e7fd5450b2c */ html, body { margin: 0; diff --cc docs/assets/js/application.js index c653233e6b,724daf9ebd..c8e796a398 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@@ -1,64 -1,83 +1,76 @@@ $(function(){ + // NOTICE!! DO NOT USE ANY OF THIS JAVASCRIPT + // IT'S ALL JUST JUNK FOR OUR DOCS! + // ++++++++++++++++++++++++++++++++++++++++++ + + // Hide the Mobile Safari address bar once loaded + // ============================================== + - window.addEventListener("load",function() { - // Set a timeout... - setTimeout(function(){ - // Hide the address bar! - window.scrollTo(0, 1); - }, 0); - }); - - - // Docs topbar nav - // =============== - - $('.nav .active').click(function(e) { - e.preventDefault(); - $(this).siblings().toggle(); - }); - - - // Show grid dimensions on hover - // ============================= - - $('.show-grid > div').hover(function() { - var width = $(this).width(); - $(this).attr('title', width); - $(this).twipsy(); - }); - ++ // Set a timeout... ++ setTimeout(function(){ ++ // Hide the address bar! ++ window.scrollTo(0, 1); ++ }, 0); + + // table sort example + // ================== + - $("#sortTableExample").tablesorter( { sortList: [[ 1, 0 ]] } ) + // make code pretty + prettyPrint && prettyPrint() + // table sort example + if ($.fn.tableSorter) { + $("#sortTableExample").tablesorter( { sortList: [[ 1, 0 ]] } ) + } // add on logic - // ============ - - $('.add-on :checkbox').click(function () { - if ($(this).attr('checked')) { - $(this).parents('.add-on').addClass('active') - } else { - $(this).parents('.add-on').removeClass('active') - } + $('.add-on :checkbox').on('click', function () { + var $this = $(this) + , method = $this.attr('checked') ? 'addClass' : 'removeClass' + $(this).parents('.add-on')[method]('active') }) - // Disable certain links in docs - // ============================= - // Please do not carry these styles over to your projects, it's merely here to prevent button clicks form taking you away from your spot on page + // Please do not carry these styles over to your projects + // it's merely here to prevent button clicks form taking you + // away from your spot on page!! - $('ul.tabs a, ul.pills a, .pagination a, .well .btn, .actions .btn, .alert-message .btn, a.close').click(function (e) { + $('[href^=#]').click(function (e) { e.preventDefault() }) // Copy code blocks in docs - $(".copy-code").focus(function () { - var el = this; - // push select to event loop for chrome :{o - setTimeout(function () { $(el).select(); }, 1); - }); - - - // POSITION STATIC TWIPSIES - // ======================== - - $(window).on('load resize', function () { - $(".twipsies a").each(function () { - $(this) - .twipsy({ - live: false - , placement: $(this).attr('title') - , trigger: 'manual' - , offset: 2 - }) - .twipsy('show') - }) + $(".copy-code").on('focus', function () { + var el = this + setTimeout(function () { $(el).select() }, 0) }) -}); + + if ($.fn.twipsy) { + + // position static twipsies for components page + if ($(".twipsies a").length) { + $(window).on('load resize', function () { + $(".twipsies a").each(function () { + $(this) + .twipsy({ + placement: $(this).attr('title') + , trigger: 'manual' + }) + .twipsy('show') + }) + }) + } + + // add tipsies to grid for scaffolding + if ($('#grid-system').length) { + + $('#grid-system').twipsy({ + selector: '.show-grid > div' + , title: function () { return $(this).width() + 'px' } + }) + + } + } + - }) ++}) diff --cc docs/base-css.html index 6173a4de6e,bb54b0c511..34e844df30 --- a/docs/base-css.html +++ b/docs/base-css.html @@@ -1110,10 -1178,14 +1178,9 @@@ Form state - - + - - - - - diff --cc docs/components.html index 4d2c608230,2f359ab57f..26a657cb59 --- a/docs/components.html +++ b/docs/components.html @@@ -201,14 -213,36 +213,36 @@@ - +
+
+

Autocomplete

+
+ +
+ + + + -