From: Mark Otto <markotto@twitter.com>
Date: Mon, 1 Oct 2012 05:45:39 +0000 (-0700)
Subject: Merge branch '2.1.2-wip' into exploratory
X-Git-Tag: v3.0.0-rc1~928
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bbd543db53cd8c5d295db67af2bc2517d5c11f1c;p=thirdparty%2Fbootstrap.git

Merge branch '2.1.2-wip' into exploratory

Conflicts:
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache
---

bbd543db53cd8c5d295db67af2bc2517d5c11f1c
diff --cc docs/base-css.html
index 1cf7002363,1f0a039f07..8d0261e5c6
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@@ -507,10 -509,10 +507,10 @@@ For example, &lt;code&gt;&lt;section&gt
  
  
            <h2>Optional classes</h2>
-           <p>Add any of the follow classes to the <code>.table</code> base class.</p>
+           <p>Add any of the following classes to the <code>.table</code> base class.</p>
  
            <h3><code>.table-striped</code></h3>
 -          <p>Adds zebra-striping to any table row within the <code>&lt;tbody&gt;</code> via the <code>:nth-child</code> CSS selector (not available in IE7-IE8).</p>
 +          <p>Adds zebra-striping to any table row within the <code>&lt;tbody&gt;</code> via the <code>:nth-child</code> CSS selector (not available in IE8).</p>
            <div class="bs-docs-example">
              <table class="table table-striped">
                <thead>
diff --cc docs/getting-started.html
index 0c13789955,814bb67f25..c37c037bd6
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@@ -238,51 -240,61 +238,62 @@@
              <h1>5. Examples</h1>
            </div>
            <p class="lead">Move beyond the base template with a few example layouts. We encourage folks to iterate on these examples and not simply use them as an end result.</p>
 -          <ul class="thumbnails bootstrap-examples">
 -            <li class="span3">
 +          <div class="row bootstrap-examples">
-             <div class="span3">
++            <div class="span4">
                <a class="thumbnail" href="examples/hero.html">
                  <img src="assets/img/examples/bootstrap-example-hero.jpg" alt="">
                </a>
                <h4>Basic marketing site</h4>
                <p>Featuring a hero unit for a primary message and three supporting elements.</p>
 -            </li>
 -            <li class="span3">
 +            </div>
-             <div class="span3">
++            <div class="span4">
                <a class="thumbnail" href="examples/fluid.html">
                  <img src="assets/img/examples/bootstrap-example-fluid.jpg" alt="">
                </a>
                <h4>Fluid layout</h4>
                <p>Uses our new responsive, fluid grid system to create a seamless liquid layout.</p>
 -            </li>
 -            <li class="span3">
 +            </div>
-             <div class="span3">
++            <div class="span4">
                <a class="thumbnail" href="examples/starter-template.html">
                  <img src="assets/img/examples/bootstrap-example-starter.jpg" alt="">
                </a>
                <h4>Starter template</h4>
                <p>A barebones HTML document with all the Bootstrap CSS and JavaScript included.</p>
 -            </li>
 +            </div>
  
-             <div class="span3">
 -            <li class="span3">
++            <div class="span4">
                <a class="thumbnail" href="examples/marketing-narrow.html">
                  <img src="assets/img/examples/bootstrap-example-marketing-narrow.png" alt="">
                </a>
                <h4>Narrow marketing</h4>
                <p>Slim, lightweight marketing template for small projects or teams.</p>
 -            </li>
 -            <li class="span3">
 +            </div>
-             <div class="span3">
++            <div class="span4">
                <a class="thumbnail" href="examples/signin.html">
                  <img src="assets/img/examples/bootstrap-example-signin.png" alt="">
                </a>
                <h4>Sign in</h4>
                <p>Barebones sign in form with custom, larger form controls and a flexible layout.</p>
 -            </li>
 -            <li class="span3">
 +            </div>
-             <div class="span3">
++            <div class="span4">
+               <a class="thumbnail" href="examples/sticky-footer.html">
+                 <img src="assets/img/examples/bootstrap-example-sticky-footer.png" alt="">
+               </a>
+               <h4>Sticky footer</h4>
+               <p>Pin a fixed-height footer to the bottom of the user's viewport.</p>
 -            </li>
++            </div>
+ 
+ <!--
 -            <li class="span3">
++            <div class="span4">
                <a class="thumbnail" href="examples/carousel.html">
                  <img src="assets/img/examples/bootstrap-example-carousel.png" alt="">
                </a>
                <h4>Carousel jumbotron</h4>
                <p>A more interactive riff on the basic marketing site featuring a prominent carousel.</p>
 -            </li>
 - -->
 -          </ul>
 +            </div>
++-->
 +          </div>
++
          </section>
  
  
diff --cc docs/templates/pages/base-css.mustache
index e41aa408ef,13192d90e1..1a91ff3879
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@@ -446,10 -446,10 +446,10 @@@
  
  
            <h2>{{_i}}Optional classes{{/i}}</h2>
-           <p>{{_i}}Add any of the follow classes to the <code>.table</code> base class.{{/i}}</p>
+           <p>{{_i}}Add any of the following classes to the <code>.table</code> base class.{{/i}}</p>
  
            <h3><code>{{_i}}.table-striped{{/i}}</code></h3>
 -          <p>{{_i}}Adds zebra-striping to any table row within the <code>&lt;tbody&gt;</code> via the <code>:nth-child</code> CSS selector (not available in IE7-IE8).{{/i}}</p>
 +          <p>{{_i}}Adds zebra-striping to any table row within the <code>&lt;tbody&gt;</code> via the <code>:nth-child</code> CSS selector (not available in IE8).{{/i}}</p>
            <div class="bs-docs-example">
              <table class="table table-striped">
                <thead>
diff --cc docs/templates/pages/getting-started.mustache
index bfc2e8a3ad,e96ec292cf..5086c56321
--- a/docs/templates/pages/getting-started.mustache
+++ b/docs/templates/pages/getting-started.mustache
@@@ -169,51 -169,61 +169,62 @@@
              <h1>{{_i}}5. Examples{{/i}}</h1>
            </div>
            <p class="lead">{{_i}}Move beyond the base template with a few example layouts. We encourage folks to iterate on these examples and not simply use them as an end result.{{/i}}</p>
 -          <ul class="thumbnails bootstrap-examples">
 -            <li class="span3">
 +          <div class="row bootstrap-examples">
-             <div class="span3">
++            <div class="span4">
                <a class="thumbnail" href="examples/hero.html">
                  <img src="assets/img/examples/bootstrap-example-hero.jpg" alt="">
                </a>
                <h4>{{_i}}Basic marketing site{{/i}}</h4>
                <p>{{_i}}Featuring a hero unit for a primary message and three supporting elements.{{/i}}</p>
 -            </li>
 -            <li class="span3">
 +            </div>
-             <div class="span3">
++            <div class="span4">
                <a class="thumbnail" href="examples/fluid.html">
                  <img src="assets/img/examples/bootstrap-example-fluid.jpg" alt="">
                </a>
                <h4>{{_i}}Fluid layout{{/i}}</h4>
                <p>{{_i}}Uses our new responsive, fluid grid system to create a seamless liquid layout.{{/i}}</p>
 -            </li>
 -            <li class="span3">
 +            </div>
-             <div class="span3">
++            <div class="span4">
                <a class="thumbnail" href="examples/starter-template.html">
                  <img src="assets/img/examples/bootstrap-example-starter.jpg" alt="">
                </a>
                <h4>{{_i}}Starter template{{/i}}</h4>
                <p>{{_i}}A barebones HTML document with all the Bootstrap CSS and JavaScript included.{{/i}}</p>
 -            </li>
 +            </div>
  
-             <div class="span3">
 -            <li class="span3">
++            <div class="span4">
                <a class="thumbnail" href="examples/marketing-narrow.html">
                  <img src="assets/img/examples/bootstrap-example-marketing-narrow.png" alt="">
                </a>
                <h4>{{_i}}Narrow marketing{{/i}}</h4>
                <p>{{_i}}Slim, lightweight marketing template for small projects or teams.{{/i}}</p>
 -            </li>
 -            <li class="span3">
 +            </div>
-             <div class="span3">
++            <div class="span4">
                <a class="thumbnail" href="examples/signin.html">
                  <img src="assets/img/examples/bootstrap-example-signin.png" alt="">
                </a>
                <h4>{{_i}}Sign in{{/i}}</h4>
                <p>{{_i}}Barebones sign in form with custom, larger form controls and a flexible layout.{{/i}}</p>
 -            </li>
 -            <li class="span3">
 +            </div>
-             <div class="span3">
++            <div class="span4">
+               <a class="thumbnail" href="examples/sticky-footer.html">
+                 <img src="assets/img/examples/bootstrap-example-sticky-footer.png" alt="">
+               </a>
+               <h4>{{_i}}Sticky footer{{/i}}</h4>
+               <p>{{_i}}Pin a fixed-height footer to the bottom of the user's viewport.{{/i}}</p>
 -            </li>
++            </div>
+ 
+ <!--
 -            <li class="span3">
++            <div class="span4">
                <a class="thumbnail" href="examples/carousel.html">
                  <img src="assets/img/examples/bootstrap-example-carousel.png" alt="">
                </a>
                <h4>{{_i}}Carousel jumbotron{{/i}}</h4>
                <p>{{_i}}A more interactive riff on the basic marketing site featuring a prominent carousel.{{/i}}</p>
 -            </li>
 - -->
 -          </ul>
 +            </div>
++-->
 +          </div>
++
          </section>