Merge branch 'master' of github.com:twitter/bootstrap into js-examples

Conflicts:
	bootstrap-1.2.0.css
	bootstrap-1.2.0.min.css
	lib/patterns.less
	lib/scaffolding.less

1 files changed, 3 insertions, 4 deletions

diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index 30677829e..ec4ae3c06 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -5,6 +5,7 @@ $(document).ready(function(){
 
   prettyPrint();
 
+
   // scroll spy logic
   // ================
 
@@ -19,7 +20,6 @@ $(document).ready(function(){
         return $(id).offset().top;
       });
 
-
   function setButton(id) {
     nav.parent("li").removeClass('active');
     $(nav[$.inArray(id, targets)]).parent("li").addClass('active');
@@ -48,10 +48,9 @@ $(document).ready(function(){
   // ===============================
 
   $("body").bind("click", function (e) {
-    $('a.menu').parent("li").removeClass("open");
+    $('.dropdown-toggle, .menu').parent("li").removeClass("open");
   });
-
-  $("a.menu").click(function (e) {
+  $(".dropdown-toggle, .menu").click(function (e) {
     var $li = $(this).parent("li").toggleClass('open');
     return false;
   });