From d721c61d996d1eda9f6ace1163f38da8bce492b8 Mon Sep 17 00:00:00 2001 From: vsn4ik Date: Sun, 18 Aug 2013 23:06:56 +0400 Subject: [PATCH 1/6] Fix examples url in _layouts/home.html --- _layouts/home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/home.html b/_layouts/home.html index 843994ca6a..e68ee68df2 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -25,7 +25,7 @@ GitHub project
  • - Examples + Examples
  • Glyphicons From 1b49b42683e4192a39f3d3d045a98b262a498097 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 18 Aug 2013 13:40:39 -0700 Subject: [PATCH 2/6] fix wrong closing tag on Glyphicons-in-buttons examples --- components.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/components.html b/components.html index 6b3ca7053e..f8b12daf8a 100644 --- a/components.html +++ b/components.html @@ -256,17 +256,17 @@ base_url: "../"
    - + + +
    - + + +
    {% highlight html %} From b5d87fc42b04d74b25101293c83d8a4f01a3e22c Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 18 Aug 2013 13:43:53 -0700 Subject: [PATCH 3/6] rename HTML5 validation Grunt task since it checks the examples too --- Gruntfile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index dd6fb5f0e4..9e57ac024a 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 = ['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 From 518488cb4069b4181435873380d0738e8b63bc81 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 18 Aug 2013 13:47:16 -0700 Subject: [PATCH 4/6] make Recess part of the Grunt test task to guard against bad LESS --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index 9e57ac024a..e05763f1c5 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -169,7 +169,7 @@ module.exports = function(grunt) { grunt.registerTask('validate-html', ['jekyll', 'validation']); // Test task. - var testSubtasks = ['jshint', 'qunit', 'validate-html']; + 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 From 743fc9ac7e7d0b82a5443855631122c1e0a7e0bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sun, 18 Aug 2013 23:28:55 +0200 Subject: [PATCH 5/6] Nesting for link styles --- less/scaffolding.less | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/less/scaffolding.less b/less/scaffolding.less index 3a6ed3d99e..7f6d3bf3ac 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(); + } } From fa3959a1e10da848867be73ac1d18d209367a9b0 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 18 Aug 2013 15:05:42 -0700 Subject: [PATCH 6/6] rm redundant ampersands from button-groups LESS --- less/button-groups.less | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/less/button-groups.less b/less/button-groups.less index 45f2fd0a96..43ada11d9a 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; }