8000 fixes #5102, #5166, #5194, #5205: add overflow: visible; to .nav-coll… · rusongyu/bootstrap@443c43f · GitHub
[go: up one dir, main page]
Skip to content 8000

Commit 443c43f

Browse files
mdomdo
committed
fixes twbs#5102, twbs#5166, twbs#5194, twbs#5205: add overflow: visible; to .nav-collapse.collapse so that dropdowns overflow correctly in the navbar in IE7-8
1 parent 67585bd commit 443c43f

File tree

7 files changed

+47
-9
lines changed

7 files changed

+47
-9
lines changed

‎docs/assets/css/bootstrap.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4225,6 +4225,7 @@ input[type="submit"].btn.btn-mini {
42254225

42264226
.nav-collapse.collapse {
42274227
height: auto;
4228+
overflow: visible;
42284229
}
42294230

42304231
.navbar .brand {

‎docs/components.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,7 +1266,7 @@ <h2>Responsive navbar</h2>
12661266
<span class="icon-bar"></span>
12671267
</a>
12681268
<a class="brand" href="#">Title</a>
1269-
<div class="nav-collapse">
1269+
<div class="nav-collapse collapse">
12701270
<ul class="nav">
12711271
<li class="active"><a href="#">Home</a></li>
12721272
<li><a href="#">Link</a></li>
@@ -1322,7 +1322,7 @@ <h2>Responsive navbar</h2>
13221322
&lt;a class="brand" href="#"&gt;Project name&lt;/a&gt;
13231323

13241324
&lt;!-- Everything you want hidden at 940px or less, place within here --&gt;
1325-
&lt;div class="nav-collapse"&gt;
1325+
&lt;div class="nav-collapse collapse"&gt;
13261326
&lt;!-- .nav, .navbar-search, .navbar-form, etc --&gt;
13271327
&lt;/div&gt;
13281328

@@ -1350,7 +1350,7 @@ <h2>Inverted variation</h2>
13501350
<span class="icon-bar"></span>
13511351
</a>
13521352
<a class="brand" href="#">Title</a>
1353-
<div class="nav-collapse subnav-collapse">
1353+
<div class="nav-collapse collapse">
13541354
<ul class="nav">
13551355
<li class="active"><a href="#">Home</a></li>
13561356
<li><a href="#">Link</a></li>

‎docs/templates/pages/components.mustache

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,7 +1195,7 @@
11951195
<span class="icon-bar"></span>
11961196
</a>
11971197
<a class="brand" href="#">{{_i}}Title{{/i}}</a>
1198-
<div class="nav-collapse">
1198+
<div class="nav-collapse collapse">
11991199
<ul class="nav">
12001200
<li class="active"><a href="#">{{_i}}Home{{/i}}</a></li>
12011201
<li><a href="#">{{_i}}Link{{/i}}</a></li>
@@ -1251,7 +1251,7 @@
12511251
&lt;a class="brand" href="#"&gt;{{_i}}Project name{{/i}}&lt;/a&gt;
12521252

12531253
&lt;!-- {{_i}}Everything you want hidden at 940px or less, place within here{{/i}} --&gt;
1254-
&lt;div class="nav-collapse"&gt;
1254+
&lt;div class="nav-collapse collapse"&gt;
12551255
&lt;!-- .nav, .navbar-search, .navbar-form, etc --&gt;
12561256
&lt;/div&gt;
12571257

@@ -1279,7 +1279,7 @@
12791279
<span class="icon-bar"></span>
12801280
</a>
12811281
<a class="brand" href="#">{{_i}}Title{{/i}}</a>
1282-
<div class="nav-collapse subnav-collapse">
1282+
<div class="nav-collapse collapse">
12831283
<ul class="nav">
12841284
<li class="active"><a href="#">{{_i}}Home{{/i}}</a></li>
12851285
<li><a href="#">{{_i}}Link{{/i}}</a></li>

‎less/navbar.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
// Override the default collapsed state
4242
.nav-collapse.collapse {
4343
height: auto;
44+
overflow: visible;
4445
}
4546

4647

‎less/tests/navbar-fixed-top.html

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,23 @@
4242
<span class="icon-bar"></span>
4343
</a>
4444
<a class="brand" href="#">Project name</a>
45-
<div class="nav-collapse">
45+
<div class="nav-collapse collapse">
4646
<ul class="nav">
4747
<li class="active"><a href="#">Home</a></li>
4848
<li><a href="#about">About</a></li>
4949
<li><a href="#contact">Contact</a></li>
50+
<li class="dropdown">
51+
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
52+
<ul class="dropdown-menu">
53+
<li><a href="#">Action</a></li>
54+
<li><a href="#">Another action</a></li>
55+
<li><a href="#">Something else here</a></li>
56+
<li class="divider"></li>
57+
<li class="nav-header">Nav header</li>
58+
<li><a href="#">Separated link</a></li>
59+
<li><a href="#">One more separated link</a></li>
60+
</ul>
61+
</li>
5062
</ul>
5163
<ul class="nav pull-right">
5264
<li><a href="./navbar.html">Default</a></li>

‎less/tests/navbar-static-top.html

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,23 @@
4444
<span class="icon-bar"></span>
4545
</a>
4646
<a class="brand" href="#">Project name</a>
47-
<div class="nav-collapse">
47+
<div class="nav-collapse collapse">
4848
<ul class="nav">
4949
<li class="active"><a href="#">Home</a></li>
5050
<li><a href="#about">About</a></li>
5151
<li><a href="#contact">Contact</a></li>
52+
<li class="dropdown">
53+
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
54+
<ul class="dropdown-menu">
55+
<li><a href="#">Action</a></li>
56+
<li><a href="#">Another action</a></li>
57+
<li><a href="#">Something else here</a></li>
58+
<li class="divider"></li>
59+
<li class="nav-header">Nav header</li>
60+
<li><a href="#">Separated link</a></li>
61+
<li><a href="#">One more separated link</a></li>
62+
</ul>
63+
</li>
5264
</ul>
5365
<ul class="nav pull-right">
5466
<li><a href="./navbar.html">Default</a></li>

‎less/tests/navbar.html

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,23 @@
4747
<span class="icon-bar"></span>
4848
</a>
4949
<a class="brand" href="#">Project name</a>
50-
<div class="nav-collapse">
50+
<div class="nav-collapse collapse">
5151
<ul class="nav">
5252
<li class="active"><a href="#">Home</a></li>
5353
<li><a href="#about">About</a></li>
5454
<li><a href="#contact">Contact</a></li>
55+
<li class="dropdown">
56+
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
57+
<ul class="dropdown-menu">
58+
<li><a href="#">Action</a></li>
59+
<li><a href="#">Another action</a></li>
60+
<li><a href="#">Something else here</a></li>
61+
<li class="divider"></li>
62+
<li class="nav-header">Nav header</li>
63+
<li><a href="#">Separated link</a></li>
64+
<li><a href="#">One more separated link</a></li>
65+
</ul>
66+
</li>
5567
</ul>
5668
<ul class="nav pull-right">
5769
<li class="active"><a href="./navbar.html">Default</a></li>

0 commit comments

Comments
 (0)
0