Merge branch '3.0.0-wip' into bs3_alerts_default_class

Conflicts:
	dist/css/bootstrap.min.css

1 files changed, 6 insertions, 2 deletions

diff --git a/less/button-groups.less b/less/button-groups.less
index 76936691a..3ae18e92f 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -47,6 +47,10 @@
     &.active {
       z-index: 2;
     }
+    &:focus {
+      // Remove focus outline when dropdown JS adds it after closing the menu
+      outline: none;
+    }
   }
 }
 
@@ -140,11 +144,11 @@
 }
 // Carets in other button sizes
 .btn-lg .caret {
-  border-width: 5px;
+  border-width: @caret-width-large;
 }
 // Upside down carets for .dropup
 .dropup .btn-lg .caret {
-  border-bottom-width: 5px;
+  border-bottom-width: @caret-width-large;
 }