diff options
| author | billy gates <Jacobthornton@gmail.com> | 2012-10-18 09:50:52 +0400 |
|---|---|---|
| committer | billy gates <Jacobthornton@gmail.com> | 2012-10-18 09:50:52 +0400 |
| commit | 7426ced0fb288a9e86f18da1849ad74f652d219a (patch) | |
| tree | 9d7ef8d987edebc4a8ad30a12326fb311d51bb2a | |
| parent | c52368d3c5984b28e6a71e5e1240afdd788fc2e6 (diff) | |
| parent | 0944e036ae778f7efc9eeafcc33e58600e110fb0 (diff) | |
Merge pull request #5323 from artiz/master
Please check my fix for #4550
| -rw-r--r-- | js/bootstrap-dropdown.js | 5 | ||||
| -rw-r--r-- | less/responsive-navbar.less | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index 42370dfbef..ca90bd014c 100644 --- 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 index c454dd5e39..073eafb113 100644 --- 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; |