diff options
| author | Jacob Thornton <[email protected]> | 2012-02-21 23:18:18 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-02-21 23:18:18 -0800 |
| commit | f3b6cf1d6d65ccc640152aa4edb88cbea05a8b45 (patch) | |
| tree | b8fff7c4434ad1ee48b4aa2e4afa24b844c0a717 /docs/base-css.html | |
| parent | 5ad5dde1e24f668cf9b720dd59fc2a7d4808c0b3 (diff) | |
| parent | a139167489e249345933b1e58cc7c53542abab97 (diff) | |
| download | bootstrap-f3b6cf1d6d65ccc640152aa4edb88cbea05a8b45.tar.xz bootstrap-f3b6cf1d6d65ccc640152aa4edb88cbea05a8b45.zip | |
Merge branch '2.0.2-wip' of https://github.com/twitter/bootstrap into 2.0.2-wip
Conflicts:
docs/assets/bootstrap.zip
less/mixins.less
Diffstat (limited to 'docs/base-css.html')
| -rw-r--r-- | docs/base-css.html | 88 |
1 files changed, 43 insertions, 45 deletions
diff --git a/docs/base-css.html b/docs/base-css.html index 79ea2ac55..3a6494ddc 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -571,7 +571,7 @@ For example, <code>section</code> should be wrapped as inline. <th>#</th> <th>First Name</th> <th>Last Name</th> - <th>Language</th> + <th>Username</th> </tr> </thead> <tbody> @@ -579,19 +579,19 @@ For example, <code>section</code> should be wrapped as inline. <td>1</td> <td>Mark</td> <td>Otto</td> - <td>CSS</td> + <td>@mdo</td> </tr> <tr> <td>2</td> <td>Jacob</td> <td>Thornton</td> - <td>Javascript</td> + <td>@fat</td> </tr> <tr> <td>3</td> - <td>Stu</td> - <td>Dent</td> - <td>HTML</td> + <td>Larry</td> + <td>the Bird</td> + <td>@twitter</td> </tr> </tbody> </table> @@ -616,7 +616,7 @@ For example, <code>section</code> should be wrapped as inline. <th>#</th> <th>First Name</th> <th>Last Name</th> - <th>Language</th> + <th>Username</th> </tr> </thead> <tbody> @@ -624,19 +624,19 @@ For example, <code>section</code> should be wrapped as inline. <td>1</td> <td>Mark</td> <td>Otto</td> - <td>CSS</td> + <td>@mdo</td> </tr> <tr> <td>2</td> <td>Jacob</td> <td>Thornton</td> - <td>Javascript</td> + <td>@fat</td> </tr> <tr> <td>3</td> - <td>Stu</td> - <td>Dent</td> - <td>HTML</td> + <td>Larry</td> + <td>the Bird</td> + <td>@twitter</td> </tr> </tbody> </table> @@ -660,31 +660,31 @@ For example, <code>section</code> should be wrapped as inline. <th>#</th> <th>First Name</th> <th>Last Name</th> - <th>Language</th> + <th>Username</th> </tr> </thead> <tbody> <tr> - <td>1</td> - <td colspan="2">Mark Otto</td> - <td>CSS</td> + <td rowspan="2">1</td> + <td>Mark</td> + <td>Otto</td> + <td>@mdo</td> + </tr> + <tr> + <td>Mark</td> + <td>Otto</td> + <td>@TwBootstrap</td> </tr> <tr> <td>2</td> <td>Jacob</td> <td>Thornton</td> - <td rowspan="2">Javascript</td> - </tr> - </tr> - <td>3</td> - <td>Stu</td> - <td>Dent</td> + <td>@fat</td> </tr> <tr> <td>3</td> - <td>Brosef</td> - <td>Stalin</td> - <td>HTML</td> + <td colspan="2">Larry the Bird</td> + <td>@twitter</td> </tr> </tbody> </table> @@ -708,7 +708,7 @@ For example, <code>section</code> should be wrapped as inline. <th>#</th> <th>First Name</th> <th>Last Name</th> - <th>Language</th> + <th>Username</th> </tr> </thead> <tbody> @@ -716,19 +716,18 @@ For example, <code>section</code> should be wrapped as inline. <td>1</td> <td>Mark</td> <td>Otto</td> - <td>CSS</td> + <td>@mdo</td> </tr> <tr> <td>2</td> <td>Jacob</td> <td>Thornton</td> - <td>Javascript</td> + <td>@fat</td> </tr> <tr> <td>3</td> - <td>Stu</td> - <td>Dent</td> - <td>HTML</td> + <td colspan="2">Larry the Bird</td> + <td>@twitter</td> </tr> </tbody> </table> @@ -750,36 +749,35 @@ For example, <code>section</code> should be wrapped as inline. <table class="table table-striped table-bordered table-condensed"> <thead> <tr> + <th></th> + <th colspan="2">Full name</th> + <th></th> + </tr> + <tr> <th>#</th> - <th class="yellow">First Name</th> - <th class="blue">Last Name</th> - <th class="green">Language</th> + <th>First Name</th> + <th>Last Name</th> + <th>Username</th> </tr> </thead> <tbody> <tr> + <tr> <td>1</td> <td>Mark</td> <td>Otto</td> - <td>CSS</td> + <td>@mdo</td> </tr> <tr> <td>2</td> <td>Jacob</td> <td>Thornton</td> - <td>Javascript</td> + <td>@fat</td> </tr> <tr> <td>3</td> - <td>Stu</td> - <td>Dent</td> - <td>HTML</td> - </tr> - <tr> - <td>4</td> - <td>Brosef</td> - <td>Stalin</td> - <td>HTML</td> + <td colspan="2">Larry the Bird</td> + <td>@twitter</td> </tr> </tbody> </table> |