1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-24 03:40:10 +00:00

dropdown fixes and dropdown docs tweaks

This commit is contained in:
Mark Otto 2015-08-10 16:31:28 -07:00
parent 9fe6b85c32
commit 121615ceba
10 changed files with 13 additions and 15 deletions

View File

@ -3007,7 +3007,7 @@ input[type="button"].btn-block {
border-radius: .25rem; border-radius: .25rem;
} }
.dropdown-menu .divider { .dropdown-menu .dropdown-divider {
height: 1px; height: 1px;
margin: .5rem 0; margin: .5rem 0;
overflow: hidden; overflow: hidden;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -13,10 +13,10 @@ Dropdowns are toggleable, contextual overlays for displaying lists of links and
## Example ## Example
Wrap the dropdown's trigger and the dropdown menu within `.dropdown`, or another element that declares `position: relative;`. Then add the menu's HTML. Wrap the dropdown's trigger and the dropdown menu within `.dropdown`, or another element that declares `position: relative;`. Then, add the menu's HTML.
{% example html %} {% example html %}
<div class="dropdown"> <div class="dropdown open">
<button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Dropdown Dropdown
</button> </button>
@ -38,10 +38,8 @@ Wrap the dropdown's trigger and the dropdown menu within `.dropdown`, or another
By default, a dropdown menu is automatically positioned 100% from the top and along the left side of its parent. Add `.dropdown-menu-right` to a `.dropdown-menu` to right align the dropdown menu. By default, a dropdown menu is automatically positioned 100% from the top and along the left side of its parent. Add `.dropdown-menu-right` to a `.dropdown-menu` to right align the dropdown menu.
{% callout warning %} {% callout info %}
#### May require additional positioning **Heads up!** Dropdowns are positioned only with CSS and may need some additional styles for exact alignment.
Dropdowns are automatically positioned via CSS within the normal flow of the document. This means dropdowns may be cropped by parents with certain `overflow` properties or appear out of bounds of the viewport. Address these issues on your own as they arise.
{% endcallout %} {% endcallout %}
{% highlight html %} {% highlight html %}

View File

@ -3007,7 +3007,7 @@ input[type="button"].btn-block {
border-radius: .25rem; border-radius: .25rem;
} }
.dropdown-menu .divider { .dropdown-menu .dropdown-divider {
height: 1px; height: 1px;
margin: .5rem 0; margin: .5rem 0;
overflow: hidden; overflow: hidden;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -50,7 +50,7 @@
@include box-shadow(0 6px 12px rgba(0,0,0,.175)); @include box-shadow(0 6px 12px rgba(0,0,0,.175));
// Dividers (basically an hr) within the dropdown // Dividers (basically an hr) within the dropdown
.divider { .dropdown-divider {
@include nav-divider($dropdown-divider-bg); @include nav-divider($dropdown-divider-bg);
} }