diff options
| author | fat <[email protected]> | 2013-07-18 01:08:19 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2013-07-18 01:08:19 -0700 |
| commit | 6ec8a1e44f6b58ed57d015916a4fe39bfb0e2340 (patch) | |
| tree | 8480da0e7c249bf59f6a13e9f108d1429e1d4741 /docs/css.html | |
| parent | 4b40ee692dc066f2ad3c4dd96af67a83475f5cbe (diff) | |
| parent | 181b27677492050adceaa52fe972115515759f07 (diff) | |
| download | bootstrap-6ec8a1e44f6b58ed57d015916a4fe39bfb0e2340.tar.xz bootstrap-6ec8a1e44f6b58ed57d015916a4fe39bfb0e2340.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
Diffstat (limited to 'docs/css.html')
| -rw-r--r-- | docs/css.html | 76 |
1 files changed, 52 insertions, 24 deletions
diff --git a/docs/css.html b/docs/css.html index b401b6593..10f2ea1dd 100644 --- a/docs/css.html +++ b/docs/css.html @@ -1048,8 +1048,8 @@ For example, <code><section></code> should be wrapped as inline. - <h2 id="tables-row-classes">Optional row classes</h2> - <p>Use contextual classes to color table rows.</p> + <h2 id="tables-row-classes">Contextual table classes</h2> + <p>Use contextual classes to color table rows or individual cells.</p> <table class="table table-bordered table-striped"> <colgroup> <col class="col-lg-1"> @@ -1066,19 +1066,25 @@ For example, <code><section></code> should be wrapped as inline. <td> <code>.success</code> </td> - <td>Indicates a successful or positive action.</td> + <td>Indicates a successful or positive action</td> </tr> <tr> <td> <code>.danger</code> </td> - <td>Indicates a dangerous or potentially negative action.</td> + <td>Indicates a dangerous or potentially negative action</td> </tr> <tr> <td> <code>.warning</code> </td> - <td>Indicates a warning that might need attention.</td> + <td>Indicates a warning that might need attention</td> + </tr> + <tr> + <td> + <code>.active</code> + </td> + <td>Applies the hover color to a particular row or cell</td> </tr> </tbody> </table> @@ -1087,42 +1093,64 @@ For example, <code><section></code> should be wrapped as inline. <thead> <tr> <th>#</th> - <th>Product</th> - <th>Payment Taken</th> - <th>Status</th> + <th>Column heading</th> + <th>Column heading</th> + <th>Column heading</th> </tr> </thead> <tbody> <tr class="success"> <td>1</td> - <td>TB - Monthly</td> - <td>01/04/2012</td> - <td>Approved</td> + <td>Column content</td> + <td>Column content</td> + <td>Column content</td> </tr> - <tr class="danger"> + <tr> <td>2</td> - <td>TB - Monthly</td> - <td>02/04/2012</td> - <td>Declined</td> + <td>Column content</td> + <td>Column content</td> + <td>Column content</td> </tr> - <tr class="warning"> + <tr class="danger"> <td>3</td> - <td>TB - Monthly</td> - <td>03/04/2012</td> - <td>Pending</td> + <td>Column content</td> + <td>Column content</td> + <td>Column content</td> + </tr> + <tr> + <td>4</td> + <td>Column content</td> + <td>Column content</td> + <td>Column content</td> + </tr> + <tr class="warning"> + <td>5</td> + <td>Column content</td> + <td>Column content</td> + <td>Column content</td> + </tr> + <tr> + <td>6</td> + <td>Column content</td> + <td>Column content</td> + <td>Column content</td> + </tr> + <tr class="active"> + <td>7</td> + <td>Column content</td> + <td>Column content</td> + <td>Column content</td> </tr> </tbody> </table> </div><!-- /example --> {% highlight html %} -... <tr class="success"> <td>1</td> - <td>TB - Monthly</td> - <td>01/04/2012</td> - <td>Approved</td> + <td>Column content</td> + <td>Column content</td> + <td>Column content</td> </tr> -... {% endhighlight %} </div> |