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

diff --cc docs/assets/css/bootstrap.css
Simple merge

diff --cc docs/base-css.html
index 46685b11290a81590c53eeaaa9fccaf21a321cd9,627cbc2084ff36b4fdd0c1aacf4f6ce75e23aaa0..a6b545c1d9fb1b2ce077b200eed2bc3bc9154c2d
--- 1/docs/base-css.html
--- 2/docs/base-css.html
+++ b/docs/base-css.html
@@@ -642,82 -647,161 +642,161 @@@ For example, <code>section</co
  </pre>
  
  
 -  <hr class="bs-docs-separator">
 -
 -
 -  <h2>Optional row classes</h2>
 -  <p>Included with Bootstrap is the ability to colourize rows.</p>
 -  <table class="table table-bordered table-striped">
 -    <colgroup>
 -      <col class="span1">
 -      <col class="span7">
 -    </colgroup>
 -    <thead>
 -      <tr>
 -        <th>Class</th>
 -        <th>Description</th>
 -      </tr>
 -    </thead>
 -    <tbody>
 -      <tr>
 -        <td>
 -          <code>.success</code>
 -        </td>
 -        <td>Indicates a successful or positive action.</td>
 -      </tr>
 -      <tr>
 -        <td>
 -          <code>.error</code>
 -        </td>
 -        <td>Indicates a dangerous or potentially negative action.</td>
 -      </tr>
 -      <tr>
 -        <td>
 -          <code>.info</code>
 -        </td>
 -        <td>Used as an alternative to the default styles.</td>
 -      </tr>
 -    </tbody>
 -  </table>
 -  <div class="bs-docs-example">
 -    <table class="table">
 -      <thead>
 -        <tr>
 -          <th>#</th>
 -          <th>Product</th>
 -          <th>Payment Taken</th>
 -          <th>Status</th>
 -        </tr>
 -      </thead>
 -      <tbody>
 -        <tr class="success">
 -          <td>1</td>
 -          <td>TB - Monthly</td>
 -          <td>01/04/2012</td>
 -          <td>Approved</td>
 -        </tr>
 -        <tr class="error">
 -          <td>2</td>
 -          <td>TB - Monthly</td>
 -          <td>02/04/2012</td>
 -          <td>Declined</td>
 -        </tr>
 -        <tr class="info">
 -          <td>3</td>
 -          <td>TB - Monthly</td>
 -          <td>03/04/2012</td>
 -          <td>Pending</td>
 -        </tr>
 -      </tbody>
 -    </table>
 -  </div>
 +        <hr class="bs-docs-separator">
 +
 +
++        <h2>Optional row classes</h2>
++        <p>Use contextual classes to color table rows.</p>
++        <table class="table table-bordered table-striped">
++          <colgroup>
++            <col class="span1">
++            <col class="span7">
++          </colgroup>
++          <thead>
++            <tr>
++              <th>Class</th>
++              <th>Description</th>
++            </tr>
++          </thead>
++          <tbody>
++            <tr>
++              <td>
++                <code>.success</code>
++              </td>
++              <td>Indicates a successful or positive action.</td>
++            </tr>
++            <tr>
++              <td>
++                <code>.error</code>
++              </td>
++              <td>Indicates a dangerous or potentially negative action.</td>
++            </tr>
++            <tr>
++              <td>
++                <code>.info</code>
++              </td>
++              <td>Used as an alternative to the default styles.</td>
++            </tr>
++          </tbody>
++        </table>
++        <div class="bs-docs-example">
++          <table class="table">
++            <thead>
++              <tr>
++                <th>#</th>
++                <th>Product</th>
++                <th>Payment Taken</th>
++                <th>Status</th>
++              </tr>
++            </thead>
++            <tbody>
++              <tr class="success">
++                <td>1</td>
++                <td>TB - Monthly</td>
++                <td>01/04/2012</td>
++                <td>Approved</td>
++              </tr>
++              <tr class="error">
++                <td>2</td>
++                <td>TB - Monthly</td>
++                <td>02/04/2012</td>
++                <td>Declined</td>
++              </tr>
++              <tr class="info">
++                <td>3</td>
++                <td>TB - Monthly</td>
++                <td>03/04/2012</td>
++                <td>Pending</td>
++              </tr>
++            </tbody>
++          </table>
++        </div>
+ <pre class="prettyprint linenums">
+ &lt;tr class="success"&gt;
+   &lt;td&gt;1&lt;/td&gt;
+   &lt;td&gt;TB - Monthly&lt;/td&gt;
+   &lt;td&gt;01/04/2012&lt;/td&gt;
+   &lt;td&gt;Approved&lt;/td&gt;
+ &lt;/tr&gt;
+ </pre>
+ 
+ 
 -  <hr class="bs-docs-separator">
 -
 -
 -  <h2>Supported table markup</h2>
 -  <p>List of supported table HTML elements and how they should be used.</p>
 -  <table class="table table-bordered table-striped">
 -    <colgroup>
 -      <col class="span1">
 -      <col class="span7">
 -    </colgroup>
 -    <thead>
 -      <tr>
 -        <th>Tag</th>
 -        <th>Description</th>
 -      </tr>
 -    </thead>
 -    <tbody>
 -      <tr>
 -        <td>
 -          <code>&lt;table&gt;</code>
 -        </td>
 -        <td>
 -          Wrapping element for displaying data in a tabular format
 -        </td>
 -      </tr>
 -      <tr>
 -        <td>
 -          <code>&lt;thead&gt;</code>
 -        </td>
 -        <td>
 -          Container element for table header rows (<code>&lt;tr&gt;</code>) to label table columns
 -        </td>
 -      </tr>
 -      <tr>
 -        <td>
 -          <code>&lt;tbody&gt;</code>
 -        </td>
 -        <td>
 -          Container element for table rows (<code>&lt;tr&gt;</code>) in the body of the table
 -        </td>
 -      </tr>
 -      <tr>
 -        <td>
 -          <code>&lt;tr&gt;</code>
 -        </td>
 -        <td>
 -          Container element for a set of table cells (<code>&lt;td&gt;</code> or <code>&lt;th&gt;</code>) that appears on a single row
 -        </td>
 -      </tr>
 -      <tr>
 -        <td>
 -          <code>&lt;td&gt;</code>
 -        </td>
 -        <td>
 -          Default table cell
 -        </td>
 -      </tr>
 -      <tr>
 -        <td>
 -          <code>&lt;th&gt;</code>
 -        </td>
 -        <td>
 -          Special table cell for column (or row, depending on scope and placement) labels<br>
 -          Must be used within a <code>&lt;thead&gt;</code>
 -        </td>
 -      </tr>
 -      <tr>
 -        <td>
 -          <code>&lt;caption&gt;</code>
 -        </td>
 -        <td>
 -          Description or summary of what the table holds, especially useful for screen readers
 -        </td>
 -      </tr>
 -    </tbody>
 -  </table>
++        <hr class="bs-docs-separator">
++
++
 +        <h2>Supported table markup</h2>
 +        <p>List of supported table HTML elements and how they should be used.</p>
 +        <table class="table table-bordered table-striped">
 +          <colgroup>
 +            <col class="span1">
 +            <col class="span7">
 +          </colgroup>
 +          <thead>
 +            <tr>
 +              <th>Tag</th>
 +              <th>Description</th>
 +            </tr>
 +          </thead>
 +          <tbody>
 +            <tr>
 +              <td>
 +                <code>&lt;table&gt;</code>
 +              </td>
 +              <td>
 +                Wrapping element for displaying data in a tabular format
 +              </td>
 +            </tr>
 +            <tr>
 +              <td>
 +                <code>&lt;thead&gt;</code>
 +              </td>
 +              <td>
 +                Container element for table header rows (<code>&lt;tr&gt;</code>) to label table columns
 +              </td>
 +            </tr>
 +            <tr>
 +              <td>
 +                <code>&lt;tbody&gt;</code>
 +              </td>
 +              <td>
 +                Container element for table rows (<code>&lt;tr&gt;</code>) in the body of the table
 +              </td>
 +            </tr>
 +            <tr>
 +              <td>
 +                <code>&lt;tr&gt;</code>
 +              </td>
 +              <td>
 +                Container element for a set of table cells (<code>&lt;td&gt;</code> or <code>&lt;th&gt;</code>) that appears on a single row
 +              </td>
 +            </tr>
 +            <tr>
 +              <td>
 +                <code>&lt;td&gt;</code>
 +              </td>
 +              <td>
 +                Default table cell
 +              </td>
 +            </tr>
 +            <tr>
 +              <td>
 +                <code>&lt;th&gt;</code>
 +              </td>
 +              <td>
 +                Special table cell for column (or row, depending on scope and placement) labels<br>
 +                Must be used within a <code>&lt;thead&gt;</code>
 +              </td>
 +            </tr>
 +            <tr>
 +              <td>
 +                <code>&lt;caption&gt;</code>
 +              </td>
 +              <td>
 +                Description or summary of what the table holds, especially useful for screen readers
 +              </td>
 +            </tr>
 +          </tbody>
 +        </table>
  <pre class="prettyprint linenums">
  &lt;table&gt;
    &lt;thead&gt;

diff --cc docs/templates/pages/base-css.mustache
index a630acfeda076c1239fe8754c526bb17857193f5,101683a13f22780d63ccb8e129d8d546eddc22a8..c150521cc4392ad39a567eb54d415c5381676e95
--- 1/docs/templates/pages/base-css.mustache
--- 2/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@@ -579,82 -578,161 +579,163 @@@
  </pre>
  
  
 -  <hr class="bs-docs-separator">
 -
 -
 -  <h2>{{_i}}Optional row classes{{/i}}</h2>
 -  <p>{{_i}}Included with Bootstrap is the ability to colourize rows.{{/i}}</p>
 -  <table class="table table-bordered table-striped">
 -    <colgroup>
 -      <col class="span1">
 -      <col class="span7">
 -    </colgroup>
 -    <thead>
 -      <tr>
 -        <th>{{_i}}Class{{/i}}</th>
 -        <th>{{_i}}Description{{/i}}</th>
 -      </tr>
 -    </thead>
 -    <tbody>
 -      <tr>
 -        <td>
 -          <code>.success</code>
 -        </td>
 -        <td>{{_i}}Indicates a successful or positive action.{{/i}}</td>
 -      </tr>
 -      <tr>
 -        <td>
 -          <code>.error</code>
 -        </td>
 -        <td>{{_i}}Indicates a dangerous or potentially negative action.{{/i}}</td>
 -      </tr>
 -      <tr>
 -        <td>
 -          <code>.info</code>
 -        </td>
 -        <td>{{_i}}Used as an alternative to the default styles.{{/i}}</td>
 -      </tr>
 -    </tbody>
 -  </table>
 -  <div class="bs-docs-example">
 -    <table class="table">
 -      <thead>
 -        <tr>
 -          <th>#</th>
 -          <th>{{_i}}Product{{/i}}</th>
 -          <th>{{_i}}Payment Taken{{/i}}</th>
 -          <th>{{_i}}Status{{/i}}</th>
 -        </tr>
 -      </thead>
 -      <tbody>
 -        <tr class="success">
 -          <td>1</td>
 -          <td>TB - Monthly</td>
 -          <td>01/04/2012</td>
 -          <td>Approved</td>
 -        </tr>
 -        <tr class="error">
 -          <td>2</td>
 -          <td>TB - Monthly</td>
 -          <td>02/04/2012</td>
 -          <td>Declined</td>
 -        </tr>
 -        <tr class="info">
 -          <td>3</td>
 -          <td>TB - Monthly</td>
 -          <td>03/04/2012</td>
 -          <td>Pending</td>
 -        </tr>
 -      </tbody>
 -    </table>
 -  </div>{{! /example }}
 +        <hr class="bs-docs-separator">
 +
 +
++        <h2>{{_i}}Optional row classes{{/i}}</h2>
++        <p>{{_i}}Use contextual classes to color table rows.{{/i}}</p>
++        <table class="table table-bordered table-striped">
++          <colgroup>
++            <col class="span1">
++            <col class="span7">
++          </colgroup>
++          <thead>
++            <tr>
++              <th>{{_i}}Class{{/i}}</th>
++              <th>{{_i}}Description{{/i}}</th>
++            </tr>
++          </thead>
++          <tbody>
++            <tr>
++              <td>
++                <code>.success</code>
++              </td>
++              <td>{{_i}}Indicates a successful or positive action.{{/i}}</td>
++            </tr>
++            <tr>
++              <td>
++                <code>.error</code>
++              </td>
++              <td>{{_i}}Indicates a dangerous or potentially negative action.{{/i}}</td>
++            </tr>
++            <tr>
++              <td>
++                <code>.info</code>
++              </td>
++              <td>{{_i}}Used as an alternative to the default styles.{{/i}}</td>
++            </tr>
++          </tbody>
++        </table>
++        <div class="bs-docs-example">
++          <table class="table">
++            <thead>
++              <tr>
++                <th>#</th>
++                <th>{{_i}}Product{{/i}}</th>
++                <th>{{_i}}Payment Taken{{/i}}</th>
++                <th>{{_i}}Status{{/i}}</th>
++              </tr>
++            </thead>
++            <tbody>
++              <tr class="success">
++                <td>1</td>
++                <td>TB - Monthly</td>
++                <td>01/04/2012</td>
++                <td>Approved</td>
++              </tr>
++              <tr class="error">
++                <td>2</td>
++                <td>TB - Monthly</td>
++                <td>02/04/2012</td>
++                <td>Declined</td>
++              </tr>
++              <tr class="info">
++                <td>3</td>
++                <td>TB - Monthly</td>
++                <td>03/04/2012</td>
++                <td>Pending</td>
++              </tr>
++            </tbody>
++          </table>
++        </div>{{! /example }}
+ <pre class="prettyprint linenums">
 -&lt;tr class="success"&gt;
 -  &lt;td&gt;1&lt;/td&gt;
 -  &lt;td&gt;TB - Monthly&lt;/td&gt;
 -  &lt;td&gt;01/04/2012&lt;/td&gt;
 -  &lt;td&gt;Approved&lt;/td&gt;
 -&lt;/tr&gt;
++...
++  &lt;tr class="success"&gt;
++    &lt;td&gt;1&lt;/td&gt;
++    &lt;td&gt;TB - Monthly&lt;/td&gt;
++    &lt;td&gt;01/04/2012&lt;/td&gt;
++    &lt;td&gt;Approved&lt;/td&gt;
++  &lt;/tr&gt;
++...
+ </pre>
+ 
+ 
 -  <hr class="bs-docs-separator">
 -
 -
 -  <h2>{{_i}}Supported table markup{{/i}}</h2>
 -  <p>{{_i}}List of supported table HTML elements and how they should be used.{{/i}}</p>
 -  <table class="table table-bordered table-striped">
 -    <colgroup>
 -      <col class="span1">
 -      <col class="span7">
 -    </colgroup>
 -    <thead>
 -      <tr>
 -        <th>{{_i}}Tag{{/i}}</th>
 -        <th>{{_i}}Description{{/i}}</th>
 -      </tr>
 -    </thead>
 -    <tbody>
 -      <tr>
 -        <td>
 -          <code>&lt;table&gt;</code>
 -        </td>
 -        <td>
 -          {{_i}}Wrapping element for displaying data in a tabular format{{/i}}
 -        </td>
 -      </tr>
 -      <tr>
 -        <td>
 -          <code>&lt;thead&gt;</code>
 -        </td>
 -        <td>
 -          {{_i}}Container element for table header rows (<code>&lt;tr&gt;</code>) to label table columns{{/i}}
 -        </td>
 -      </tr>
 -      <tr>
 -        <td>
 -          <code>&lt;tbody&gt;</code>
 -        </td>
 -        <td>
 -          {{_i}}Container element for table rows (<code>&lt;tr&gt;</code>) in the body of the table{{/i}}
 -        </td>
 -      </tr>
 -      <tr>
 -        <td>
 -          <code>&lt;tr&gt;</code>
 -        </td>
 -        <td>
 -          {{_i}}Container element for a set of table cells (<code>&lt;td&gt;</code> or <code>&lt;th&gt;</code>) that appears on a single row{{/i}}
 -        </td>
 -      </tr>
 -      <tr>
 -        <td>
 -          <code>&lt;td&gt;</code>
 -        </td>
 -        <td>
 -          {{_i}}Default table cell{{/i}}
 -        </td>
 -      </tr>
 -      <tr>
 -        <td>
 -          <code>&lt;th&gt;</code>
 -        </td>
 -        <td>
 -          {{_i}}Special table cell for column (or row, depending on scope and placement) labels{{/i}}<br>
 -          {{_i}}Must be used within a <code>&lt;thead&gt;</code>{{/i}}
 -        </td>
 -      </tr>
 -      <tr>
 -        <td>
 -          <code>&lt;caption&gt;</code>
 -        </td>
 -        <td>
 -          {{_i}}Description or summary of what the table holds, especially useful for screen readers{{/i}}
 -        </td>
 -      </tr>
 -    </tbody>
 -  </table>
++        <hr class="bs-docs-separator">
++
++
 +        <h2>{{_i}}Supported table markup{{/i}}</h2>
 +        <p>{{_i}}List of supported table HTML elements and how they should be used.{{/i}}</p>
 +        <table class="table table-bordered table-striped">
 +          <colgroup>
 +            <col class="span1">
 +            <col class="span7">
 +          </colgroup>
 +          <thead>
 +            <tr>
 +              <th>{{_i}}Tag{{/i}}</th>
 +              <th>{{_i}}Description{{/i}}</th>
 +            </tr>
 +          </thead>
 +          <tbody>
 +            <tr>
 +              <td>
 +                <code>&lt;table&gt;</code>
 +              </td>
 +              <td>
 +                {{_i}}Wrapping element for displaying data in a tabular format{{/i}}
 +              </td>
 +            </tr>
 +            <tr>
 +              <td>
 +                <code>&lt;thead&gt;</code>
 +              </td>
 +              <td>
 +                {{_i}}Container element for table header rows (<code>&lt;tr&gt;</code>) to label table columns{{/i}}
 +              </td>
 +            </tr>
 +            <tr>
 +              <td>
 +                <code>&lt;tbody&gt;</code>
 +              </td>
 +              <td>
 +                {{_i}}Container element for table rows (<code>&lt;tr&gt;</code>) in the body of the table{{/i}}
 +              </td>
 +            </tr>
 +            <tr>
 +              <td>
 +                <code>&lt;tr&gt;</code>
 +              </td>
 +              <td>
 +                {{_i}}Container element for a set of table cells (<code>&lt;td&gt;</code> or <code>&lt;th&gt;</code>) that appears on a single row{{/i}}
 +              </td>
 +            </tr>
 +            <tr>
 +              <td>
 +                <code>&lt;td&gt;</code>
 +              </td>
 +              <td>
 +                {{_i}}Default table cell{{/i}}
 +              </td>
 +            </tr>
 +            <tr>
 +              <td>
 +                <code>&lt;th&gt;</code>
 +              </td>
 +              <td>
 +                {{_i}}Special table cell for column (or row, depending on scope and placement) labels{{/i}}<br>
 +                {{_i}}Must be used within a <code>&lt;thead&gt;</code>{{/i}}
 +              </td>
 +            </tr>
 +            <tr>
 +              <td>
 +                <code>&lt;caption&gt;</code>
 +              </td>
 +              <td>
 +                {{_i}}Description or summary of what the table holds, especially useful for screen readers{{/i}}
 +              </td>
 +            </tr>
 +          </tbody>
 +        </table>
  <pre class="prettyprint linenums">
  &lt;table&gt;
    &lt;thead&gt;