From c8856eeff3a8fdcb6d458860e4fbbc82b4620f05 Mon Sep 17 00:00:00 2001 From: Drew Goodwin Date: Sat, 10 Nov 2012 17:58:00 -0800 Subject: [PATCH 1/5] fixes #5873: @navbarInverseBrandColor not used --- docs/assets/css/bootstrap.css | 4 ++++ less/navbar.less | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 085ad14001..401e68000f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4678,6 +4678,10 @@ input[type="submit"].btn.btn-mini { color: #ffffff; } +.navbar-inverse .brand { + color: #999999; +} + .navbar-inverse .navbar-text { color: #999999; } diff --git a/less/navbar.less b/less/navbar.less index 532c5926b8..3cc0ef2031 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -394,6 +394,10 @@ } } + .brand { + color: @navbarInverseBrandColor; + } + .navbar-text { color: @navbarInverseText; } From 41889f74d0dc97cfb8bbd80754fc0ec01ef39d58 Mon Sep 17 00:00:00 2001 From: amid2887 Date: Tue, 13 Nov 2012 17:49:33 +0700 Subject: [PATCH 2/5] Update less/tables.less Possible typing. Add @baseBorderRadius as value for some rules. Add border-radius clearing for first and last td in the last tbody for table with tfoot. --- less/tables.less | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/less/tables.less b/less/tables.less index fc8750f97c..d73b581803 100644 --- a/less/tables.less +++ b/less/tables.less @@ -91,36 +91,45 @@ table { // For first th or td in the first row in the first thead or tbody thead:first-child tr:first-child th:first-child, tbody:first-child tr:first-child td:first-child { - .border-top-left-radius(4px); + .border-top-left-radius(@baseBorderRadius); } thead:first-child tr:first-child th:last-child, tbody:first-child tr:first-child td:last-child { - .border-top-right-radius(4px); + .border-top-right-radius(@baseBorderRadius); } - // For first th or td in the first row in the first thead or tbody + // For first th or td in the last row in the last thead or tbody thead:last-child tr:last-child th:first-child, tbody:last-child tr:last-child td:first-child, tfoot:last-child tr:last-child td:first-child { - .border-bottom-left-radius(4px); + .border-bottom-left-radius(@baseBorderRadius); } thead:last-child tr:last-child th:last-child, tbody:last-child tr:last-child td:last-child, tfoot:last-child tr:last-child td:last-child { - .border-bottom-right-radius(4px); + .border-bottom-right-radius(@baseBorderRadius); } + // Clear border-radius for first and last td in the last row in the last tbody for table with tfoot + tfoot + tbody:last-child tr:last-child td:first-child { + .border-bottom-left-radius(0); + } + tfoot + tbody:last-child tr:last-child td:last-child { + .border-bottom-right-radius(0); + } + + // Special fixes to round the left border on the first td/th caption + thead tr:first-child th:first-child, caption + tbody tr:first-child td:first-child, colgroup + thead tr:first-child th:first-child, colgroup + tbody tr:first-child td:first-child { - .border-top-left-radius(4px); + .border-top-left-radius(@baseBorderRadius); } caption + thead tr:first-child th:last-child, caption + tbody tr:first-child td:last-child, colgroup + thead tr:first-child th:last-child, colgroup + tbody tr:first-child td:last-child { - .border-top-right-radius(4px); + .border-top-right-radius(@baseBorderRadius); } } From 0df0b5f1f518eb119e4747084f0ad3caaaf82668 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 14 Nov 2012 15:19:16 -0800 Subject: [PATCH 3/5] run make after latest merges --- docs/assets/css/bootstrap.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 401e68000f..d3490f856d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2069,6 +2069,18 @@ table { -moz-border-radius-bottomright: 4px; } +.table-bordered tfoot + tbody:last-child tr:last-child td:first-child { + -webkit-border-bottom-left-radius: 0; + border-bottom-left-radius: 0; + -moz-border-radius-bottomleft: 0; +} + +.table-bordered tfoot + tbody:last-child tr:last-child td:last-child { + -webkit-border-bottom-right-radius: 0; + border-bottom-right-radius: 0; + -moz-border-radius-bottomright: 0; +} + .table-bordered caption + thead tr:first-child th:first-child, .table-bordered caption + tbody tr:first-child td:first-child, .table-bordered colgroup + thead tr:first-child th:first-child, From 1700e48e7f5393aec9c51c70ed4f0ca922e568ae Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 14 Nov 2012 15:20:38 -0800 Subject: [PATCH 4/5] Fixes #5879: Manual update of Normalize credit --- docs/scaffolding.html | 2 +- docs/templates/pages/scaffolding.mustache | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 5261ea6160..f63aa9003f 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -123,7 +123,7 @@

These styles can be found within scaffolding.less.

Reset via Normalize

-

With Bootstrap 2, the old reset block has been dropped in favor of Normalize.css, a project by Nicolas Gallagher that also powers the HTML5 Boilerplate. While we use much of Normalize within our reset.less, we have removed some elements specifically for Bootstrap.

+

With Bootstrap 2, the old reset block has been dropped in favor of Normalize.css, a project by Nicolas Gallagher and Jonathan Neal that also powers the HTML5 Boilerplate. While we use much of Normalize within our reset.less, we have removed some elements specifically for Bootstrap.

diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index 99bdb46f5e..a6f2f9dac1 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -52,7 +52,7 @@

{{_i}}These styles can be found within scaffolding.less.{{/i}}

{{_i}}Reset via Normalize{{/i}}

-

{{_i}}With Bootstrap 2, the old reset block has been dropped in favor of Normalize.css, a project by Nicolas Gallagher that also powers the HTML5 Boilerplate. While we use much of Normalize within our reset.less, we have removed some elements specifically for Bootstrap.{{/i}}

+

{{_i}}With Bootstrap 2, the old reset block has been dropped in favor of Normalize.css, a project by Nicolas Gallagher and Jonathan Neal that also powers the HTML5 Boilerplate. While we use much of Normalize within our reset.less, we have removed some elements specifically for Bootstrap.{{/i}}

From 05655ff4ff3b44f5c773dcc6079d03af498733d5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Nov 2012 09:14:54 -0800 Subject: [PATCH 5/5] fixes #5922: clicking only button should download custom build --- docs/assets/js/application.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 5baab39354..f6c7849c3a 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -89,7 +89,7 @@ }) // request built javascript - $('.download-btn').on('click', function () { + $('.download-btn .btn').on('click', function () { var css = $("#components.download input:checked") .map(function () { return this.value })