From b4b3343a617f8b23abcfa502dfd5fb4ff7c50ba1 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Fri, 10 Feb 2012 23:57:31 -0800
Subject: clarify structure of responsive css file

---
 docs/scaffolding.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/scaffolding.html')

diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index b2962f317..d58c0e15b 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -315,7 +315,7 @@
     </div>
     <div class="span8">
       <h2>Supported devices</h2>
-      <p>Bootstrap supports a handful of media queries to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:</p>
+      <p>Bootstrap supports a handful of media queries in a single file to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:</p>
       <table class="table table-bordered table-striped">
         <thead>
           <tr>
-- 
cgit v1.2.3


From 60ee76853726f9711a41a865169d66cf136e5f71 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sat, 11 Feb 2012 00:16:13 -0800
Subject: fix type on responsive grid per #1852

---
 docs/scaffolding.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/scaffolding.html')

diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index d58c0e15b..6ed5857ff 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -339,7 +339,7 @@
           <tr>
             <td>Landscape tablets</td>
             <td>768px to 980px</td>
-            <td>44px</td>
+            <td>42px</td>
             <td>20px</td>
           </tr>
           <tr>
-- 
cgit v1.2.3


From 102bb8e68439d28334c2c9f6e4579fdd9950c102 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sat, 11 Feb 2012 10:38:41 -0800
Subject: clear up some messaging in docs on fluid grid system and nesting
 overall

---
 docs/scaffolding.html | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'docs/scaffolding.html')

diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 6ed5857ff..58bf88b24 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -173,7 +173,8 @@
   <div class="row">
     <div class="span6">
       <p>With the static (non-fluid) grid system in Bootstrap, nesting is easy. To nest your content, just add a new <code>.row</code> and set of <code>.span*</code> columns within an existing <code>.span*</code> column.</p>
-      <h4>Example</h4>
+      <h3>Example</h3>
+      <p>Nested rows should include a set of columns that add up to the number of columns of it's parent. For example, two nested <code>.span3</code> columns should be placed within a <code>.span6</code>.</p>
       <div class="row show-grid">
         <div class="span6">
           Level 1 of column
@@ -187,6 +188,21 @@
           </div>
         </div>
       </div>
+      <h3>Fluid example</h3>
+      <p>Nesting with fluid grids is a bit different: the number of nested columns doesn't need to match the parent. Instead, your columns are reset at each level because each row takes up 100% of the parent column.</p>
+      <div class="row-fluid show-grid">
+        <div class="span12">
+          Fluid 12
+          <div class="row-fluid show-grid">
+            <div class="span6">
+              Fluid 6
+            </div>
+            <div class="span6">
+              Fluid 6
+            </div>
+          </div>
+        </div>
+      </div>
     </div>
     <div class="span6">
 <pre class="prettyprint linenums">
-- 
cgit v1.2.3