diff --git a/bootstrap.css b/bootstrap.css index d573d34366..c184d1332a 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Tue Jan 17 23:24:38 PST 2012 + * Date: Tue Jan 17 23:38:42 PST 2012 */ html, body { margin: 0; @@ -975,27 +975,27 @@ input::-webkit-input-placeholder { .form-horizontal .form-actions { padding-left: 160px; } -table { +.table { width: 100%; margin-bottom: 18px; } -th, td { +.table th, .table td { padding: 8px; line-height: 18px; text-align: left; border-top: 1px solid #ddd; } -th { +.table th { font-weight: bold; vertical-align: bottom; } -td { +.table td { vertical-align: top; } -thead:first-child tr th, thead:first-child tr td { +.table thead:first-child tr th, .table thead:first-child tr td { border-top: 0; } -tbody + tbody { +.table tbody + tbody { border-top: 2px solid #ddd; } .table-condensed th, .table-condensed td { diff --git a/bootstrap.min.css b/bootstrap.min.css index 1255854f80..a6128a0b5e 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -176,12 +176,11 @@ input::-webkit-input-placeholder{color:#999999;} .form-horizontal .control-group>label{float:left;width:140px;padding-top:5px;text-align:right;} .form-horizontal .controls{margin-left:160px;} .form-horizontal .form-actions{padding-left:160px;} -table{width:100%;margin-bottom:18px;} -th,td{padding:8px;line-height:18px;text-align:left;border-top:1px solid #ddd;} -th{font-weight:bold;vertical-align:bottom;} -td{vertical-align:top;} -thead:first-child tr th,thead:first-child tr td{border-top:0;} -tbody+tbody{border-top:2px solid #ddd;} +.table{width:100%;margin-bottom:18px;}.table th,.table td{padding:8px;line-height:18px;text-align:left;border-top:1px solid #ddd;} +.table th{font-weight:bold;vertical-align:bottom;} +.table td{vertical-align:top;} +.table thead:first-child tr th,.table thead:first-child tr td{border-top:0;} +.table tbody+tbody{border-top:2px solid #ddd;} .table-condensed th,.table-condensed td{padding:4px 5px;} .table-bordered{border:1px solid #ddd;border-collapse:separate;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th+th,.table-bordered td+td,.table-bordered th+td,.table-bordered td+th{border-left:1px solid #ddd;} .table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0;} diff --git a/docs/base-css.html b/docs/base-css.html index 1d64a57870..fa60204a84 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -150,7 +150,7 @@

Emphasis, address, and abbreviation

- +
@@ -237,7 +237,7 @@

Blockquotes

-
Element
+
@@ -383,7 +383,7 @@

Code Inline and block

-
Element
+
@@ -425,7 +425,7 @@

Inline labels for special attention

-
Element
+
@@ -490,7 +490,7 @@

Table markup

-
Labels
+
@@ -579,7 +579,7 @@

Table options

-
Tag
+
@@ -591,6 +591,13 @@ + + + + + @@ -623,14 +630,14 @@

1. Default table styles

-

Tables are automatically styled with only a few borders to ensure readability and maintain structure. No classes are required.

+

Tables are automatically styled with only a few borders to ensure readability and maintain structure. With 2.0, the .table class is required.

-<table>
+<table class="table">
   ...
 </table>
-
Name
Default NoneNo styles, just columns and rows
Basic + .table + Only horizontal lines between rows
+
@@ -670,12 +677,12 @@

Get a little fancy with your tables by adding zebra-striping—just add the .table-striped class.

Note: Sprited tables use the :nth-child CSS selector and is not available in IE7-IE8.

-<table class="table-striped">
+<table class="table table-striped">
   ...
 </table>
-
#
+
@@ -714,12 +721,12 @@

Add borders around the entire table and rounded corners for aesthetic purposes.

-<table class="table-bordered">
+<table class="table table-bordered">
   ...
 </table>
-
#
+
@@ -762,12 +769,12 @@

Make your tables more compact by adding the .table-condensed class to cut table cell padding in half (from 10px to 5px).

-<table class="table-condensed">
+<table class="table table-condensed">
   ...
 </table>
-
#
+
@@ -816,12 +823,12 @@ }); }); </script> -<table class="table-striped"> +<table class="table table-striped"> ... </table>
-
#
+
@@ -858,7 +865,7 @@
#

Styles for the Tablesorter, zebra striping, borders, and condensing may all compound in any variation to fit your needs.

- +
@@ -932,7 +939,7 @@

Four types of forms

Bootstrap provides simple markup and styles for four styles of common web forms.

-
#
+
@@ -1259,7 +1266,7 @@

Buttons

-
Name
+
diff --git a/docs/index.html b/docs/index.html index c30417c8f5..ce56a04ef6 100644 --- a/docs/index.html +++ b/docs/index.html @@ -267,7 +267,7 @@ ================================================== -->

Get started in no time.

Quickly start using Bootstrap within your workflow and development process.

-
Button
+
diff --git a/docs/javascript.html b/docs/javascript.html index a132a40118..fb854d2814 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -284,7 +284,7 @@

Call the modal via javascript:

$('#myModal').modal(options)

Options

- +
@@ -349,7 +349,7 @@ $('#myModal').modal({ 
$('#myModal').modal('hide')

Events

Bootstrap's modal class exposes a few events for hooking into modal functionality.

-
Name
+
@@ -666,7 +666,7 @@ $('#myModal').on('hidden', function () { </script>

Events

-
Event
+
@@ -719,7 +719,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

Trigger the tooltip via javascript:

$('#example').tooltip(options)

Options

-
Event
+
@@ -813,7 +813,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

Enable popovers via javascript:

$('#example').popover(options)

Options

-
Name
+
@@ -933,7 +933,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { 
$(".alert-message").alert('close')

Events

Bootstrap's alert class exposes a few events for hooking into alert functionality.

-
Name
+
@@ -976,7 +976,7 @@ $('#my-alert').bind('closed', function () {

Example uses

Use the buttons plugin for states and toggles.

-
Event
+
@@ -1125,7 +1125,7 @@ $('#my-alert').bind('closed', function () {

Enable via javascript:

$(".collapse").collapse()

Options

-
Stateful
+
@@ -1175,7 +1175,7 @@ $('#myCollapsible').collapse({

Bootstrap's collapse class exposes a few events for hooking into collapse functionality.

-
Name
+
@@ -1261,7 +1261,7 @@ $('#myCollapsible').on('hidden', function () {

Call via javascript:

$('.carousel').carousel()

Options

-
Event
+
@@ -1310,7 +1310,7 @@ $('.myCarousel').carousel({

Cycles to the next item.

Events

Bootstrap's modal class exposes a few events for hooking into modal functionality.

-
Name
+
@@ -1358,7 +1358,7 @@ $('.myCarousel').carousel({

Call the typeahead via javascript:

$('.typeahead').typeahead()

Options

-
Event
+
diff --git a/docs/less.html b/docs/less.html index 6e43d95bd1..09ff3e8e10 100644 --- a/docs/less.html +++ b/docs/less.html @@ -160,7 +160,7 @@

Hyperlinks

-
Name
+
@@ -185,7 +185,7 @@

Grayscale colors

-
Variable
+
@@ -216,7 +216,7 @@

Accent colors

-
@black
+
@@ -254,7 +254,7 @@

Grid system

-
@blue
+
@@ -277,7 +277,7 @@

Typography

-
@gridColumns
+
@@ -302,7 +302,7 @@

Visuals

-
@baseFontSize
+
@@ -453,7 +453,7 @@

Compiling Less

After modifying the .less files in /lib/, you'll need to recompile them in order to regenerate the bootstrap-*.*.*.css and bootstrap-*.*.*.min.css files. If you're submitting a pull request to GitHub, you must always recompile.

Ways to compile

-
@primaryButtonColor
+
diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 77b94d8ce3..f068c837c7 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -223,7 +223,7 @@

Grid customization

-
Method
+
@@ -335,7 +335,7 @@

Supported devices

Bootstrap supports a handful of media queries to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:

-
Variable
+
diff --git a/lib/tables.less b/lib/tables.less index 1edd9e3b80..29e1e2d465 100644 --- a/lib/tables.less +++ b/lib/tables.less @@ -4,39 +4,38 @@ // ---------------------------------------- - // BASELINE STYLES // --------------- -table { +.table { width: 100%; margin-bottom: @baseLineHeight; -} -th, -td { - padding: 8px; - line-height: @baseLineHeight; - text-align: left; - border-top: 1px solid #ddd; -} -th { - font-weight: bold; - vertical-align: bottom; -} -td { - vertical-align: top; + // Cells + th, + td { + padding: 8px; + line-height: @baseLineHeight; + text-align: left; + border-top: 1px solid #ddd; + } + th { + font-weight: bold; + vertical-align: bottom; + } + td { + vertical-align: top; + } + // Remove top border from thead by default + thead:first-child tr th, + thead:first-child tr td { + border-top: 0; + } + // Account for multiple tbody instances + tbody + tbody { + border-top: 2px solid #ddd; + } } -// Remove top border from thead by default -thead:first-child tr th, -thead:first-child tr td { - border-top: 0; -} - -// Account for multiple tbody instances -tbody + tbody { - border-top: 2px solid #ddd; -} // CONDENSED TABLE W/ HALF PADDING
Label