mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-30 15:24:08 +03:00
Code Activity

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

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
This commit is contained in:
Jacob Thornton
2012-01-27 11:07:17 -08:00
parent aa594501bd 97546adc90
commit 3b3dbd7229
9 changed files with 58 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/scaffolding.html
+8
View File
@@ -136,6 +136,8 @@
</div>
</div><!-- /row -->
<br>
<h2>Offsetting columns</h2>
<div class="row show-grid">
<div class="span4">4</div>
@@ -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>