aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-30 23:10:29 -0800
committerMark Otto <[email protected]>2012-01-30 23:10:29 -0800
commit61b47e91b800e022f1736da772eb23aa9077f2f1 (patch)
treedfd2e74c4907339683ae06b65c7c90c7d1250852 /docs
parent1cff29c33f97fc40de1f8d582d7b1a3f4c7783c5 (diff)
downloadbootstrap-61b47e91b800e022f1736da772eb23aa9077f2f1.tar.xz
bootstrap-61b47e91b800e022f1736da772eb23aa9077f2f1.zip
update layout docs
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/bootstrap.zipbin52273 -> 52273 bytes
-rw-r--r--docs/assets/css/docs.css4
-rw-r--r--docs/scaffolding.html16
-rw-r--r--docs/templates/pages/scaffolding.mustache16
4 files changed, 18 insertions, 18 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index ea2ec758c..2b0aa987a 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 7b6e4ef3a..9d07f3c44 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -356,8 +356,8 @@ hr.soften {
height: 240px;
}
.mini-layout.fluid .mini-layout-body {
- width: 60%;
- margin-left: 10px;
+ width: 77.5%;
+ margin-left: 2.5%;
}
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 0d5a83d64..813ec27ae 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -278,22 +278,22 @@
</div><!-- /col -->
<div class="span6">
<h2>Fluid layout</h2>
- <p><code>&lt;div class="fluid-container"&gt;</code> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.</p>
+ <p><code>&lt;div class="container-fluid"&gt;</code> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.</p>
<div class="mini-layout fluid">
<div class="mini-layout-sidebar"></div>
<div class="mini-layout-body"></div>
</div>
<pre class="prettyprint linenums">
-&lt;body&gt;
- &lt;div class="fluid-container sidebar-left"&gt;
- &lt;div class="fluid-sidebar"&gt;
- ...
+&lt;div class="container-fluid"&gt;
+ &lt;div class="row-fluid"&gt;
+ &lt;div class="span2"&gt;
+ &lt;!--Sidebar content--&gt;
&lt;/div&gt;
- &lt;div class="fluid-content"&gt;
- ...
+ &lt;div class="span10"&gt;
+ &lt;!--Body content--&gt;
&lt;/div&gt;
&lt;/div&gt;
-&lt;/body&gt;
+&lt;/div&gt;
</pre>
</div><!-- /col -->
</div><!-- /row -->
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 40d368c66..d192709c3 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -202,22 +202,22 @@
</div><!-- /col -->
<div class="span6">
<h2>{{_i}}Fluid layout{{/i}}</h2>
- <p>{{_i}}<code>&lt;div class="fluid-container"&gt;</code> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.{{/i}}</p>
+ <p>{{_i}}<code>&lt;div class="container-fluid"&gt;</code> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.{{/i}}</p>
<div class="mini-layout fluid">
<div class="mini-layout-sidebar"></div>
<div class="mini-layout-body"></div>
</div>
<pre class="prettyprint linenums">
-&lt;body&gt;
- &lt;div class="fluid-container sidebar-left"&gt;
- &lt;div class="fluid-sidebar"&gt;
- ...
+&lt;div class="container-fluid"&gt;
+ &lt;div class="row-fluid"&gt;
+ &lt;div class="span2"&gt;
+ &lt;!--{{_i}}Sidebar content{{/i}}--&gt;
&lt;/div&gt;
- &lt;div class="fluid-content"&gt;
- ...
+ &lt;div class="span10"&gt;
+ &lt;!--{{_i}}Body content{{/i}}--&gt;
&lt;/div&gt;
&lt;/div&gt;
-&lt;/body&gt;
+&lt;/div&gt;
</pre>
</div><!-- /col -->
</div><!-- /row -->