diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css index 273140686860eda61136ece8a2f2a7e7636b9eeb..0dfa456f9af1b1ba59c44b739c3176d54257eeac 100644 --- a/bootstrap-1.3.0.css +++ b/bootstrap-1.3.0.css @@ -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: Thu Sep 8 10:36:15 PDT 2011 + * Date: Thu Sep 8 10:45:51 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1053,21 +1053,24 @@ table { width: 100%; margin-bottom: 18px; padding: 0; - border-collapse: separate; + border-collapse: collapse; font-size: 13px; } table th, table td { padding: 10px 10px 9px; - line-height: 13.5px; + line-height: 18px; text-align: left; - vertical-align: middle; - border-bottom: 1px solid #ddd; + border: 1px solid #ddd; } table th { padding-top: 9px; font-weight: bold; + vertical-align: middle; border-bottom-width: 2px; } +table td { + vertical-align: top; +} .zebra-striped tbody tr:nth-child(odd) td { background-color: #f9f9f9; } diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css index 08abdc87a144cbca1fef00c7fa10c311737463cb..428ccdc6e2c5b8c2f36f275193b0c84f1765be0d 100644 --- a/bootstrap-1.3.0.min.css +++ b/bootstrap-1.3.0.min.css @@ -165,8 +165,9 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado .form-stacked .inputs-list{margin-bottom:0;}.form-stacked .inputs-list li{padding-top:0;}.form-stacked .inputs-list li label{font-weight:normal;padding-top:0;} .form-stacked div.error{padding-top:10px;padding-bottom:10px;padding-left:10px;margin-top:0;margin-left:-10px;} .form-stacked .actions{margin-left:-20px;padding-left:20px;} -table{width:100%;margin-bottom:18px;padding:0;border-collapse:separate;font-size:13px;}table th,table td{padding:10px 10px 9px;line-height:13.5px;text-align:left;vertical-align:middle;border-bottom:1px solid #ddd;} -table th{padding-top:9px;font-weight:bold;border-bottom-width:2px;} +table{width:100%;margin-bottom:18px;padding:0;border-collapse:collapse;font-size:13px;}table th,table td{padding:10px 10px 9px;line-height:18px;text-align:left;border:1px solid #ddd;} +table th{padding-top:9px;font-weight:bold;vertical-align:middle;border-bottom-width:2px;} +table td{vertical-align:top;} .zebra-striped tbody tr:nth-child(odd) td{background-color:#f9f9f9;} .zebra-striped tbody tr:hover td{background-color:#f5f5f5;} .zebra-striped .header{cursor:pointer;}.zebra-striped .header:after{content:"";float:right;margin-top:7px;border-width:0 4px 4px;border-style:solid;border-color:#000 transparent;visibility:hidden;} diff --git a/docs/index.html b/docs/index.html index 373cdba61cee0af30bb7c0f6d48f4890348414ab..7acafd6c9a9822a98a38a0bd621abe4d677c8031 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1335,20 +1335,37 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita <h2>Getting started</h2> <p>We've set out to make your interactive work with Bootstrap even more simple, offering several lightweight plugins for things like modals, tooltips, and other dynamic components. These plugins have been coded up to work with either <a href="http://jquery.com/" target="_blank">jQuery</a> or <a href="http://ender.no.de" target="_blank">Ender</a>, but we encourage you to extend and modify them to fit your development needs!</p> <h2>Do I need javascript?</h2> - <p>The short answer is <strong>no</strong>... of course not! However, for those who need it, we've provided the plugins below to help you understand how to integrate bootstrap with javascript and to give you a quick lightweight option for dropping something in and getting the basic functionality right away! For more information on these plugins and to see demos of them in action, please refer to our <a href="./javascript.html">plugin documentation page</a>. - <dl> - <dt><a href="./javascript.html#modal">bootstrap-modal.js</a></dt> - <dd>Our Modal plugin is a <strong>super</strong> slim take on the traditional modal js plugin! We took special care to include only the bare functionality that we require at twitter.</dd> - <dt><a href="./javascript.html#alerts">bootstrap-alerts.js</a></dt> - <dd>The alert plugin is a super tiny class for adding close functionality to alerts.</dd> - <dt><a href="./javascript.html#dropdowns">bootstrap-dropdown.js</a></dt> - <dd>This plugin is for adding dropdown to the bootstrap nav.</dd> - <dt><a href="./javascript.html#twipsy">bootstrap-twipsy.js</a></dt> - <dd>Based on the excellent jQuery.tipsy plugin written by Jason Frame; twipsy is an updated version, which doesn't rely on images, uses css3 for animations, and data-attributes for title storage!</dd> - <dt><a href="./javascript.html#popover">bootstrap-popover.js</a></dt> - <dd>The popover plugin provides a simple interface for adding popovers to your application. It extends the <a href="#twipsy">boostrap-twipsy.js</a> plugin, so be sure to grab that file as well when including popovers in your project!</dd> - </dl> - </p> + <p>The short answer is <strong>no</strong>... of course not! However, for those who need it, we've provided the plugins below to help you understand how to integrate bootstrap with javascript and to give you a quick lightweight option for dropping something in and getting the basic functionality right away! For more information on these plugins and to see demos of them in action, please refer to our <a href="./javascript.html">plugin documentation page</a>.</p> + <table class="zebra-striped"> + <thead> + <tr> + <th style="width: 150px;">File</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td><a href="./javascript.html#modal">bootstrap-modal.js</a></td> + <td>Our Modal plugin is a <strong>super</strong> slim take on the traditional modal js plugin! We took special care to include only the bare functionality that we require at twitter.</td> + </tr> + <tr> + <td><a href="./javascript.html#alerts">bootstrap-alerts.js</a></td> + <td>The alert plugin is a super tiny class for adding close functionality to alerts.</td> + </tr> + <tr> + <td><a href="./javascript.html#dropdowns">bootstrap-dropdown.js</a></td> + <td>This plugin is for adding dropdown to the bootstrap nav.</td> + </tr> + <tr> + <td><a href="./javascript.html#twipsy">bootstrap-twipsy.js</a></td> + <td>Based on the excellent jQuery.tipsy plugin written by Jason Frame; twipsy is an updated version, which doesn't rely on images, uses css3 for animations, and data-attributes for title storage!</td> + </tr> + <tr> + <td><a href="./javascript.html#popover">bootstrap-popover.js</a></td> + <td>The popover plugin provides a simple interface for adding popovers to your application. It extends the <a href="#twipsy">boostrap-twipsy.js</a> plugin, so be sure to grab that file as well when including popovers in your project!</td> + </tr> + </tbody> + </table> </div> </div> diff --git a/lib/tables.less b/lib/tables.less index d1af37de81ad48246b5b46893c97d069cec527b4..4fff7bd6455ca5b0357642e545893f96a3e4bfcd 100644 --- a/lib/tables.less +++ b/lib/tables.less @@ -11,20 +11,23 @@ table { width: 100%; margin-bottom: @baseline; padding: 0; - border-collapse: separate; - font-size: 13px; + border-collapse: collapse; + font-size: @basefont; th, td { padding: 10px 10px 9px; - line-height: @baseline * .75; + line-height: @baseline; text-align: left; - vertical-align: middle; - border-bottom: 1px solid #ddd; + border: 1px solid #ddd; } th { padding-top: 9px; font-weight: bold; + vertical-align: middle; border-bottom-width: 2px; } + td { + vertical-align: top; + } }