From: Jacob Thornton <jacobthornton@gmail.com>
Date: Fri, 27 Jan 2012 19:07:17 +0000 (-0800)
Subject: Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
X-Git-Tag: v2.0.0~6^2~124^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b3dbd7229f53eb71759def4eca90dfd7a2699f8;p=thirdparty%2Fbootstrap.git

Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Conflicts:
	docs/assets/css/bootstrap.css
---

3b3dbd7229f53eb71759def4eca90dfd7a2699f8
diff --cc docs/assets/css/bootstrap.css
index 28f49391b5,4fe86c977a..b2284bc164
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@@ -6,7 -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 Jan 26 23:15:40 PST 2012
 - * Date: Fri Jan 27 12:16:22 EST 2012
++ * Date: Fri Jan 27 11:07:13 PST 2012
   */
  article,
  aside,
diff --cc docs/download.html
index 3af30dca7f,3af30dca7f..c7b42542da
--- a/docs/download.html
+++ b/docs/download.html
@@@ -84,7 -84,7 +84,7 @@@
  
  <section class="download" id="components">
    <div class="page-header">
--    <a class="pull-right toggle-all" href="#">Toggle all</a>
++    <a class="btn small pull-right toggle-all" href="#">Toggle all</a>
      <h1>
        1. Select components
        <small>Get just the CSS you need</small>
@@@ -144,7 -144,7 +144,7 @@@
  
  <section class="download" id="variables">
    <div class="page-header">
--    <a class="pull-right toggle-all" href="#">Reset to defaults</a>
++    <a class="btn small pull-right toggle-all" href="#">Reset to defaults</a>
      <h1>
        2. Modify variables
        <small>Customize Bootstrap without using a LESS compiler</small>
@@@ -222,7 -222,7 +222,7 @@@
  
  <section class="download" id="plugins">
    <div class="page-header">
--    <a class="pull-right toggle-all" href="#">Toggle all</a>
++    <a class="btn small pull-right toggle-all" href="#">Toggle all</a>
      <h1>
        3. Select jQuery plugins
        <small>Quickly add only the necessary javascript</small>
diff --cc docs/scaffolding.html
index f49b8d6c4b,f49b8d6c4b..51dfc6dbba
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@@ -136,6 -136,6 +136,8 @@@
      </div>
    </div><!-- /row -->
  
++  <br>
++
    <h2>Offsetting columns</h2>
    <div class="row show-grid">
      <div class="span4">4</div>
@@@ -148,6 -148,6 +150,12 @@@
    <div class="row show-grid">
      <div class="span8 offset4">8 offset 4</div>
    </div><!-- /row -->
++<pre class="prettyprint linenums">
++&lt;div class="row"&gt;
++  &lt;div class="span4"&gt;...&lt;/div&gt;
++  &lt;div class="span4 offset4"&gt;...&lt;/div&gt;
++&lt;/div&gt;
++</pre>
  
    <br>