diff options
| author | Mark Otto <[email protected]> | 2016-02-17 08:54:47 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-02-17 08:54:47 -0800 |
| commit | 13c8ecd893bb4841087866b7a90344fbc8f64b9a (patch) | |
| tree | 88c413b2b10642f457b3466430c6597df952430c | |
| parent | 48a338c27cd619443758e580f9bea52bacfd1660 (diff) | |
| parent | dcb29fc814abc35818ca21b711b350a7b1c4ef36 (diff) | |
| download | bootstrap-13c8ecd893bb4841087866b7a90344fbc8f64b9a.tar.xz bootstrap-13c8ecd893bb4841087866b7a90344fbc8f64b9a.zip | |
Merge pull request #19239 from twbs/dropdown-margin-top
Extract $dropdown-margin-top variable
| -rw-r--r-- | scss/_dropdown.scss | 4 | ||||
| -rw-r--r-- | scss/_variables.scss | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss index 7aff06095..d642d7389 100644 --- a/scss/_dropdown.scss +++ b/scss/_dropdown.scss @@ -44,7 +44,7 @@ float: left; min-width: $dropdown-min-width; padding: 5px 0; - margin: 2px 0 0; // override default ul + margin: $dropdown-margin-top 0 0; // override default ul font-size: $font-size-base; color: $body-color; text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer) @@ -175,6 +175,6 @@ .dropdown-menu { top: auto; bottom: 100%; - margin-bottom: 2px; + margin-bottom: $dropdown-margin-top; } } diff --git a/scss/_variables.scss b/scss/_variables.scss index 85d121b2c..fdd917f8a 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -431,6 +431,7 @@ $form-icon-danger: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www // Dropdown menu container and contents. $dropdown-min-width: 160px !default; +$dropdown-margin-top: 2px !default; $dropdown-bg: #fff !default; $dropdown-border-color: rgba(0,0,0,.15) !default; $dropdown-border-width: $border-width !default; |