diff options
| -rw-r--r-- | docs/assets/css/bootstrap.css | 16 | ||||
| -rw-r--r-- | docs/assets/js/application.js | 2 | ||||
| -rw-r--r-- | docs/scaffolding.html | 2 | ||||
| -rw-r--r-- | docs/templates/pages/scaffolding.mustache | 2 | ||||
| -rw-r--r-- | less/navbar.less | 4 | ||||
| -rw-r--r-- | less/tables.less | 23 |
6 files changed, 39 insertions, 10 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index aa250e0c7..43d391acf 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1888,6 +1888,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, @@ -4151,6 +4163,10 @@ input[type="button"].btn-block { color: #ffffff; } +.navbar-inverse .brand { + color: #999999; +} + .navbar-inverse .navbar-text { color: #999999; } 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 }) diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 7e5f23997..6a0e4ba0b 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -119,7 +119,7 @@ <p>These styles can be found within <strong>scaffolding.less</strong>.</p> <h3>Reset via Normalize</h3> - <p>With Bootstrap 2, the old reset block has been dropped in favor of <a href="http://necolas.github.com/normalize.css/" target="_blank">Normalize.css</a>, a project by <a href="http://twitter.com/necolas" target="_blank">Nicolas Gallagher</a> that also powers the <a href="http://html5boilerplate.com" target="_blank">HTML5 Boilerplate</a>. While we use much of Normalize within our <strong>reset.less</strong>, we have removed some elements specifically for Bootstrap.</p> + <p>With Bootstrap 2, the old reset block has been dropped in favor of <a href="http://necolas.github.com/normalize.css/" target="_blank">Normalize.css</a>, a project by <a href="http://twitter.com/necolas" target="_blank">Nicolas Gallagher</a> and <a href="http://twitter.com/jon_neal" target="_blank">Jonathan Neal</a> that also powers the <a href="http://html5boilerplate.com" target="_blank">HTML5 Boilerplate</a>. While we use much of Normalize within our <strong>reset.less</strong>, we have removed some elements specifically for Bootstrap.</p> </section> diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index 0382b0ee3..7a5bfaed7 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -51,7 +51,7 @@ <p>{{_i}}These styles can be found within <strong>scaffolding.less</strong>.{{/i}}</p> <h3>{{_i}}Reset via Normalize{{/i}}</h3> - <p>{{_i}}With Bootstrap 2, the old reset block has been dropped in favor of <a href="http://necolas.github.com/normalize.css/" target="_blank">Normalize.css</a>, a project by <a href="http://twitter.com/necolas" target="_blank">Nicolas Gallagher</a> that also powers the <a href="http://html5boilerplate.com" target="_blank">HTML5 Boilerplate</a>. While we use much of Normalize within our <strong>reset.less</strong>, we have removed some elements specifically for Bootstrap.{{/i}}</p> + <p>{{_i}}With Bootstrap 2, the old reset block has been dropped in favor of <a href="http://necolas.github.com/normalize.css/" target="_blank">Normalize.css</a>, a project by <a href="http://twitter.com/necolas" target="_blank">Nicolas Gallagher</a> and <a href="http://twitter.com/jon_neal" target="_blank">Jonathan Neal</a> that also powers the <a href="http://html5boilerplate.com" target="_blank">HTML5 Boilerplate</a>. While we use much of Normalize within our <strong>reset.less</strong>, we have removed some elements specifically for Bootstrap.{{/i}}</p> </section> diff --git a/less/navbar.less b/less/navbar.less index 433ebe024..fa2a0e3c5 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -368,6 +368,10 @@ } } + .brand { + color: @navbarInverseBrandColor; + } + .navbar-text { color: @navbarInverseText; } diff --git a/less/tables.less b/less/tables.less index 44c3909b7..9671be9bc 100644 --- a/less/tables.less +++ b/less/tables.less @@ -90,36 +90,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); } } |