From 47b8184bbb5784eb373ffbb905c8a1756eba3c6d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 17 Jan 2012 23:39:18 -0800 Subject: scope table styles to a class, .table, instead of on the generic element as a smarter default --- docs/base-css.html | 47 +++++++++++++++++++++++++++-------------------- docs/index.html | 2 +- docs/javascript.html | 24 ++++++++++++------------ docs/less.html | 14 +++++++------- docs/scaffolding.html | 4 ++-- 5 files changed, 49 insertions(+), 42 deletions(-) (limited to 'docs') diff --git a/docs/base-css.html b/docs/base-css.html index 1d64a5787..fa60204a8 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -150,7 +150,7 @@

Emphasis, address, and abbreviation

- +
@@ -237,7 +237,7 @@

Blockquotes

-
Element
+
@@ -383,7 +383,7 @@

Code Inline and block

-
Element
+
@@ -425,7 +425,7 @@

Inline labels for special attention

-
Element
+
@@ -490,7 +490,7 @@

Table markup

-
Labels
+
@@ -579,7 +579,7 @@

Table options

-
Tag
+
@@ -591,6 +591,13 @@ + + + + + @@ -623,14 +630,14 @@

1. Default table styles

-

Tables are automatically styled with only a few borders to ensure readability and maintain structure. No classes are required.

+

Tables are automatically styled with only a few borders to ensure readability and maintain structure. With 2.0, the .table class is required.

-<table>
+<table class="table">
   ...
 </table>
-
Name
Default NoneNo styles, just columns and rows
Basic + .table + Only horizontal lines between rows
+
@@ -670,12 +677,12 @@

Get a little fancy with your tables by adding zebra-striping—just add the .table-striped class.

Note: Sprited tables use the :nth-child CSS selector and is not available in IE7-IE8.

-<table class="table-striped">
+<table class="table table-striped">
   ...
 </table>
-
#
+
@@ -714,12 +721,12 @@

Add borders around the entire table and rounded corners for aesthetic purposes.

-<table class="table-bordered">
+<table class="table table-bordered">
   ...
 </table>
-
#
+
@@ -762,12 +769,12 @@

Make your tables more compact by adding the .table-condensed class to cut table cell padding in half (from 10px to 5px).

-<table class="table-condensed">
+<table class="table table-condensed">
   ...
 </table>
-
#
+
@@ -816,12 +823,12 @@ }); }); </script> -<table class="table-striped"> +<table class="table table-striped"> ... </table>
-
#
+
@@ -858,7 +865,7 @@
#

Styles for the Tablesorter, zebra striping, borders, and condensing may all compound in any variation to fit your needs.

- +
@@ -932,7 +939,7 @@

Four types of forms

Bootstrap provides simple markup and styles for four styles of common web forms.

-
#
+
@@ -1259,7 +1266,7 @@

Buttons

-
Name
+
diff --git a/docs/index.html b/docs/index.html index c30417c8f..ce56a04ef 100644 --- a/docs/index.html +++ b/docs/index.html @@ -267,7 +267,7 @@ ================================================== -->

Get started in no time.

Quickly start using Bootstrap within your workflow and development process.

-
Button
+
diff --git a/docs/javascript.html b/docs/javascript.html index a132a4011..fb854d281 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -284,7 +284,7 @@

Call the modal via javascript:

$('#myModal').modal(options)

Options

- +
@@ -349,7 +349,7 @@ $('#myModal').modal({ 
$('#myModal').modal('hide')

Events

Bootstrap's modal class exposes a few events for hooking into modal functionality.

-
Name
+
@@ -666,7 +666,7 @@ $('#myModal').on('hidden', function () { </script>

Events

-
Event
+
@@ -719,7 +719,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

Trigger the tooltip via javascript:

$('#example').tooltip(options)

Options

-
Event
+
@@ -813,7 +813,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

Enable popovers via javascript:

$('#example').popover(options)

Options

-
Name
+
@@ -933,7 +933,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { 
$(".alert-message").alert('close')

Events

Bootstrap's alert class exposes a few events for hooking into alert functionality.

-
Name
+
@@ -976,7 +976,7 @@ $('#my-alert').bind('closed', function () {

Example uses

Use the buttons plugin for states and toggles.

-
Event
+
@@ -1125,7 +1125,7 @@ $('#my-alert').bind('closed', function () {

Enable via javascript:

$(".collapse").collapse()

Options

-
Stateful
+
@@ -1175,7 +1175,7 @@ $('#myCollapsible').collapse({

Bootstrap's collapse class exposes a few events for hooking into collapse functionality.

-
Name
+
@@ -1261,7 +1261,7 @@ $('#myCollapsible').on('hidden', function () {

Call via javascript:

$('.carousel').carousel()

Options

-
Event
+
@@ -1310,7 +1310,7 @@ $('.myCarousel').carousel({

Cycles to the next item.

Events

Bootstrap's modal class exposes a few events for hooking into modal functionality.

-
Name
+
@@ -1358,7 +1358,7 @@ $('.myCarousel').carousel({

Call the typeahead via javascript:

$('.typeahead').typeahead()

Options

-
Event
+
diff --git a/docs/less.html b/docs/less.html index 6e43d95bd..09ff3e8e1 100644 --- a/docs/less.html +++ b/docs/less.html @@ -160,7 +160,7 @@

Hyperlinks

-
Name
+
@@ -185,7 +185,7 @@

Grayscale colors

-
Variable
+
@@ -216,7 +216,7 @@

Accent colors

-
@black
+
@@ -254,7 +254,7 @@

Grid system

-
@blue
+
@@ -277,7 +277,7 @@

Typography

-
@gridColumns
+
@@ -302,7 +302,7 @@

Visuals

-
@baseFontSize
+
@@ -453,7 +453,7 @@

Compiling Less

After modifying the .less files in /lib/, you'll need to recompile them in order to regenerate the bootstrap-*.*.*.css and bootstrap-*.*.*.min.css files. If you're submitting a pull request to GitHub, you must always recompile.

Ways to compile

-
@primaryButtonColor
+
diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 77b94d8ce..f068c837c 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -223,7 +223,7 @@

Grid customization

-
Method
+
@@ -335,7 +335,7 @@

Supported devices

Bootstrap supports a handful of media queries to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:

-
Variable
+
-- cgit v1.2.3
Label