Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

5 files changed, 26 insertions, 24 deletions

diff --git a/Gruntfile.js b/Gruntfile.js
index dd6fb5f0e..e05763f1c 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -166,10 +166,10 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('browserstack-runner');
 
   // Docs HTML validation task
-  grunt.registerTask('validate-docs', ['jekyll', 'validation']);
+  grunt.registerTask('validate-html', ['jekyll', 'validation']);
 
   // Test task.
-  var testSubtasks = ['jshint', 'qunit', 'validate-docs'];
+  var testSubtasks = ['dist-css', 'jshint', 'qunit', 'validate-html'];
   // Only run BrowserStack tests under Travis
   if (process.env.TRAVIS) {
     // Only run BrowserStack tests if this is a mainline commit in twbs/bootstrap, or you have your own BrowserStack key
diff --git a/_layouts/home.html b/_layouts/home.html
index 843994ca6..e68ee68df 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -25,7 +25,7 @@
           <a href="{{ site.repo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a>
         </li>
         <li>
-          <a href="{{ page.base_url }}getting-started#/examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
+          <a href="{{ page.base_url }}getting-started/#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
         </li>
         <li>
           <a href="{{ page.base_url }}components/#glyphicons" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Glyphicons']);">Glyphicons</a>
diff --git a/components.html b/components.html
index 6b3ca7053..f8b12daf8 100644
--- a/components.html
+++ b/components.html
@@ -256,17 +256,17 @@ base_url: "../"
     <div class="bs-example">
       <div class="btn-toolbar">
         <div class="btn-group">
-          <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-left"></span></a>
-          <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-center"></span></a>
-          <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-right"></span></a>
-          <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-justify"></span></a>
+          <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-left"></span></button>
+          <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-center"></span></button>
+          <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-right"></span></button>
+          <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-justify"></span></button>
         </div>
       </div>
       <div class="btn-toolbar">
-        <button type="button" class="btn btn-default btn-lg"><span class="glyphicon glyphicon-star"></span> Star</a>
-        <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-star"></span> Star</a>
-        <button type="button" class="btn btn-default btn-sm"><span class="glyphicon glyphicon-star"></span> Star</a>
-        <button type="button" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-star"></span> Star</a>
+        <button type="button" class="btn btn-default btn-lg"><span class="glyphicon glyphicon-star"></span> Star</button>
+        <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-star"></span> Star</button>
+        <button type="button" class="btn btn-default btn-sm"><span class="glyphicon glyphicon-star"></span> Star</button>
+        <button type="button" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-star"></span> Star</button>
       </div>
     </div>
 {% highlight html %}
diff --git a/less/button-groups.less b/less/button-groups.less
index 45f2fd0a9..43ada11d9 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -22,11 +22,11 @@
   & .btn-default .caret {
     border-bottom-color: @btn-default-color;
   }
-  & .btn-primary,
-  & .btn-success,
-  & .btn-warning,
-  & .btn-danger,
-  & .btn-info {
+  .btn-primary,
+  .btn-success,
+  .btn-warning,
+  .btn-danger,
+  .btn-info {
    .caret {
       border-bottom-color: #fff;
     }
diff --git a/less/scaffolding.less b/less/scaffolding.less
index 3a6ed3d99..7f6d3bf3a 100644
--- a/less/scaffolding.less
+++ b/less/scaffolding.less
@@ -54,14 +54,16 @@ textarea {
 a {
   color: @link-color;
   text-decoration: none;
-}
-a:hover,
-a:focus {
-  color: @link-hover-color;
-  text-decoration: underline;
-}
-a:focus {
-  .tab-focus();
+
+  &:hover,
+  &:focus {
+    color: @link-hover-color;
+    text-decoration: underline;
+  }
+
+  &:focus {
+    .tab-focus();
+  }
 }