From: Chris Rebert <code@chrisrebert.com>
Date: Sun, 15 Nov 2015 06:28:45 +0000 (-0800)
Subject: $dropdown-border => $dropdown-border-color
X-Git-Tag: v4.0.0-alpha.2~96^2^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76f705632155931bcf3cb7b23b439e0e2930cd1f;p=thirdparty%2Fbootstrap.git

$dropdown-border => $dropdown-border-color
---

diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss
index c477dfb172..f1213065a8 100644
--- a/scss/_dropdown.scss
+++ b/scss/_dropdown.scss
@@ -51,7 +51,7 @@
   list-style: none;
   background-color: $dropdown-bg;
   background-clip: padding-box;
-  border: 1px solid $dropdown-border;
+  border: 1px solid $dropdown-border-color;
   @include border-radius($border-radius);
   @include box-shadow(0 6px 12px rgba(0,0,0,.175));
 }
diff --git a/scss/_variables.scss b/scss/_variables.scss
index b7bb880903..be8c9d81bf 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -305,7 +305,7 @@ $form-icon-danger: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My
 // Dropdown menu container and contents.
 
 $dropdown-bg:                    #fff !default;
-$dropdown-border:                rgba(0,0,0,.15) !default;
+$dropdown-border-color:          rgba(0,0,0,.15) !default;
 $dropdown-divider-bg:            #e5e5e5 !default;
 
 $dropdown-link-color:            $gray-dark !default;