diff options
| author | Mark Otto <[email protected]> | 2012-09-20 10:27:59 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-09-20 10:28:27 -0700 |
| commit | 443c43f6c4bd98f1d35fffb59e0078b8b49791b4 (patch) | |
| tree | efc8815bad9cb544093911dc651ac69085656807 /less | |
| parent | 67585bd34e8e122c6a143c434c8dfdc7ba8de619 (diff) | |
| download | bootstrap-443c43f6c4bd98f1d35fffb59e0078b8b49791b4.tar.xz bootstrap-443c43f6c4bd98f1d35fffb59e0078b8b49791b4.zip | |
fixes #5102, #5166, #5194, #5205: add overflow: visible; to .nav-collapse.collapse so that dropdowns overflow correctly in the navbar in IE7-8
Diffstat (limited to 'less')
| -rw-r--r-- | less/navbar.less | 1 | ||||
| -rw-r--r-- | less/tests/navbar-fixed-top.html | 14 | ||||
| -rw-r--r-- | less/tests/navbar-static-top.html | 14 | ||||
| -rw-r--r-- | less/tests/navbar.html | 14 |
4 files changed, 40 insertions, 3 deletions
diff --git a/less/navbar.less b/less/navbar.less index 33c90694e..58621b473 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -41,6 +41,7 @@ // Override the default collapsed state .nav-collapse.collapse { height: auto; + overflow: visible; } diff --git a/less/tests/navbar-fixed-top.html b/less/tests/navbar-fixed-top.html index d454b65f8..97b86fdef 100644 --- a/less/tests/navbar-fixed-top.html +++ b/less/tests/navbar-fixed-top.html @@ -42,11 +42,23 @@ <span class="icon-bar"></span> </a> <a class="brand" href="#">Project name</a> - <div class="nav-collapse"> + <div class="nav-collapse collapse"> <ul class="nav"> <li class="active"><a href="#">Home</a></li> <li><a href="#about">About</a></li> <li><a href="#contact">Contact</a></li> + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> + <li class="divider"></li> + <li class="nav-header">Nav header</li> + <li><a href="#">Separated link</a></li> + <li><a href="#">One more separated link</a></li> + </ul> + </li> </ul> <ul class="nav pull-right"> <li><a href="./navbar.html">Default</a></li> diff --git a/less/tests/navbar-static-top.html b/less/tests/navbar-static-top.html index ea131d453..505ecb608 100644 --- a/less/tests/navbar-static-top.html +++ b/less/tests/navbar-static-top.html @@ -44,11 +44,23 @@ <span class="icon-bar"></span> </a> <a class="brand" href="#">Project name</a> - <div class="nav-collapse"> + <div class="nav-collapse collapse"> <ul class="nav"> <li class="active"><a href="#">Home</a></li> <li><a href="#about">About</a></li> <li><a href="#contact">Contact</a></li> + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> + <li class="divider"></li> + <li class="nav-header">Nav header</li> + <li><a href="#">Separated link</a></li> + <li><a href="#">One more separated link</a></li> + </ul> + </li> </ul> <ul class="nav pull-right"> <li><a href="./navbar.html">Default</a></li> diff --git a/less/tests/navbar.html b/less/tests/navbar.html index 342b92167..c72da71a4 100644 --- a/less/tests/navbar.html +++ b/less/tests/navbar.html @@ -47,11 +47,23 @@ <span class="icon-bar"></span> </a> <a class="brand" href="#">Project name</a> - <div class="nav-collapse"> + <div class="nav-collapse collapse"> <ul class="nav"> <li class="active"><a href="#">Home</a></li> <li><a href="#about">About</a></li> <li><a href="#contact">Contact</a></li> + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> + <li class="divider"></li> + <li class="nav-header">Nav header</li> + <li><a href="#">Separated link</a></li> + <li><a href="#">One more separated link</a></li> + </ul> + </li> </ul> <ul class="nav pull-right"> <li class="active"><a href="./navbar.html">Default</a></li> |