mirror of
https://github.com/twbs/bootstrap.git
synced 2024-09-22 19:17:16 +00:00
Drop .nav-header
for .dropdown-header
* Since we no longer have `.nav-list`, I've nuked the `.nav-header` * However, dropdowns can still have section headings, so I've kept that around with the addition of `.dropdown-header` * Restyled it a smidge as well
This commit is contained in:
parent
3604b86806
commit
e57758cbb4
@ -3,6 +3,7 @@
|
|||||||
<ul class="nav">
|
<ul class="nav">
|
||||||
<li><a href="#dropdowns-example">Example</a></li>
|
<li><a href="#dropdowns-example">Example</a></li>
|
||||||
<li><a href="#dropdowns-alignment">Alignment options</a></li>
|
<li><a href="#dropdowns-alignment">Alignment options</a></li>
|
||||||
|
<li><a href="#dropdowns-headers">Headers</a></li>
|
||||||
<li><a href="#dropdowns-disabled">Disabled menu items</a></li>
|
<li><a href="#dropdowns-disabled">Disabled menu items</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
|
24
docs/assets/css/bootstrap.css
vendored
24
docs/assets/css/bootstrap.css
vendored
@ -2275,6 +2275,14 @@ input[type="button"].btn-block {
|
|||||||
outline: 0;
|
outline: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.dropdown-header {
|
||||||
|
display: block;
|
||||||
|
padding: 3px 20px;
|
||||||
|
font-size: 12px;
|
||||||
|
line-height: 1.428571429;
|
||||||
|
color: #999999;
|
||||||
|
}
|
||||||
|
|
||||||
.dropdown-backdrop {
|
.dropdown-backdrop {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top: 0;
|
top: 0;
|
||||||
@ -2303,11 +2311,6 @@ input[type="button"].btn-block {
|
|||||||
margin-bottom: 1px;
|
margin-bottom: 1px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dropdown .dropdown-menu .nav-header {
|
|
||||||
padding-right: 20px;
|
|
||||||
padding-left: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.list-group {
|
.list-group {
|
||||||
padding-left: 0;
|
padding-left: 0;
|
||||||
margin-bottom: 20px;
|
margin-bottom: 20px;
|
||||||
@ -2710,17 +2713,6 @@ button.close {
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.nav-header {
|
|
||||||
display: block;
|
|
||||||
padding: 3px 15px;
|
|
||||||
font-size: 11px;
|
|
||||||
font-weight: bold;
|
|
||||||
line-height: 1.428571429;
|
|
||||||
color: #999999;
|
|
||||||
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
|
|
||||||
text-transform: uppercase;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tabbable:before,
|
.tabbable:before,
|
||||||
.tabbable:after {
|
.tabbable:after {
|
||||||
display: table;
|
display: table;
|
||||||
|
@ -46,6 +46,31 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
|
|||||||
<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dLabel">
|
<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dLabel">
|
||||||
...
|
...
|
||||||
</ul>
|
</ul>
|
||||||
|
{% endhighlight %}
|
||||||
|
|
||||||
|
<h3 id="dropdowns-headers">Dropdown headers</h3>
|
||||||
|
<p>Add a header to break up label sections of actions in any dropdown menu.</p>
|
||||||
|
<div class="bs-example">
|
||||||
|
<div class="dropdown clearfix">
|
||||||
|
<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu">
|
||||||
|
<li class="dropdown-header">Dropdown header</li>
|
||||||
|
<li><a tabindex="-1" href="#">Action</a></li>
|
||||||
|
<li><a tabindex="-1" href="#">Another action</a></li>
|
||||||
|
<li><a tabindex="-1" href="#">Something else here</a></li>
|
||||||
|
<li class="divider"></li>
|
||||||
|
<li class="dropdown-header">Dropdown header</li>
|
||||||
|
<li><a tabindex="-1" href="#">Separated link</a></li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div><!-- /example -->
|
||||||
|
{% highlight html %}
|
||||||
|
<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu">
|
||||||
|
<li class="dropdown-header">Dropdown header</li>
|
||||||
|
...
|
||||||
|
<li class="divider"></li>
|
||||||
|
<li class="dropdown-header">Dropdown header</li>
|
||||||
|
...
|
||||||
|
</ul>
|
||||||
{% endhighlight %}
|
{% endhighlight %}
|
||||||
|
|
||||||
<h3 id="dropdowns-disabled">Disabled menu options</h3>
|
<h3 id="dropdowns-disabled">Disabled menu options</h3>
|
||||||
|
@ -120,6 +120,17 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Dropdown section headers
|
||||||
|
// ---------------------------
|
||||||
|
.dropdown-header {
|
||||||
|
display: block;
|
||||||
|
padding: 3px 20px;
|
||||||
|
font-size: @font-size-small;
|
||||||
|
line-height: @line-height-base;
|
||||||
|
color: @gray-light;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Backdrop to catch body clicks on mobile, etc.
|
// Backdrop to catch body clicks on mobile, etc.
|
||||||
// ---------------------------
|
// ---------------------------
|
||||||
@ -158,11 +169,3 @@
|
|||||||
margin-bottom: 1px;
|
margin-bottom: 1px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Tweak nav headers
|
|
||||||
// ---------------------------
|
|
||||||
// Increase padding from 15px to 20px on sides
|
|
||||||
.dropdown .dropdown-menu .nav-header {
|
|
||||||
padding-left: 20px;
|
|
||||||
padding-right: 20px;
|
|
||||||
}
|
|
||||||
|
@ -195,22 +195,6 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Nav headers (for dropdowns and lists)
|
|
||||||
// -------------------------
|
|
||||||
|
|
||||||
.nav-header {
|
|
||||||
display: block;
|
|
||||||
padding: 3px 15px;
|
|
||||||
font-size: @font-size-mini;
|
|
||||||
font-weight: bold;
|
|
||||||
line-height: @line-height-base;
|
|
||||||
color: @gray-light;
|
|
||||||
text-shadow: 0 1px 0 rgba(255,255,255,.5);
|
|
||||||
text-transform: uppercase;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Tabbable tabs
|
// Tabbable tabs
|
||||||
// -------------------------
|
// -------------------------
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user