From 311c00a29b9f0db1bdea768f8643cee6b642c24b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 21 Aug 2012 14:07:20 -0700 Subject: [PATCH] fixes #4532: navbar responsive carets for dropdown-menus now hidden, also fixes borders on navbar form --- docs/assets/css/bootstrap-responsive.css | 9 +++++++++ less/responsive-navbar.less | 11 +++++++++++ 2 files changed, 20 insertions(+) diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 0bc4923c5165..e1919cf681b0 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -1003,6 +1003,10 @@ .nav-collapse .dropdown-menu .divider { display: none; } + .nav-collapse .nav > li > .dropdown-menu:before, + .nav-collapse .nav > li > .dropdown-menu:after { + display: none; + } .nav-collapse .navbar-form, .nav-collapse .navbar-search { float: none; @@ -1014,6 +1018,11 @@ -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); } + .navbar-inverse .nav-collapse .navbar-form, + .navbar-inverse .nav-collapse .navbar-search { + border-top-color: #111111; + border-bottom-color: #111111; + } .navbar .nav-collapse .nav.pull-right { float: none; margin-left: 0; diff --git a/less/responsive-navbar.less b/less/responsive-navbar.less index 3498863c82b9..4ffa5a9fecb3 100644 --- a/less/responsive-navbar.less +++ b/less/responsive-navbar.less @@ -115,6 +115,12 @@ .nav-collapse .dropdown-menu .divider { display: none; } + .nav-collapse .nav > li > .dropdown-menu { + &:before, + &:after { + display: none; + } + } // Forms in navbar .nav-collapse .navbar-form, .nav-collapse .navbar-search { @@ -125,6 +131,11 @@ border-bottom: 1px solid @navbarBackground; .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)"); } + .navbar-inverse .nav-collapse .navbar-form, + .navbar-inverse .nav-collapse .navbar-search { + border-top-color: @navbarInverseBackground; + border-bottom-color: @navbarInverseBackground; + } // Pull right (secondary) nav content .navbar .nav-collapse .nav.pull-right { float: none;