From 00d6f26270485cde0fb8474b76396eb81cd97eff Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Fri, 31 Aug 2012 23:12:02 -0700
Subject: fixes #4896: reflect media query order in docs

---
 docs/scaffolding.html | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'docs/scaffolding.html')

diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index a78b1b5b4..d734ea5ae 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -413,14 +413,16 @@
             </thead>
             <tbody>
               <tr>
-                <td>Phones</td>
-                <td>480px and below</td>
-                <td class="muted" colspan="2">Fluid columns, no fixed widths</td>
+                <td>Large display</td>
+                <td>1200px and up</td>
+                <td>70px</td>
+                <td>30px</td>
               </tr>
               <tr>
-                <td>Phones to tablets</td>
-                <td>767px and below</td>
-                <td class="muted" colspan="2">Fluid columns, no fixed widths</td>
+                <td>Default</td>
+                <td>980px and up</td>
+                <td>60px</td>
+                <td>20px</td>
               </tr>
               <tr>
                 <td>Portrait tablets</td>
@@ -429,31 +431,29 @@
                 <td>20px</td>
               </tr>
               <tr>
-                <td>Default</td>
-                <td>980px and up</td>
-                <td>60px</td>
-                <td>20px</td>
+                <td>Phones to tablets</td>
+                <td>767px and below</td>
+                <td class="muted" colspan="2">Fluid columns, no fixed widths</td>
               </tr>
               <tr>
-                <td>Large display</td>
-                <td>1200px and up</td>
-                <td>70px</td>
-                <td>30px</td>
+                <td>Phones</td>
+                <td>480px and below</td>
+                <td class="muted" colspan="2">Fluid columns, no fixed widths</td>
               </tr>
             </tbody>
           </table>
 <pre class="prettyprint linenums">
-/* Landscape phones and down */
-@media (max-width: 480px) { ... }
-
-/* Landscape phone to portrait tablet */
-@media (max-width: 767px) { ... }
+/* Large desktop */
+@media (min-width: 1200px) { ... }
 
 /* Portrait tablet to landscape and desktop */
 @media (min-width: 768px) and (max-width: 979px) { ... }
 
-/* Large desktop */
-@media (min-width: 1200px) { ... }
+/* Landscape phone to portrait tablet */
+@media (max-width: 767px) { ... }
+
+/* Landscape phones and down */
+@media (max-width: 480px) { ... }
 </pre>
 
 
-- 
cgit v1.2.3


From 7e4629fbbec63bda9986023dd29879d2565e570e Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Tue, 4 Sep 2012 14:27:48 -0700
Subject: fixes #4968 manually: typo in scaffolding docs about offset classes

---
 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 d734ea5ae..75cb761d5 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -176,7 +176,7 @@
           <p>Given this example, we have <code>.span4</code> and <code>.span8</code>, making for 12 total columns and a complete row.</p>
 
           <h2>Offsetting columns</h2>
-          <p>Move columns to the left using <code>.offset*</code> classes. Each class increases the left margin of a column by a whole column. For example, <code>.offset4</code> moves <code>.span4</code> over four columns.</p>
+          <p>Move columns to the right using <code>.offset*</code> classes. Each class increases the left margin of a column by a whole column. For example, <code>.offset4</code> moves <code>.span4</code> over four columns.</p>
           <div class="bs-docs-grid">
             <div class="row show-grid">
               <div class="span4">4</div>
-- 
cgit v1.2.3


From 138b5a8c0569e548ec93803aaa88ea7033363680 Mon Sep 17 00:00:00 2001
From: Ramiro Morales <ramiro@rmorales.net>
Date: Wed, 5 Sep 2012 23:07:52 -0300
Subject: Fix small documentatio typos.

---
 docs/scaffolding.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'docs/scaffolding.html')

diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 75cb761d5..4b23eed88 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -201,7 +201,7 @@
           <p>To nest your content with the default grid, add a new <code>.row</code> and set of <code>.span*</code> columns within an existing <code>.span*</code> column. Nested rows should include a set of columns that add up to the number of columns of its parent.</p>
           <div class="row show-grid">
             <div class="span9">
-              Level 1 of column
+              Level 1 column
               <div class="row show-grid">
                 <div class="span6">
                   Level 2
@@ -318,10 +318,10 @@
 <pre class="prettyprint linenums">
 &lt;div class="row-fluid"&gt;
   &lt;div class="span12"&gt;
-    Level 1 of column
+    Fluid 12
     &lt;div class="row-fluid"&gt;
-      &lt;div class="span6"&gt;Level 2&lt;/div&gt;
-      &lt;div class="span6"&gt;Level 2&lt;/div&gt;
+      &lt;div class="span6"&gt;Fluid 6&lt;/div&gt;
+      &lt;div class="span6"&gt;Fluid 6&lt;/div&gt;
     &lt;/div&gt;
   &lt;/div&gt;
 &lt;/div&gt;
-- 
cgit v1.2.3