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

docs/examples/fluid.html

@@ -95,7 +95,7 @@
           <div class="hero-unit">
             <h1>Hello, world!</h1>
             <p>This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.</p>
-            <p><a class="btn btn-primary btn-large">Learn more &raquo;</a></p>
+            <p><a href="#" class="btn btn-primary btn-large">Learn more &raquo;</a></p>
           </div>
           <div class="row-fluid">
             <div class="span4">

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;
     }

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);

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;

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;

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

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,

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;
     }

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;

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;

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;

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

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;
 }
 

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; }

package.json

@@ -19,7 +19,7 @@
   , "devDependencies": {
       "uglify-js": "1.3.4"
     , "jshint": "0.9.1"
-    , "recess": "1.0.3"
+    , "recess": "1.1.6"
     , "connect": "2.1.3"
     , "hogan.js": "2.0.0"
   }