]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
fix grid alignment on scaffolding
authorMark Otto <markotto@twitter.com>
Wed, 11 Jul 2012 18:15:04 +0000 (11:15 -0700)
committerMark Otto <markotto@twitter.com>
Wed, 11 Jul 2012 18:15:04 +0000 (11:15 -0700)
docs/scaffolding.html
docs/templates/pages/scaffolding.mustache

index edb7274a8f9f5cead050e077a1b3e71fa5118426..b09d5040833e7c1c2c846b81c91e074072d049c4 100644 (file)
           <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>
 
       <div class="bs-docs-grid">
         <div class="row show-grid">
           <div class="span4">4</div>
-          <div class="span4 offset2">4 offset 2</div>
+          <div class="span3 offset2">3 offset 2</div>
         </div><!-- /row -->
         <div class="row show-grid">
-          <div class="span3 offset2">3 offset 2</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 offset4">6 offset 4</div>
+          <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>
 
         <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>
index 02d8a9df18a44a370b95539954e91ab2b2f9dc6d..6888747dd7fef5bf1b576cfa009ba1a41d95aaa6 100644 (file)
           <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>
 
       <div class="bs-docs-grid">
         <div class="row show-grid">
           <div class="span4">4</div>
-          <div class="span4 offset2">4 offset 2</div>
+          <div class="span3 offset2">3 offset 2</div>
         </div><!-- /row -->
         <div class="row show-grid">
-          <div class="span3 offset2">3 offset 2</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 offset4">6 offset 4</div>
+          <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>
 
         <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>