From: Mark Otto Date: Wed, 18 Jul 2012 06:14:58 +0000 (-0700) Subject: Merge branch '2.1.0-wip' of https://github.com/gcoop/bootstrap into gcoop-2.1.0-wip X-Git-Tag: v2.1.0~2^2~162 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb1a59caa013e0fbe992bb305502f37bc7141c92;p=thirdparty%2Fbootstrap.git Merge branch '2.1.0-wip' of https://github.com/gcoop/bootstrap into gcoop-2.1.0-wip Conflicts: docs/base-css.html docs/templates/pages/base-css.mustache --- cb1a59caa013e0fbe992bb305502f37bc7141c92 diff --cc docs/base-css.html index 46685b1129,627cbc2084..a6b545c1d9 --- a/docs/base-css.html +++ b/docs/base-css.html @@@ -642,82 -647,161 +642,161 @@@ For example, <code>section</co -
- - -

Optional row classes

-

Included with Bootstrap is the ability to colourize rows.

- - - - - - - - - - - - - - - - - - - - - - - - - -
ClassDescription
- .success - Indicates a successful or positive action.
- .error - Indicates a dangerous or potentially negative action.
- .info - Used as an alternative to the default styles.
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#ProductPayment TakenStatus
1TB - Monthly01/04/2012Approved
2TB - Monthly02/04/2012Declined
3TB - Monthly03/04/2012Pending
-
+
+ + ++

Optional row classes

++

Use contextual classes to color table rows.

++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
ClassDescription
++ .success ++ Indicates a successful or positive action.
++ .error ++ Indicates a dangerous or potentially negative action.
++ .info ++ Used as an alternative to the default styles.
++
++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
#ProductPayment TakenStatus
1TB - Monthly01/04/2012Approved
2TB - Monthly02/04/2012Declined
3TB - Monthly03/04/2012Pending
++
+ 
+ <tr class="success">
+   <td>1</td>
+   <td>TB - Monthly</td>
+   <td>01/04/2012</td>
+   <td>Approved</td>
+ </tr>
+
+ + -
- - -

Supported table markup

-

List of supported table HTML elements and how they should be used.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
TagDescription
- <table> - - Wrapping element for displaying data in a tabular format -
- <thead> - - Container element for table header rows (<tr>) to label table columns -
- <tbody> - - Container element for table rows (<tr>) in the body of the table -
- <tr> - - Container element for a set of table cells (<td> or <th>) that appears on a single row -
- <td> - - Default table cell -
- <th> - - Special table cell for column (or row, depending on scope and placement) labels
- Must be used within a <thead> -
- <caption> - - Description or summary of what the table holds, especially useful for screen readers -
++
++ ++ +

Supported table markup

+

List of supported table HTML elements and how they should be used.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
TagDescription
+ <table> + + Wrapping element for displaying data in a tabular format +
+ <thead> + + Container element for table header rows (<tr>) to label table columns +
+ <tbody> + + Container element for table rows (<tr>) in the body of the table +
+ <tr> + + Container element for a set of table cells (<td> or <th>) that appears on a single row +
+ <td> + + Default table cell +
+ <th> + + Special table cell for column (or row, depending on scope and placement) labels
+ Must be used within a <thead> +
+ <caption> + + Description or summary of what the table holds, especially useful for screen readers + 
  <table>
    <thead>
diff --cc docs/templates/pages/base-css.mustache
index a630acfeda,101683a13f..c150521cc4
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@@ -579,82 -578,161 +579,163 @@@
-
- - -

{{_i}}Optional row classes{{/i}}

-

{{_i}}Included with Bootstrap is the ability to colourize rows.{{/i}}

- - - - - - - - - - - - - - - - - - - - - - - - - -
{{_i}}Class{{/i}}{{_i}}Description{{/i}}
- .success - {{_i}}Indicates a successful or positive action.{{/i}}
- .error - {{_i}}Indicates a dangerous or potentially negative action.{{/i}}
- .info - {{_i}}Used as an alternative to the default styles.{{/i}}
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#{{_i}}Product{{/i}}{{_i}}Payment Taken{{/i}}{{_i}}Status{{/i}}
1TB - Monthly01/04/2012Approved
2TB - Monthly02/04/2012Declined
3TB - Monthly03/04/2012Pending
-
{{! /example }} +
+ + ++

{{_i}}Optional row classes{{/i}}

++

{{_i}}Use contextual classes to color table rows.{{/i}}

++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
{{_i}}Class{{/i}}{{_i}}Description{{/i}}
++ .success ++ {{_i}}Indicates a successful or positive action.{{/i}}
++ .error ++ {{_i}}Indicates a dangerous or potentially negative action.{{/i}}
++ .info ++ {{_i}}Used as an alternative to the default styles.{{/i}}
++
++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
#{{_i}}Product{{/i}}{{_i}}Payment Taken{{/i}}{{_i}}Status{{/i}}
1TB - Monthly01/04/2012Approved
2TB - Monthly02/04/2012Declined
3TB - Monthly03/04/2012Pending
++
{{! /example }} + 
 -<tr class="success">
 -  <td>1</td>
 -  <td>TB - Monthly</td>
 -  <td>01/04/2012</td>
 -  <td>Approved</td>
 -</tr>
++...
++  <tr class="success">
++    <td>1</td>
++    <td>TB - Monthly</td>
++    <td>01/04/2012</td>
++    <td>Approved</td>
++  </tr>
++...
+
+ + -
- - -

{{_i}}Supported table markup{{/i}}

-

{{_i}}List of supported table HTML elements and how they should be used.{{/i}}

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{_i}}Tag{{/i}}{{_i}}Description{{/i}}
- <table> - - {{_i}}Wrapping element for displaying data in a tabular format{{/i}} -
- <thead> - - {{_i}}Container element for table header rows (<tr>) to label table columns{{/i}} -
- <tbody> - - {{_i}}Container element for table rows (<tr>) in the body of the table{{/i}} -
- <tr> - - {{_i}}Container element for a set of table cells (<td> or <th>) that appears on a single row{{/i}} -
- <td> - - {{_i}}Default table cell{{/i}} -
- <th> - - {{_i}}Special table cell for column (or row, depending on scope and placement) labels{{/i}}
- {{_i}}Must be used within a <thead>{{/i}} -
- <caption> - - {{_i}}Description or summary of what the table holds, especially useful for screen readers{{/i}} -
++
++ ++ +

{{_i}}Supported table markup{{/i}}

+

{{_i}}List of supported table HTML elements and how they should be used.{{/i}}

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{_i}}Tag{{/i}}{{_i}}Description{{/i}}
+ <table> + + {{_i}}Wrapping element for displaying data in a tabular format{{/i}} +
+ <thead> + + {{_i}}Container element for table header rows (<tr>) to label table columns{{/i}} +
+ <tbody> + + {{_i}}Container element for table rows (<tr>) in the body of the table{{/i}} +
+ <tr> + + {{_i}}Container element for a set of table cells (<td> or <th>) that appears on a single row{{/i}} +
+ <td> + + {{_i}}Default table cell{{/i}} +
+ <th> + + {{_i}}Special table cell for column (or row, depending on scope and placement) labels{{/i}}
+ {{_i}}Must be used within a <thead>{{/i}} +
+ <caption> + + {{_i}}Description or summary of what the table holds, especially useful for screen readers{{/i}} + 
  <table>
    <thead>