]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
fix tables for rowspan
authorMark Otto <markdotto@gmail.com>
Tue, 27 Dec 2011 22:25:22 +0000 (16:25 -0600)
committerMark Otto <markdotto@gmail.com>
Tue, 27 Dec 2011 22:25:22 +0000 (16:25 -0600)
bootstrap.css
docs/base-css.html

index a1fcc1df62fd30f6eaef2e8106bb725602de9959..2b870bfce47c5b685b675e32f334fe65eef17283 100644 (file)
@@ -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 Dec 27 16:07:55 CST 2011
+ * Date: Tue Dec 27 16:25:12 CST 2011
  */
 html, body {
   margin: 0;
index 99fb9bd1a60d61fac52cf7fde558e6c0d2fa9def..13cbeedbc2e56b262f89f43388ff1a65c71f1132 100644 (file)
       <tr>
         <td>1</td>
         <td colspan="2">Some One</td>
-        <td>English</td>
+        <td>HTML</td>
       </tr>
       <tr>
         <td>2</td>
         <td>Joe</td>
         <td>Sixpack</td>
-        <td>English</td>
+        <td rowspan="2">Javascript</td>
       </tr>
       </tr>
         <td>3</td>
         <td>Joe</td>
         <td>Sixpack</td>
-        <td>English</td>
       </tr>
       <tr>
         <td>3</td>
         <td>Stu</td>
         <td>Dent</td>
-        <td>Code</td>
+        <td>CSS</td>
       </tr>
     </tbody>
   </table>