root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix tables for rowspan

This commit is contained in:
Mark Otto 2011-12-27 16:25:22 -06:00
parent 46d2ad5e22
commit e78d5f8ff3
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap.css vendored
View File

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Tue Dec 27 16:07:55 CST 2011 * Date: Tue Dec 27 16:25:12 CST 2011
*/ */
html, body { html, body {
margin: 0; margin: 0;

7
docs/base-css.html
View File

@ -646,25 +646,24 @@
<tr> <tr>
<td>1</td> <td>1</td>
<td colspan="2">Some One</td> <td colspan="2">Some One</td>
<td>English</td> <td>HTML</td>
</tr> </tr>
<tr> <tr>
<td>2</td> <td>2</td>
<td>Joe</td> <td>Joe</td>
<td>Sixpack</td> <td>Sixpack</td>
<td>English</td> <td rowspan="2">Javascript</td>
</tr> </tr>
</tr> </tr>
<td>3</td> <td>3</td>
<td>Joe</td> <td>Joe</td>
<td>Sixpack</td> <td>Sixpack</td>
<td>English</td>
</tr> </tr>
<tr> <tr>
<td>3</td> <td>3</td>
<td>Stu</td> <td>Stu</td>
<td>Dent</td> <td>Dent</td>
<td>Code</td> <td>CSS</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>