mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-31 09:05:47 +02:00
Code Issues Releases Wiki Activity

Merge branch 'v4-dev' into v4-split-buttons

Browse Source
This commit is contained in:
Mark Otto
2016-02-06 20:33:26 -08:00
parent f6ad665c26 cb7b780876
commit d7d0e186bd
124 changed files with 3985 additions and 2858 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scss/_dropdown.scss
View File

@@ -52,7 +52,7 @@
background-clip: padding-box;
border: $dropdown-border-width solid $dropdown-border-color;
@include border-radius($border-radius);
@include box-shadow(0 6px 12px rgba(0,0,0,.175));
@include box-shadow($dropdown-box-shadow);
}
// Dividers (basically an `<hr>`) within the dropdown
@@ -69,7 +69,6 @@
padding: 3px 20px;
clear: both;
font-weight: normal;
line-height: $line-height;
color: $dropdown-link-color;
text-align: inherit; // For `<button>`s
white-space: nowrap; // prevent links from randomly breaking onto new lines
@@ -132,12 +131,7 @@
right: 0;
left: auto; // Reset the default from `.dropdown-menu`
}
// With v3, we enabled auto-flipping if you have a dropdown within a right
// aligned nav component. To enable the undoing of that, we provide an override
// to restore the default dropdown menu alignment.
//
// This is only for left-aligning a dropdown menu within a `.navbar-right` or
// `.pull-right` nav component.
.dropdown-menu-left {
right: auto;
left: 0;
@@ -146,9 +140,8 @@
// Dropdown section headers
.dropdown-header {
display: block;
padding: 3px 20px;
padding: 5px 20px;
font-size: $font-size-sm;
line-height: $line-height;
color: $dropdown-header-color;
white-space: nowrap; // as with > li > a
}
@@ -160,7 +153,7 @@
right: 0;
bottom: 0;
left: 0;
z-index: ($zindex-dropdown - 10);
z-index: $zindex-dropdown-backdrop;
}
// Right aligned dropdowns