Merge branch '3.0.0-wip' into bs3_theme

Conflicts:
	dist/css/bootstrap.min.css

1 files changed, 11 insertions, 3 deletions

diff --git a/less/dropdowns.less b/less/dropdowns.less
index 938e682f5..0dda5c9ce 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -11,12 +11,18 @@
   height: 0;
   margin-left: 2px;
   vertical-align: middle;
-  border-top:   4px solid @dropdown-caret-color;
-  border-right: 4px solid transparent;
-  border-left:  4px solid transparent;
+  border-top:   @caret-width-base solid @dropdown-caret-color;
+  border-right: @caret-width-base solid transparent;
+  border-left:  @caret-width-base solid transparent;
   content: "";
 }
 
+// The dropdown wrapper (div)
+// --------------------------
+.dropdown {
+  position: relative;
+}
+
 // The dropdown menu (ul)
 // ----------------------
 .dropdown-menu {
@@ -68,6 +74,7 @@
     text-decoration: none;
     color: @dropdown-link-hover-color;
     #gradient > .vertical(@start-color: @dropdown-link-hover-bg; @end-color: darken(@dropdown-link-hover-bg, 5%));
+    background-color: darken(@dropdown-link-hover-bg, 5%);
   }
 }
 
@@ -81,6 +88,7 @@
     text-decoration: none;
     outline: 0;
     #gradient > .vertical(@start-color: @dropdown-link-active-bg; @end-color: darken(@dropdown-link-active-bg, 5%));
+    background-color: darken(@dropdown-link-active-bg, 5%);
   }
 }