0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00

Merge pull request #19239 from twbs/dropdown-margin-top

Extract $dropdown-margin-top variable
This commit is contained in:
Mark Otto 2016-02-17 08:54:47 -08:00
commit 13c8ecd893
2 changed files with 3 additions and 2 deletions

View File

@ -44,7 +44,7 @@
float: left; float: left;
min-width: $dropdown-min-width; min-width: $dropdown-min-width;
padding: 5px 0; padding: 5px 0;
margin: 2px 0 0; // override default ul margin: $dropdown-margin-top 0 0; // override default ul
font-size: $font-size-base; font-size: $font-size-base;
color: $body-color; color: $body-color;
text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer) text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer)
@ -175,6 +175,6 @@
.dropdown-menu { .dropdown-menu {
top: auto; top: auto;
bottom: 100%; bottom: 100%;
margin-bottom: 2px; margin-bottom: $dropdown-margin-top;
} }
} }

View File

@ -431,6 +431,7 @@ $form-icon-danger: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www
// Dropdown menu container and contents. // Dropdown menu container and contents.
$dropdown-min-width: 160px !default; $dropdown-min-width: 160px !default;
$dropdown-margin-top: 2px !default;
$dropdown-bg: #fff !default; $dropdown-bg: #fff !default;
$dropdown-border-color: rgba(0,0,0,.15) !default; $dropdown-border-color: rgba(0,0,0,.15) !default;
$dropdown-border-width: $border-width !default; $dropdown-border-width: $border-width !default;