Skip to content

B
bootstrap
Commit 5b5352c9 authored by Mark Otto's avatar Mark Otto
Browse files
Options

fix grid alignment on scaffolding

parent 71310577
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 26 deletions
docs/scaffolding.html
View file @ 5b5352c9
...@@ -148,23 +148,18 @@ ...@@ -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 class="span1">1</div> <div class="span1">1</div>
<div class="span1">1</div>
</div> </div>
<div class="row show-grid"> <div class="row show-grid">
<div class="span2">2</div> <div class="span2">2</div>
<div class="span4">4</div> <div class="span3">3</div>
<div class="span4">4</div> <div class="span4">4</div>
</div> </div>
<div class="row show-grid"> <div class="row show-grid">
<div class="span4">4</div> <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 class="span5">5</div>
</div> </div>
<div class="row show-grid"> <div class="row show-grid">
<div class="span10">10</div> <div class="span9">9</div>
</div> </div>
</div> </div>
...@@ -183,20 +178,20 @@ ...@@ -183,20 +178,20 @@
<div class="bs-docs-grid"> <div class="bs-docs-grid">
<div class="row show-grid"> <div class="row show-grid">
<div class="span4">4</div> <div class="span4">4</div>
<div class="span4 offset2">4 offset 2</div> <div class="span3 offset2">3 offset 2</div>
</div><!-- /row --> </div><!-- /row -->
<div class="row show-grid"> <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 class="span3 offset2">3 offset 2</div>
</div><!-- /row --> </div><!-- /row -->
<div class="row show-grid"> <div class="row show-grid">
<div class="span6 offset4">6 offset 4</div> <div class="span6 offset3">6 offset 3</div>
</div><!-- /row --> </div><!-- /row -->
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;div class="row"&gt; &lt;div class="row"&gt;
&lt;div class="span4"&gt;...&lt;/div&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; &lt;/div&gt;
</pre> </pre>
...@@ -205,13 +200,13 @@ ...@@ -205,13 +200,13 @@
<h3>Example</h3> <h3>Example</h3>
<p>Here two nested <code>.span4</code> columns are placed within a <code>.span8</code>.</p> <p>Here two nested <code>.span4</code> columns are placed within a <code>.span8</code>.</p>
<div class="row show-grid"> <div class="row show-grid">
<div class="span10"> <div class="span9">
Level 1 of column Level 1 of column
<div class="row show-grid"> <div class="row show-grid">
<div class="span5"> <div class="span5">
Level 2 Level 2
</div> </div>
<div class="span5"> <div class="span4">
Level 2 Level 2
</div> </div>
</div> </div>
......
docs/templates/pages/scaffolding.mustache
View file @ 5b5352c9
...@@ -78,23 +78,18 @@ ...@@ -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 class="span1">1</div> <div class="span1">1</div>
<div class="span1">1</div>
</div> </div>
<div class="row show-grid"> <div class="row show-grid">
<div class="span2">2</div> <div class="span2">2</div>
<div class="span4">4</div> <div class="span3">3</div>
<div class="span4">4</div> <div class="span4">4</div>
</div> </div>
<div class="row show-grid"> <div class="row show-grid">
<div class="span4">4</div> <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 class="span5">5</div>
</div> </div>
<div class="row show-grid"> <div class="row show-grid">
<div class="span10">10</div> <div class="span9">9</div>
</div> </div>
</div> </div>
...@@ -113,20 +108,20 @@ ...@@ -113,20 +108,20 @@
<div class="bs-docs-grid"> <div class="bs-docs-grid">
<div class="row show-grid"> <div class="row show-grid">
<div class="span4">4</div> <div class="span4">4</div>
<div class="span4 offset2">4 offset 2</div> <div class="span3 offset2">3 offset 2</div>
</div><!-- /row --> </div><!-- /row -->
<div class="row show-grid"> <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 class="span3 offset2">3 offset 2</div>
</div><!-- /row --> </div><!-- /row -->
<div class="row show-grid"> <div class="row show-grid">
<div class="span6 offset4">6 offset 4</div> <div class="span6 offset3">6 offset 3</div>
</div><!-- /row --> </div><!-- /row -->
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;div class="row"&gt; &lt;div class="row"&gt;
&lt;div class="span4"&gt;...&lt;/div&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; &lt;/div&gt;
</pre> </pre>
...@@ -135,13 +130,13 @@ ...@@ -135,13 +130,13 @@
<h3>{{_i}}Example{{/i}}</h3> <h3>{{_i}}Example{{/i}}</h3>
<p>{{_i}}Here two nested <code>.span4</code> columns are placed within a <code>.span8</code>.{{/i}}</p> <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="row show-grid">
<div class="span10"> <div class="span9">
{{_i}}Level 1 of column{{/i}} {{_i}}Level 1 of column{{/i}}
<div class="row show-grid"> <div class="row show-grid">
<div class="span5"> <div class="span5">
{{_i}}Level 2{{/i}} {{_i}}Level 2{{/i}}
</div> </div>
<div class="span5"> <div class="span4">
{{_i}}Level 2{{/i}} {{_i}}Level 2{{/i}}
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment