Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/examples/hero.html
	less/buttons.less
	less/carousel.less
	less/close.less
	less/dropdowns.less
	less/labels-badges.less
	less/mixins.less
	less/navbar.less
	less/navs.less
	less/pagination.less
	less/responsive-navbar.less
	less/scaffolding.less
	less/sprites.less
	less/thumbnails.less
	less/type.less

1 files changed, 7 insertions, 3 deletions

diff --git a/less/buttons.less b/less/buttons.less
index a49b7676d..4b278383f 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -24,7 +24,8 @@
     .tab-focus();
   }
 
-  &:hover {
+  &:hover,
+  &:focus {
     color: #fff;
     text-decoration: none;
   }
@@ -152,6 +153,7 @@ fieldset[disabled] .btn-link {
 }
 .btn-link,
 .btn-link:hover,
+.btn-link:focus,
 .btn-link:active {
   border-color: transparent;
 }
@@ -161,7 +163,8 @@ fieldset[disabled] .btn-link {
   cursor: pointer;
   border-radius: 0;
 }
-.btn-link:hover {
+.btn-link:hover,
+.btn-link:focus {
   color: @link-color-hover;
   text-decoration: underline;
   background-color: transparent;
@@ -169,7 +172,8 @@ fieldset[disabled] .btn-link {
 .btn-link {
   &[disabled],
   fieldset[disabled] & {
-    &:hover {
+    &:hover,
+    &:focus {
       color: @grayDark;
       text-decoration: none;
     }