From c474f996a902434572c238bb6e170473171cadad Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 8 Sep 2011 10:47:05 -0700 Subject: [PATCH] tweaks to table styles to make them use @basefont and @baseline --- bootstrap-1.3.0.css | 13 +++++++----- bootstrap-1.3.0.min.css | 5 +++-- docs/index.html | 45 ++++++++++++++++++++++++++++------------- lib/tables.less | 13 +++++++----- 4 files changed, 50 insertions(+), 26 deletions(-) diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css index 2731406868..0dfa456f9a 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 08abdc87a1..428ccdc6e2 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 373cdba61c..7acafd6c9a 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1335,20 +1335,37 @@ Lorem ipsum dolar sit amet illo error ipsum verita

Getting started

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 jQuery or Ender, but we encourage you to extend and modify them to fit your development needs!

Do I need javascript?

-

The short answer is no... 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 plugin documentation page. -

-
bootstrap-modal.js
-
Our Modal plugin is a super slim take on the traditional modal js plugin! We took special care to include only the bare functionality that we require at twitter.
-
bootstrap-alerts.js
-
The alert plugin is a super tiny class for adding close functionality to alerts.
-
bootstrap-dropdown.js
-
This plugin is for adding dropdown to the bootstrap nav.
-
bootstrap-twipsy.js
-
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!
-
bootstrap-popover.js
-
The popover plugin provides a simple interface for adding popovers to your application. It extends the boostrap-twipsy.js plugin, so be sure to grab that file as well when including popovers in your project!
-
-

+

The short answer is no... 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 plugin documentation page.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FileDescription
bootstrap-modal.jsOur Modal plugin is a super slim take on the traditional modal js plugin! We took special care to include only the bare functionality that we require at twitter.
bootstrap-alerts.jsThe alert plugin is a super tiny class for adding close functionality to alerts.
bootstrap-dropdown.jsThis plugin is for adding dropdown to the bootstrap nav.
bootstrap-twipsy.jsBased 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!
bootstrap-popover.jsThe popover plugin provides a simple interface for adding popovers to your application. It extends the boostrap-twipsy.js plugin, so be sure to grab that file as well when including popovers in your project!
diff --git a/lib/tables.less b/lib/tables.less index d1af37de81..4fff7bd645 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; + } }