From: Catalin Zalog Date: Thu, 8 Jun 2017 19:57:47 +0000 (+0300) Subject: Some .navbar .dropdown-menu optimisation (#22776) X-Git-Tag: v4.0.0-beta~133^2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f640ec96622790237bf0a5659440eb726af3118b;p=thirdparty%2Fbootstrap.git Some .navbar .dropdown-menu optimisation (#22776) --- diff --git a/js/src/dropdown.js b/js/src/dropdown.js index 9a4beae63a..86203c983d 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -251,21 +251,6 @@ const Dropdown = (($) => { return $(this._element).closest('.navbar').length > 0 } - _navbarPositioning() { - const $parentNavbar = $(this._element).closest('.navbar') - if ($(this._menu).hasClass(ClassName.MENURIGHT)) { - if (!$parentNavbar.hasClass('navbar-expand')) { - return { - position: 'static', - transform: '', - float: 'none' - } - } - } - - return {} - } - _getPopperConfig() { const popperConfig = { placement : this._getPlacement(), diff --git a/scss/_navbar.scss b/scss/_navbar.scss index 1803a82b43..7012460dd7 100644 --- a/scss/_navbar.scss +++ b/scss/_navbar.scss @@ -141,13 +141,6 @@ &#{$infix} { @include media-breakpoint-down($breakpoint) { - .navbar-nav { - .dropdown-menu { - position: static; - float: none; - } - } - > .container, > .container-fluid { padding-right: 0; @@ -172,11 +165,6 @@ left: auto; // Reset the default from `.dropdown-menu` } - .dropdown-menu-left { - right: auto; - left: 0; - } - .nav-link { padding-right: .5rem; padding-left: .5rem;