Merge pull request twbs#5323 from artiz/master

Please check my fix for twbs#4550
Ocode · Oct 18, 2012 · 7426ced · 7426ced
2 parents c52368d + 0944e03
commit 7426ced
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js
@@ -100,8 +100,9 @@
   }
 
   function clearMenus() {
-    getParent($(toggle))
-      .removeClass('open')
+    $(toggle).each(function () {
+      getParent($(this)).removeClass('open')
+    })
   }
 
   function getParent($this) {

diff --git a/less/responsive-navbar.less b/less/responsive-navbar.less
@@ -99,7 +99,7 @@
     top: auto;
     left: auto;
     float: none;
-    display: block;
+    display: none;
     max-width: none;
     margin: 0 15px;
     padding: 0;
@@ -108,6 +108,10 @@
     .border-radius(0);
     .box-shadow(none);
   }
+  .nav-collapse .open > .dropdown-menu { 
+    display: block; 
+  }
+
   .nav-collapse .dropdown-menu:before,
   .nav-collapse .dropdown-menu:after {
     display: none;