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

13 files changed, 59 insertions, 34 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;
     }
diff --git a/less/carousel.less b/less/carousel.less
index 13d4290d3..fa052abe4 100644
--- a/less/carousel.less
+++ b/less/carousel.less
@@ -95,8 +95,9 @@
     background-color: transparent;
   }
 
-  // Hover state
-  &:hover {
+  // Hover/focus state
+  &:hover,
+  &:focus {
     color: #fff;
     text-decoration: none;
     .opacity(90);
diff --git a/less/close.less b/less/close.less
index cda5a2467..de6560ec1 100644
--- a/less/close.less
+++ b/less/close.less
@@ -11,7 +11,8 @@
   color: #000;
   text-shadow: 0 1px 0 rgba(255,255,255,1);
   .opacity(20);
-  &:hover {
+  &:hover,
+  &:focus {
     color: #000;
     text-decoration: none;
     cursor: pointer;
diff --git a/less/counters.less b/less/counters.less
index fc45fa2a6..e4e44ab79 100644
--- a/less/counters.less
+++ b/less/counters.less
@@ -26,7 +26,8 @@
 
 // Hover state, but only for links
 a.counter {
-  &:hover {
+  &:hover,
+  &:focus {
     color: #fff;
     text-decoration: none;
     cursor: pointer;
diff --git a/less/dropdowns.less b/less/dropdowns.less
index e2544c25d..1eb4b2646 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -75,7 +75,7 @@
   }
 }
 
-// Hover state
+// Hover/Focus state
 // -----------
 .dropdown-menu li > a:hover,
 .dropdown-menu li > a:focus {
@@ -87,7 +87,8 @@
 // Active state
 // ------------
 .dropdown-menu > .active > a,
-.dropdown-menu > .active > a:hover {
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
   color: @dropdown-link-color-active;
   text-decoration: none;
   outline: 0;
@@ -96,13 +97,15 @@
 
 // Disabled state
 // --------------
-// Gray out text and ensure the hover state remains gray
+// Gray out text and ensure the hover/focus state remains gray
 .dropdown-menu > .disabled > a,
-.dropdown-menu > .disabled > a:hover {
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
   color: @grayLight;
 }
-// Nuke hover effects
-.dropdown-menu > .disabled > a:hover {
+// Nuke hover/focus effects
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
   text-decoration: none;
   background-color: transparent;
   background-image: none; // Remove CSS gradient
diff --git a/less/mixins.less b/less/mixins.less
index fa74b301d..6db215494 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -394,6 +394,7 @@
   border-bottom: 1px solid @bottom;
 }
 
+<<<<<<< HEAD
 // Button psuedo states
 // -------------------------
 // Easily pump out default styles, as well as :hover, :focus, :active,
diff --git a/less/navbar.less b/less/navbar.less
index 1af0c499a..c043d8462 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -75,7 +75,8 @@
   font-weight: 500;
   line-height: @line-height-base;
   color: @navbar-brand-color;
-  &:hover {
+  &:hover,
+  &:focus {
     color: @navbar-brand-color-hover;
     text-decoration: none;
     background-color: @navbar-brand-bg-hover;
@@ -130,7 +131,8 @@
 // Dropdown menu items and carets
 .navbar .nav {
   // Caret should match text color on hover
-  li.dropdown > a:hover .caret {
+  li.dropdown > a:hover .caret,
+  li.dropdown > a:focus .caret {
     border-top-color: @navbar-link-color-hover;
     border-bottom-color: @navbar-link-color-hover;
   }
@@ -171,7 +173,8 @@
 
   .brand {
     color: @navbar-inverse-brand-color;
-    &:hover {
+    &:hover,
+    &:focus {
       color: @navbar-inverse-brand-color-hover;
       background-color: @navbar-inverse-brand-bg-hover;
     }
diff --git a/less/navs.less b/less/navs.less
index 9348cbbfa..6eb12d76b 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -21,7 +21,8 @@
   display: block;
   padding: 10px 15px;
 }
-.nav > li > a:hover {
+.nav > li > a:hover,
+.nav > li > a:focus {
   text-decoration: none;
   background-color: @grayLighter;
 }
@@ -61,7 +62,8 @@
 }
 // Active state, and it's :hover to override normal :hover
 .nav-tabs > .active > a,
-.nav-tabs > .active > a:hover {
+.nav-tabs > .active > a:hover,
+.nav-tabs > .active > a:focus {
   color: @gray;
   background-color: @body-background;
   border: 1px solid #ddd;
@@ -86,7 +88,8 @@
 
 // Active state
 .nav-pills > .active > a,
-.nav-pills > .active > a:hover {
+.nav-pills > .active > a:hover,
+.nav-pills > .active > a:focus {
   color: #fff;
   background-color: @link-color;
 }
@@ -130,7 +133,8 @@
   border-bottom-right-radius: @border-radius-base;
 }
 .nav-list > .active > a,
-.nav-list > .active > a:hover {
+.nav-list > .active > a:hover,
+.nav-list > .active > a:focus {
   z-index: 2; // Bring active item forward so border sits on top of next element
   color: #fff;
   background-color: @link-color;
@@ -150,7 +154,8 @@
   color: @grayLight;
 }
 // Nuke hover effects
-.nav > .disabled > a:hover {
+.nav > .disabled > a:hover,
+.nav > .disabled > a:focus {
   text-decoration: none;
   background-color: transparent;
   cursor: default;
diff --git a/less/pager.less b/less/pager.less
index c0ee47248..89ce70c29 100644
--- a/less/pager.less
+++ b/less/pager.less
@@ -20,7 +20,8 @@
   border: 1px solid #ddd;
   border-radius: 15px;
 }
-.pager li > a:hover {
+.pager li > a:hover,
+.pager li > a:focus {
   text-decoration: none;
   background-color: #f5f5f5;
 }
@@ -34,6 +35,7 @@
 }
 .pager .disabled > a,
 .pager .disabled > a:hover,
+.pager .disabled > a:focus,
 .pager .disabled > span {
   color: @grayLight;
   background-color: #fff;
diff --git a/less/pagination.less b/less/pagination.less
index 21e620121..037c47545 100644
--- a/less/pagination.less
+++ b/less/pagination.less
@@ -20,6 +20,7 @@
   border-left-width: 0;
 }
 .pagination > li > a:hover,
+.pagination > li > a:focus,
 .pagination > .active > a,
 .pagination > .active > span {
   background-color: @pagination-background-active;
@@ -31,7 +32,8 @@
 }
 .pagination > .disabled > span,
 .pagination > .disabled > a,
-.pagination > .disabled > a:hover {
+.pagination > .disabled > a:hover,
+.pagination > .disabled > a:focus {
   color: @grayLight;
   background-color: transparent;
   cursor: default;
diff --git a/less/scaffolding.less b/less/scaffolding.less
index e7b815b82..715805a5a 100644
--- a/less/scaffolding.less
+++ b/less/scaffolding.less
@@ -50,7 +50,8 @@ a {
   color: @link-color;
   text-decoration: none;
 }
-a:hover {
+a:hover,
+a:focus {
   color: @link-color-hover;
   text-decoration: underline;
 }
@@ -153,4 +154,4 @@ img {
   h3 {
     page-break-after: avoid;
   }
-}
\ No newline at end of file
+}
diff --git a/less/thumbnails.less b/less/thumbnails.less
index 3c583f8ca..4ea27f517 100644
--- a/less/thumbnails.less
+++ b/less/thumbnails.less
@@ -24,7 +24,8 @@
 }
 
 // Add a hover state for linked versions only
-a.thumbnail:hover {
+a.thumbnail:hover,
+a.thumbnail:focus {
   border-color: @link-color;
 }
 
diff --git a/less/type.less b/less/type.less
index 4387bfabf..697b7ad20 100644
--- a/less/type.less
+++ b/less/type.less
@@ -29,20 +29,20 @@ cite    { font-style: normal; }
 
 // Utility classes
 .muted               { color: @grayLight; }
-a.muted:hover        { color: darken(@grayLight, 10%); }
+a.muted:hover,
+a.muted:focus        { color: darken(@grayLight, 10%); }
 
 .text-warning        { color: @state-warning-text; }
-a.text-warning:hover { color: darken(@state-warning-text, 10%); }
+a.text-warning:hover,
+a.text-warning:focus { color: darken(@state-warning-text, 10%); }
 
 .text-error          { color: @state-error-text; }
-a.text-error:hover   { color: darken(@state-error-text, 10%); }
+a.text-error:hover,
+a.text-error:focus   { color: darken(@state-error-text, 10%); }
 
 .text-success        { color: @state-success-text; }
-a.text-success:hover { color: darken(@state-success-text, 10%); }
-
-.text-left           { text-align: left; }
-.text-right          { text-align: right; }
-.text-center         { text-align: center; }
+a.text-success:hover,
+a.text-success:focus { color: darken(@state-success-text, 10%); }
 
 .text-left           { text-align: left; }
 .text-right          { text-align: right; }