From c8856eeff3a8fdcb6d458860e4fbbc82b4620f05 Mon Sep 17 00:00:00 2001 From: Drew Goodwin Date: Sat, 10 Nov 2012 17:58:00 -0800 Subject: fixes #5873: @navbarInverseBrandColor not used --- docs/assets/css/bootstrap.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 085ad1400..401e68000 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; } -- cgit v1.2.3 From 0df0b5f1f518eb119e4747084f0ad3caaaf82668 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 14 Nov 2012 15:19:16 -0800 Subject: run make after latest merges --- docs/assets/css/bootstrap.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 401e68000..d3490f856 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, -- cgit v1.2.3 From 1700e48e7f5393aec9c51c70ed4f0ca922e568ae Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 14 Nov 2012 15:20:38 -0800 Subject: Fixes #5879: Manual update of Normalize credit --- docs/scaffolding.html | 2 +- docs/templates/pages/scaffolding.mustache | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 5261ea616..f63aa9003 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 99bdb46f5..a6f2f9dac 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}}

-- cgit v1.2.3 From 05655ff4ff3b44f5c773dcc6079d03af498733d5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Nov 2012 09:14:54 -0800 Subject: fixes #5922: clicking only button should download custom build --- docs/assets/js/application.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 5baab3935..f6c7849c3 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 }) -- cgit v1.2.3