From: Patrick Yeo Date: Mon, 31 Jul 2017 18:45:51 +0000 (-0700) Subject: (#22414) Rename for consistency `$dropdown-margin-top` to `$dropdown-spacer` X-Git-Tag: v4.0.0-beta~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0501b029f53411e3168e8f2434cc519ea0fab4d6;p=thirdparty%2Fbootstrap.git (#22414) Rename for consistency `$dropdown-margin-top` to `$dropdown-spacer` --- diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss index ac19ee0bd7..230c6f0dee 100644 --- a/scss/_dropdown.scss +++ b/scss/_dropdown.scss @@ -44,7 +44,7 @@ float: left; min-width: $dropdown-min-width; padding: $dropdown-padding-y 0; - margin: $dropdown-margin-top 0 0; // override default ul + margin: $dropdown-spacer 0 0; // override default ul font-size: $font-size-base; // Redeclare because nesting can cause inheritance issues color: $body-color; text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer) diff --git a/scss/_variables.scss b/scss/_variables.scss index f0949eaffe..e2bacef4af 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -491,7 +491,7 @@ $form-feedback-invalid-color: theme-color("danger") !default; $dropdown-min-width: 10rem !default; $dropdown-padding-y: .5rem !default; -$dropdown-margin-top: .125rem !default; +$dropdown-spacer: .125rem !default; $dropdown-bg: $white !default; $dropdown-border-color: rgba($black,.15) !default; $dropdown-border-width: $border-width !default;