root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix grid alignment on scaffolding

This commit is contained in:
Mark Otto 2012-07-11 11:15:04 -07:00
parent 713105774f
commit 5b5352c92d
2 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
docs/scaffolding.html
View File

@ -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>

25
docs/templates/pages/scaffolding.mustache vendored
View File

@ -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>