mirror of
https://github.com/twbs/bootstrap.git
synced 2024-12-01 13:24:25 +01:00
Merge pull request #5323 from artiz/master
Please check my fix for #4550
This commit is contained in:
commit
7426ced0fb
5
js/bootstrap-dropdown.js
vendored
5
js/bootstrap-dropdown.js
vendored
@ -100,8 +100,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function clearMenus() {
|
function clearMenus() {
|
||||||
getParent($(toggle))
|
$(toggle).each(function () {
|
||||||
.removeClass('open')
|
getParent($(this)).removeClass('open')
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
function getParent($this) {
|
function getParent($this) {
|
||||||
|
@ -99,7 +99,7 @@
|
|||||||
top: auto;
|
top: auto;
|
||||||
left: auto;
|
left: auto;
|
||||||
float: none;
|
float: none;
|
||||||
display: block;
|
display: none;
|
||||||
max-width: none;
|
max-width: none;
|
||||||
margin: 0 15px;
|
margin: 0 15px;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
@ -108,6 +108,10 @@
|
|||||||
.border-radius(0);
|
.border-radius(0);
|
||||||
.box-shadow(none);
|
.box-shadow(none);
|
||||||
}
|
}
|
||||||
|
.nav-collapse .open > .dropdown-menu {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
.nav-collapse .dropdown-menu:before,
|
.nav-collapse .dropdown-menu:before,
|
||||||
.nav-collapse .dropdown-menu:after {
|
.nav-collapse .dropdown-menu:after {
|
||||||
display: none;
|
display: none;
|
||||||
|
Loading…
Reference in New Issue
Block a user