diff options
| author | Mark Otto <[email protected]> | 2016-10-02 18:25:51 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2016-10-02 18:25:51 -0700 |
| commit | a75330ca96545afaa0d12fd85388abfda8582ff9 (patch) | |
| tree | 151525a03ab0ce01cc05e43cb21a077ed4cbab24 | |
| parent | ebc77f60bb3c8dc11417f7cdb8648a65f1fe24cd (diff) | |
| download | bootstrap-a75330ca96545afaa0d12fd85388abfda8582ff9.tar.xz bootstrap-a75330ca96545afaa0d12fd85388abfda8582ff9.zip | |
v4: Dropdown units (#20701)
* Fixes #19784: Move from pixels to rems, add a margin-bottom: 0; to keep things aligned
* lintiong
| -rw-r--r-- | scss/_dropdown.scss | 1 | ||||
| -rw-r--r-- | scss/_variables.scss | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss index e696d28be..47702e795 100644 --- a/scss/_dropdown.scss +++ b/scss/_dropdown.scss @@ -141,6 +141,7 @@ .dropdown-header { display: block; padding: $dropdown-padding-y $dropdown-item-padding-x; + margin-bottom: 0; // for use with heading elements font-size: $font-size-sm; color: $dropdown-header-color; white-space: nowrap; // as with > li > a diff --git a/scss/_variables.scss b/scss/_variables.scss index 86a29e23c..f92a65a97 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -437,14 +437,14 @@ $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-padding-y: 5px !default; -$dropdown-margin-top: 2px !default; +$dropdown-min-width: 10rem !default; +$dropdown-padding-y: .5rem !default; +$dropdown-margin-top: .125rem !default; $dropdown-bg: #fff !default; $dropdown-border-color: rgba(0,0,0,.15) !default; $dropdown-border-width: $border-width !default; $dropdown-divider-bg: #e5e5e5 !default; -$dropdown-box-shadow: 0 6px 12px rgba(0,0,0,.175) !default; +$dropdown-box-shadow: 0 .5rem 1rem rgba(0,0,0,.175) !default; $dropdown-link-color: $gray-dark !default; $dropdown-link-hover-color: darken($gray-dark, 5%) !default; @@ -455,7 +455,7 @@ $dropdown-link-active-bg: $component-active-bg !default; $dropdown-link-disabled-color: $gray-light !default; -$dropdown-item-padding-x: 20px !default; +$dropdown-item-padding-x: 1.5rem !default; $dropdown-header-color: $gray-light !default; |