diff options
| author | Mark Otto <[email protected]> | 2012-12-08 17:40:42 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-12-08 17:40:42 -0800 |
| commit | bc0b94a3fdc8fe480c74f4494073e2c0addb265e (patch) | |
| tree | e13fec2ed829b4586fa4044fffc8dbfadddae54e /less/tests | |
| parent | be5f31480b53555c492e0077c8bb9f419fc48f62 (diff) | |
| parent | 9376a7c221a64c2bf508d02ea2ccd85748d10fcc (diff) | |
| download | bootstrap-bc0b94a3fdc8fe480c74f4494073e2c0addb265e.tar.xz bootstrap-bc0b94a3fdc8fe480c74f4494073e2c0addb265e.zip | |
Merge branch 'master' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/css.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/javascript.mustache
less/breadcrumbs.less
less/tables.less
less/tests/css-tests.html
Diffstat (limited to 'less/tests')
| -rw-r--r-- | less/tests/css-tests.html | 49 |
1 files changed, 48 insertions, 1 deletions
diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html index 7af759f48..9a5fd589d 100644 --- a/less/tests/css-tests.html +++ b/less/tests/css-tests.html @@ -467,7 +467,54 @@ </div> </div><!--/row--> - +<h4>Nesting and striping</h4> +<table class="table table-bordered table-striped"> + <thead> + <tr> + <th>Test</th> + </tr> + </thead> + <tbody> + <tr> + <td> + <table class="table table-bordered table-striped"> + <thead> + <tr> + <th>Test</th> + <th>Test</th> + </tr> + </thead> + <tbody> + <tr> + <td> + test + </td> + <td> + test + </td> + </tr> + <tr> + <td> + test + </td> + <td> + test + </td> + </tr> + <tr> + <td> + test + </td> + <td> + test + </td> + </tr> + </tbody> + </table> + </td> + </tr> + </tbody> +</table> <!-- Forms |