diff --git a/Gruntfile.js b/Gruntfile.js index dd6fb5f0e4b131f7e2328c31c4e17dd5ca37d0db..e05763f1c5dd2e3c5099a54d92b3b363b202fea6 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 843994ca6a789d03d23b4a49b8dcd81865eaa9fe..e68ee68df2a2cdf8987b111df5043a774e5bf735 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 6b3ca7053e9b1edd33d4b78814028aeb385b9977..f8b12daf8a17b3e4f83ebc2684e8c30b309b1a06 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 45f2fd0a96065931e0f25fd8fb39957a8d1b4137..43ada11d9a836619c042436e92d74bf12467166a 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 3a6ed3d99e013b1f0e233765696b90151a6bfde0..7f6d3bf3ac6c6eca5dcb5c0f275b143f6722304f 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(); + } }