From 5b5352c92d5edbcf02f0d210e04e7fe241f7e68b Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Wed, 11 Jul 2012 11:15:04 -0700
Subject: [PATCH] fix grid alignment on scaffolding

---
 docs/scaffolding.html                     | 25 +++++++++--------------
 docs/templates/pages/scaffolding.mustache | 25 +++++++++--------------
 2 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index edb7274a8f..b09d504083 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -148,23 +148,18 @@
           <div class="span1">1</div>
           <div class="span1">1</div>
           <div class="span1">1</div>
-          <div class="span1">1</div>
         </div>
         <div class="row show-grid">
           <div class="span2">2</div>
-          <div class="span4">4</div>
+          <div class="span3">3</div>
           <div class="span4">4</div>
         </div>
         <div class="row show-grid">
           <div class="span4">4</div>
-          <div class="span6">6</div>
-        </div>
-        <div class="row show-grid">
-          <div class="span5">5</div>
           <div class="span5">5</div>
         </div>
         <div class="row show-grid">
-          <div class="span10">10</div>
+          <div class="span9">9</div>
         </div>
       </div>
 
@@ -183,20 +178,20 @@
       <div class="bs-docs-grid">
         <div class="row show-grid">
           <div class="span4">4</div>
-          <div class="span4 offset2">4 offset 2</div>
-        </div><!-- /row -->
-        <div class="row show-grid">
-          <div class="span3 offset2">3 offset 2</div>
           <div class="span3 offset2">3 offset 2</div>
         </div><!-- /row -->
         <div class="row show-grid">
-          <div class="span6 offset4">6 offset 4</div>
+          <div class="span3 offset1">3 offset 1</div>
+          <div class="span3 offset2">3 offset 2</div>
+        </div><!-- /row -->
+        <div class="row show-grid">
+          <div class="span6 offset3">6 offset 3</div>
         </div><!-- /row -->
       </div>
 <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 class="span3 offset2"&gt;...&lt;/div&gt;
 &lt;/div&gt;
 </pre>
 
@@ -205,13 +200,13 @@
         <h3>Example</h3>
         <p>Here two nested <code>.span4</code> columns are placed within a <code>.span8</code>.</p>
         <div class="row show-grid">
-          <div class="span10">
+          <div class="span9">
             Level 1 of column
             <div class="row show-grid">
               <div class="span5">
                 Level 2
               </div>
-              <div class="span5">
+              <div class="span4">
                 Level 2
               </div>
             </div>
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 02d8a9df18..6888747dd7 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -78,23 +78,18 @@
           <div class="span1">1</div>
           <div class="span1">1</div>
           <div class="span1">1</div>
-          <div class="span1">1</div>
         </div>
         <div class="row show-grid">
           <div class="span2">2</div>
-          <div class="span4">4</div>
+          <div class="span3">3</div>
           <div class="span4">4</div>
         </div>
         <div class="row show-grid">
           <div class="span4">4</div>
-          <div class="span6">6</div>
-        </div>
-        <div class="row show-grid">
-          <div class="span5">5</div>
           <div class="span5">5</div>
         </div>
         <div class="row show-grid">
-          <div class="span10">10</div>
+          <div class="span9">9</div>
         </div>
       </div>
 
@@ -113,20 +108,20 @@
       <div class="bs-docs-grid">
         <div class="row show-grid">
           <div class="span4">4</div>
-          <div class="span4 offset2">4 offset 2</div>
-        </div><!-- /row -->
-        <div class="row show-grid">
-          <div class="span3 offset2">3 offset 2</div>
           <div class="span3 offset2">3 offset 2</div>
         </div><!-- /row -->
         <div class="row show-grid">
-          <div class="span6 offset4">6 offset 4</div>
+          <div class="span3 offset1">3 offset 1</div>
+          <div class="span3 offset2">3 offset 2</div>
+        </div><!-- /row -->
+        <div class="row show-grid">
+          <div class="span6 offset3">6 offset 3</div>
         </div><!-- /row -->
       </div>
 <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 class="span3 offset2"&gt;...&lt;/div&gt;
 &lt;/div&gt;
 </pre>
 
@@ -135,13 +130,13 @@
         <h3>{{_i}}Example{{/i}}</h3>
         <p>{{_i}}Here two nested <code>.span4</code> columns are placed within a <code>.span8</code>.{{/i}}</p>
         <div class="row show-grid">
-          <div class="span10">
+          <div class="span9">
             {{_i}}Level 1 of column{{/i}}
             <div class="row show-grid">
               <div class="span5">
                 {{_i}}Level 2{{/i}}
               </div>
-              <div class="span5">
+              <div class="span4">
                 {{_i}}Level 2{{/i}}
               </div>
             </div>